14a15
> 
17,18c18,19
< PROGRAM_version="1.1.0 pre"
< PROGRAM_releasedate="12 June 2004"
---
> PROGRAM_version="1.0.9"
> PROGRAM_releasedate="22 May 2004"
41d41
< UPDATE=0
52,53c52,53
< # What is the default shell
< if echo ${SHELL} |grep -q ksh 
---
> # What is the shell?
> if print >/dev/null 2>&1
67c67,68
<    ECHOPT="--"
---
>    N="-n"
>    ECHOOPT="--"
70a72
>    N="-n"
186,188d187
<       --update)
<           UPDATE=1
<           ;;
262,271c261,269
<   NORMAL="[0;39m" 
<   warning="[33;55;1m" # yellow WARNING
<   #YELLOW="[33;55;1m"
<   YELLOW="[1;33m" # yellow
<   WHITE="[1;37m"
<   OK="[1;32m" # green OK
<   DARKGRAY="[1;30m"
<   green="[1;32m" # green
<   red="[1;31m" # red
<   BAD="[1;31m" # red BAD
---
>   NORMAL="rning="
> w WARNING
> W="
> w
> K=e
> K
>   DARKGRAY=e
>   WHITEe"
>   #YeeLOW="D=D
328c326
<         echo -n "${sdate}"
---
>         echo $N "${sdate}"
349c347
< 	if [ "$1" = "-n" -o "$1" = "-e" ]
---
> 	if [[ "$1" = "-n" || "$1" = "-e" ]]
353c351
< 	        echo "$2" >> $DEBUGFILE
---
> 	        echo $ECHOOPT "$2" >> $DEBUGFILE
360c358
< 	        echo "$2" >> ${DEBUGFILE}
---
> 	          echo $ECHOOPT "$2" >> ${DEBUGFILE}
362c360
< 	        echo "$1" >> ${DEBUGFILE}
---
> 	          echo $ECHOOPT "$1" >> ${DEBUGFILE}
383c381
< 	  if [ "$1" = "-n" -o "$1" = "-e" ]
---
> 	  if [ "$1" = "-n" ]
385,387c383,385
<               [ "$MYSHELL" = "ksh" ] && echo "$2" || echo $1 "$2"
< 	    else
< 	      echo "$1"
---
>               echo $1 "$2"
> 	    elif [ "$1" = "-e" ] ; then
> 	      [ "$MYSHELL" = "ksh" ] &&  echo $ECHOOPT "$2" || echo $1 "$2"
542,546d539
< if [ "${MYDIR}" = "" ]
<   then
<     echo "Fatal error: can't find INSTALLDIR option in configuration file (${CONFIGFILE})"
<     exit 1
< fi
609,610d601
< # File with mirrors
< MIRRORFILE="${DB_PATH}/mirrors.dat"
1124,1133c1115,1116
< SUCKIT_FILES="
< ${ROOTDIR}/sbin/initsk12
< ${ROOTDIR}usr/share/locale/sk/.sk12/sk
< "
< 
< SUCKIT_DIRS="
< ${ROOTDIR}dev/sdhu0/tehdrakg
< ${ROOTDIR}etc/.MG
< ${ROOTDIR}usr/share/locale/sk/.sk12
< "
---
> SUCKIT_FILES=""
> SUCKIT_DIRS="${ROOTDIR}etc/.MG"
1398,1399d1380
< # Slackware /etc/rc.d/sysvinit
< 
1858a1840
> 		MD5CHECK_SKIP=0
1908c1890
< 	echo -n "     Strings (command)"
---
> 	echo $N "     Strings (command)"
2061c2043
< 		    for WHITELISTSTRING in `cat ${CONFIGFILE} | egrep '^MD5WHITELIST=' | sed 's/MD5WHITELIST=//g'`; do
---
> 		    for WHITELISTSTRING in `cat ${CONFIGFILE} | egrep '^MD5WHITELIST=' | tr -d 'MD5WHITELIST='`; do
2101c2083
< 	        echo -n "   ${file}"
---
> 	        echo $N "   ${file}"
2418c2400
< 	echo -n "   Sebek LKM"
---
> 	echo $N "   Sebek LKM"
2665c2647
< 	echo -n "   Miscellaneous Login backdoors"
---
> 	echo $N "   Miscellaneous Login backdoors"
2693c2675
< #	echo -n "   Suspicious files"	
---
> #	echo $N "   Suspicious files"	
2725c2707
< 	echo -n "   Miscellaneous directories"
---
> 	echo $N "   Miscellaneous directories"
2790c2772
<     echo -n "     Checking /etc/rc.d/rc.sysinit"
---
>     echo $N "     Checking /etc/rc.d/rc.sysinit"
2798c2780
<         echo -n "       Test 1"
---
>         echo $N "       Test 1"
2807c2789
<         echo -n "       Test 2"
---
>         echo $N "       Test 2"
2816c2798
<         echo -n "       Test 3"
---
>         echo $N "       Test 3"
2832c2814
<     echo -n "     Checking /etc/inetd.conf"
---
>     echo $N "     Checking /etc/inetd.conf"
2848,2889d2829
< 
< #    SIZE="26"
< #    jump=`expr ${defaultcolumn} - ${SIZE}`
< #    echo -n "     Checking /etc/xinetd.conf"
< 
< #    if [ -f /etc/xinetd.conf ]
< #      then
< #        FOUND=0
< #        if [ "${OPERATING_SYSTEM}" = "Linux" ]
< #	  then
< #	    incl=`grep includedir /etc/xinetd.conf`
< #	      I=`find ${incl[1]}/ -type f`
< #	      for J in ${I}; do
< #	      svc=`grep ".*service." ${J}`
< #    	      proto=`grep "protocol.*=.*p" ${J}`
< #	      FOUNDSERVICES=`grep ".*disable.*=.*yes" ${J} | grep -qve "#"`
< #	      if [ ! "${FOUNDSERVICES}" = "" ]
< #	        then
< #		  FOUND=1
< # Rewrite this line
< #		  WARNINGMSG="${WARNINGMSG} ${svc[1]:=(unknown service)} ${proto[2]:=(protocol not listed)} is enabled"
< #	      fi
< #	      done
< #	    if [ ${FOUND} -eq 0 ]
< #	      then
< #	        insertlayout
< #		echo $E "${LAYOUT}[ ${OK}Clean${NORMAL} ]"
< #	      else
< #		insertlayout
< #		echo $E "${LAYOUT}[ ${BAD}Warning!${NORMAL} ]"
< #		echo "${WARNINGMSG}"
< #	    fi
< #	  else
< #	    echo $E "${LAYOUT}[ ${OK}Skipped${NORMAL} ]"
< #	fi
< #       else
< #        insertlayout
< #	echo $E "${LAYOUT}[ ${OK}Not found${NORMAL} ]"
< #    fi
< 
< 
< 
2972c2912
< 	    echo -n "     Checking presence of KLD signatures"
---
> 	    echo $N "     Checking presence of KLD signatures"
2997c2937
< 	    SOCKSTAT=`sockstat | grep '*:*' | cut -c 1-55 | grep '*:' | cut -c 39-47 | tr -d ' ' | sort| grep -v '*' | uniq`
---
> 	    SOCKSTAT=`sockstat | grep '*:*' | cut -c 1-55 | grep '*:' | cut -c 39-47 | tr -d ' ' | sort | uniq`
3026c2966
< 	    echo -n "   Checking loaded kernel modules... "
---
> 	    echo $N "   Checking loaded kernel modules... "
3146c3086
< 		echo -n "  Port ${port}: ${DESCRIPTION}"
---
> 		echo $N "  Port ${port}: ${DESCRIPTION}"
3176c3116
<             if [ "${OPERATING_SYSTEM}" = "AIX" ]
---
>             if [[ "${OPERATING_SYSTEM}" = "AIX" || "${OPERATING_SYSTEM}" = "OpenBSD" ]]
3178c3118
< 	        PROMISCSCAN1=`${IFCONFIGBINARY} -a | grep 'PROMISC'`
---
> 	        PROMISCSCAN1=`${IFCONFIGBINARY} -a | grep -v 'pflog' | grep 'PROMISC'`
3226c3166
< 	echo -n "   Checking hostname... "
---
> 	echo $N "   Checking hostname... "
3236c3176
< 	    echo -n "   Checking for differences in user accounts... "
---
> 	    echo $N "   Checking for differences in user accounts... "
3276c3216
< 	    echo -n "   Checking for differences in user groups... "
---
> 	    echo $N "   Checking for differences in user groups... "
3328c3268
< 	    echo -n "     - ${FILE}"
---
> 	    echo $N "     - ${FILE}"
3358c3298
< 	echo -n "   Checking rc.d files... "
---
> 	echo $N "   Checking rc.d files... "
3364c3304
< 	    echo -n "     Processing"
---
> 	    echo $N "     Processing"
3372c3312
< 	    	    echo -n "               "
---
> 	    	    echo $N "               "
3375c3315
< 	    	    echo -n "."
---
> 	    	    echo $N "."
3389c3329
< 	    echo -n "   Result rc.d files check"
---
> 	    echo $N "   Result rc.d files check"
3438c3378
< 	echo -n "     Bourne Shell"
---
> 	echo $N "     Bourne Shell"
3458c3398
< 	echo -n "   Checking /dev for suspicious files... "
---
> 	echo $N "   Checking /dev for suspicious files... "
3581c3521
< 	    echo -n "   Searching for /etc/passwd... "
---
> 	    echo $N "   Searching for /etc/passwd... "
3586c3526
<     	        echo -n "   Checking users with UID '0' (root)... "
---
>     	        echo $N "   Checking users with UID '0' (root)... "
3624c3564
< 		echo -n "   Checking for allowed root login... "
---
> 		echo $N "   Checking for allowed root login... "
3668c3608
< 		echo -n "   Checking for allowed protocols... "
---
> 		echo $N "   Checking for allowed protocols... "
3719c3659
< 	echo -n "   Search for syslog configuration... "
---
> 	echo $N "   Search for syslog configuration... "
3727c3667
< 	    echo -n "   Checking for running syslog slave... "
---
> 	    echo $N "   Checking for running syslog slave... "
3745c3685
< 	    echo -n "   Checking for logging to remote system... "
---
> 	    echo $N "   Checking for logging to remote system... "
3792c3732
< 	echo -n "Incorrect MD5 checksums: "	
---
> 	echo $N "Incorrect MD5 checksums: "	
3794c3734
< 	    echo -n "${OK}"
---
> 	    echo $N "${OK}"
3796c3736
< 	    echo -n "${BAD}"
---
> 	    echo $N "${BAD}"
3802c3742
< 	echo -n "Possible infected files: "
---
> 	echo $N "Possible infected files: "
3804c3744
< 	    echo -n "${OK}"
---
> 	    echo $N "${OK}"
3806c3746
< 	    echo -n "${BAD}"
---
> 	    echo $N "${BAD}"
3820c3760
< 	  echo "-----------------------------------------------------------------------"
---
> 	  echo $ECHOOPT "-----------------------------------------------------------------------"
3826c3766
< 	  echo "-----------------------------------------------------------------------"
---
> 	  echo $ECHOOPT "-----------------------------------------------------------------------"
3844c3784
<     if [ ! ${NOARGS} -eq 1 -a ${VERSIONCHECK} -eq 0 -a ${UPDATE} -eq 0 ]; then
---
>     if [ ! ${NOARGS} -eq 1 -a ${VERSIONCHECK} -eq 0 ]; then
3848,3857d3787
< fi
< 
< if [ "${UPDATE}" -eq 1 ]
<   then
<     echo "Running updater..."
<     echo ""
<     #${MYDIR}/lib/rkhunter/scripts/check_update.sh ${CONFIGFILE} ${MIRRORFILE} ${DB_PATH} ${md5}
<     ./check_update.sh ${CONFIGFILE} ${MIRRORFILE} ${DB_PATH} ${md5}
<     echo ""
<     echo "Ready."
