Index: trunk/test/testrun_1b.sh
===================================================================
--- trunk/test/testrun_1b.sh	(revision 561)
+++ trunk/test/testrun_1b.sh	(revision 562)
@@ -239,11 +239,13 @@
 do_test_1b_2 () {
 
-    rm -f $PW_DIR/test_log_prelude
-
-    [ -z "$verbose" ] || { echo " starting prelude-manager.."; echo " ($PM --textmod -l $PW_DIR/test_log_prelude --listen 127.0.0.1:5500 >/dev/null 2>&1 &)"; }
-    "$PM" --textmod -l $PW_DIR/test_log_prelude --listen 127.0.0.1:5500 >/dev/null 2>&1 &
-    PID=$!
-
-    five_sec_sleep
+    #rm -f $PW_DIR/test_log_prelude
+    test_log_prelude="/var/log/prelude/prelude-text.log"
+    echo -n >"${test_log_prelude}"
+    
+    #[ -z "$verbose" ] || { echo " starting prelude-manager.."; echo " ($PM --textmod -l $PW_DIR/test_log_prelude --listen 127.0.0.1:5500 >/dev/null 2>&1 &)"; }
+    #"$PM" --textmod -l $PW_DIR/test_log_prelude --listen 127.0.0.1:5500 >/dev/null 2>&1 &
+    #PID=$!
+
+    #five_sec_sleep
 
     ./samhain -t check -p none -l info --set-prelude-severity=info --prelude --server-addr 127.0.0.1:5500 >/dev/null
@@ -259,37 +261,37 @@
     else
 	[ -z "$quiet" ]   && log_msg_fail  "check...";
-	kill $PID
+	#kill $PID
 	return 1
     fi
     #
-    tmp=`egrep 'File original:.*name=etc.*path=/etc' test_log_prelude 2>/dev/null | wc -l`
+    tmp=`egrep 'File original:.*name=etc.*path=/etc' ${test_log_prelude} 2>/dev/null | wc -l`
     if [ $tmp -lt 1 ]; then
 	[ -z "$verbose" ] || log_msg_fail "/etc";
-	kill $PID
-	return 1
-    fi
-    tmp=`egrep 'Classification text: Checking' test_log_prelude 2>/dev/null | wc -l`
+	#kill $PID
+	return 1
+    fi
+    tmp=`egrep 'Classification text: Checking' ${test_log_prelude} 2>/dev/null | wc -l`
     if [ $tmp -lt 1 ]; then
 	[ -z "$verbose" ] || log_msg_fail "checking";
-	kill $PID
+	#kill $PID
 	return 1
     fi
     #
     if test "x$2" = "xmodrc"; then
-	tmp=`egrep 'Classification text: Service opened' test_log_prelude 2>/dev/null | wc -l`
+	tmp=`egrep 'Classification text: Service opened' ${test_log_prelude} 2>/dev/null | wc -l`
 	if [ $tmp -lt 1 ]; then
 	    [ -z "$verbose" ] || log_msg_fail "service";
-	    kill $PID
-	    return 1
-	fi
-	tmp=`egrep 'Service: port=5500' test_log_prelude 2>/dev/null | wc -l`
+	    #kill $PID
+	    return 1
+	fi
+	tmp=`egrep 'Service: port=5500' ${test_log_prelude} 2>/dev/null | wc -l`
 	if [ $tmp -lt 1 ]; then
 	    [ -z "$verbose" ] || log_msg_fail "port 5500";
-	    kill $PID
+	    #kill $PID
 	    return 1
 	fi
     fi
     #
-    kill $PID
+    #kill $PID
     return 0
 }
Index: trunk/test/testrun_1e.sh
===================================================================
--- trunk/test/testrun_1e.sh	(revision 561)
+++ trunk/test/testrun_1e.sh	(revision 562)
@@ -25,4 +25,6 @@
 MAXTEST=5; export MAXTEST
 
+test_log_prelude="/var/log/prelude/prelude-text.log"; export test_log_prelude
+
 PORTPOLICY_5="
 [ReadOnly]
@@ -42,5 +44,5 @@
 	log_skip 5 $MAXTEST 'logging to prelude (or use --really-all)'
     else
-	tmp=`egrep 'Service: port=5500 .unknown. protocol=tcp' test_log_prelude 2>/dev/null | wc -l`
+	tmp=`egrep 'Service: port=5500 .unknown. protocol=tcp' ${test_log_prelude} 2>/dev/null | wc -l`
 	if [ $tmp -lt 1 ]; then
 	    [ -z "$verbose" ] || log_msg_fail "port 5500";
@@ -187,4 +189,6 @@
 run_check_prelude()
 {
+    echo -n >"${test_log_prelude}"
+
     ./samhain -t check -p none -l info --set-prelude-severity=info --prelude --server-addr 127.0.0.1:5500 >/dev/null
  
@@ -322,7 +326,7 @@
 		  #
 		  #
-		  [ -z "$verbose" ] || { echo " starting prelude-manager.."; echo " ($PM --textmod -l $PW_DIR/test_log_prelude --listen 127.0.0.1:5500 >/dev/null 2>&1 &)"; }
-		  "$PM" --textmod -l $PW_DIR/test_log_prelude --listen 127.0.0.1:5500 >/dev/null 2>&1 &
-		  PRELUDEPID=$!
+		  #[ -z "$verbose" ] || { echo " starting prelude-manager.."; echo " ($PM --textmod -l $PW_DIR/test_log_prelude --listen 127.0.0.1:5500 >/dev/null 2>&1 &)"; }
+		  #"$PM" --textmod -l $PW_DIR/test_log_prelude --listen 127.0.0.1:5500 >/dev/null 2>&1 &
+		  #PRELUDEPID=$!
 		  #
 		  #
Index: trunk/test/testrun_2d.sh
===================================================================
--- trunk/test/testrun_2d.sh	(revision 561)
+++ trunk/test/testrun_2d.sh	(revision 562)
@@ -38,9 +38,9 @@
     # PGPASSWORD=samhain; export PGPASSWORD
     create_pgpass
-    psql -o test_log_db -U samhain -d samhain -c "SELECT * FROM log WHERE entry_status = 'NEW' and log_time > '${DATE}';"
+    psql -h localhost -o test_log_db -U samhain -d samhain -c "SELECT * FROM log WHERE entry_status = 'NEW' and log_time > '${DATE}';"
     #
     egrep "START.*Yule" test_log_db >/dev/null 2>&1
     if [ $? -ne 0 ]; then
-	[ -z "$verbose" ] || log_msg_fail "Server start (psql)";
+	[ -z "$verbose" ] || log_msg_fail "Server start (psql) DATE ${DATE}";
 	return 1
     fi
@@ -88,5 +88,5 @@
 	# PGPASSWORD="samhain"; export PGPASSWORD
 	create_pgpass
-	TEST=`psql -U samhain -d samhain -c "SELECT * FROM log LIMIT 1;" 2>/dev/null`
+	TEST=`psql -h localhost -U samhain -d samhain -c "SELECT * FROM log LIMIT 1;" 2>/dev/null`
 	if [ $? -ne 0 -o -z "$TEST" ]; then
 	    log_skip 1 $MAXTEST "psql not default setup"
@@ -112,4 +112,11 @@
     ORIGINAL="DatabaseSeverity=none"
     REPLACEMENT="DatabaseSeverity=info"
+    ex -s $RCFILE <<EOF
+%s/$ORIGINAL/$REPLACEMENT/g
+wq
+EOF
+    #
+    ORIGINAL="# setdbname=samhain"
+    REPLACEMENT="setdbhost=127.0.0.1"
     ex -s $RCFILE <<EOF
 %s/$ORIGINAL/$REPLACEMENT/g