Changeset 235 for trunk/test

Timestamp:

Jul 11, 2009, 2:19:07 PM (15 years ago)

Author:

katerina

Message:

Fix for potential deadlock when calling external programm (ticket #155).

Location:

trunk/test

Files:

• test.sh (modified) (1 diff)
• testext.sh (modified) (4 diffs)
• testhash.sh (modified) (1 diff)

trunk/test/test.sh

@@ -432 +432 @@
     rm -f testrc_2
     rm -f testrc_22
+    rm -f testrc_1ext
     rm -f ./.samhain_file
     rm -f ./.samhain_log*

trunk/test/testext.sh

@@ -20 +20 @@
 #
 
-MAXTEST=1; export MAXTEST
+MAXTEST=2; export MAXTEST
 
 testext0 ()
@@ -54 +54 @@
         fi
         #
-        ${TOP_SRCDIR}/configure --quiet --enable-debug --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$PW_DIR/testrc_1ext --with-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock --with-data-file=$PW_DIR/.samhain_file 
+        ${TOP_SRCDIR}/configure --quiet --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$PW_DIR/testrc_1ext --with-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock --with-data-file=$PW_DIR/.samhain_file 
         #
         if test x$? = x0; then
@@ -100 +100 @@
         echo "SetChecksum=$CHKSUM"          >> testrc_1ext
         echo "SetFilterOr=ALERT"            >> testrc_1ext
+        echo "CloseCommand"                 >> testrc_1ext
     
         rm -f $PW_DIR/test_ext.res
@@ -133 +134 @@
         fi
 
+        ORIGINAL="SetChecksum=${CHKSUM}"
+        REPLACEMENT="SetChecksum=DEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEF"
+
+        ex -s "$PW_DIR/testrc_1ext" <<EOF
+%s/$ORIGINAL/$REPLACEMENT/g
+wq
+EOF
+
+        rm -f $PW_DIR/test_ext.res
+        rm -f $PW_DIR/pdbg.child
+        rm -f $PW_DIR/pdbg.main
+        ./samhain -p none
+    
+        one_sec_sleep
+
+        if [ -f $PW_DIR/test_ext.res ]; then
+            log_fail 2 ${MAXTEST};
+        else
+            log_ok   2 ${MAXTEST};
+        fi
+
         rm -f $PW_DIR/.samhain_file
         rm -f $LOGFILE

trunk/test/testhash.sh

@@ -37 +37 @@
         fi
         #
-        ${TOP_SRCDIR}/configure --quiet $TRUST --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$RCFILE --with-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock --with-data-file=$PW_DIR/.samhain_file --enable-debug 
+        ${TOP_SRCDIR}/configure --quiet $TRUST --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$RCFILE --with-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock --with-data-file=$PW_DIR/.samhain_file --enable-debug '--enable-login-watch' '--enable-mounts-check' '--enable-logfile-monitor' '--enable-process-check' '--enable-port-check' '--enable-suidcheck' '--with-rnd=unix'
         #
         fail=0