Index: trunk/test/testrun_1.sh
===================================================================
--- trunk/test/testrun_1.sh	(revision 206)
+++ trunk/test/testrun_1.sh	(revision 207)
@@ -190,4 +190,7 @@
 #
 TESTPOLICY_11="
+[Misc]
+UseAclCheck=yes
+UseSelinuxCheck=yes
 [ReadOnly]
 dir=99${BASE}
@@ -231,4 +234,7 @@
 
 TESTPOLICY_10="
+[Misc]
+UseAclCheck=yes
+UseSelinuxCheck=yes
 [ReadOnly]
 dir=99${BASE}
@@ -253,5 +259,5 @@
     # CDIRS="a b c a/a a/b a/c a/a/a a/a/b a/a/c a/a/a/a a/a/a/b a/a/a/c";
     tmp=`grep CRIT $LOGFILE | wc -l`
-    if [ $tmp -ne 3 ]; then
+    if [ $tmp -ne 5 ]; then
 	[ -z "$verbose" ] || log_msg_fail "policy count";
 	return 1
@@ -1241,12 +1247,33 @@
 	  let "tcount = tcount + 1" >/dev/null
 	  #
-	  if [ -z "$doall" -a $tcount -eq 10 ]; then
-	      log_skip 10 $MAXTEST 'ACL/SELinux test (or use --really-all)'
-	      let "tcount = tcount + 1" >/dev/null
-	  fi
-	  #
-	  if [ -z "$doall" -a $tcount -eq 11 ]; then
-	      log_skip 11 $MAXTEST 'ACL/SELinux test (or use --really-all)'
-	      let "tcount = tcount + 1" >/dev/null
+	  if [ $tcount -eq 10 ]; then
+	      if [ -z "$doall" ]; then
+		  log_skip 10 $MAXTEST 'ACL/SELinux test (or use --really-all)'
+		  log_skip 11 $MAXTEST 'ACL/SELinux test (or use --really-all)'
+		  let "tcount = tcount + 2" >/dev/null
+	      else
+		  # 'id -u' is posix
+		  #
+		  if test -f /usr/xpg4/bin/id
+		  then
+		      my_uid=`/usr/xpg4/bin/id -u`
+		  else
+		      my_uid=`id -u`
+		  fi
+		  #
+		  if [ ${my_uid} -ne 0 ]; then
+		      log_skip 10 $MAXTEST 'ACL/SELinux test (you are not root)'
+		      log_skip 11 $MAXTEST 'ACL/SELinux test (you are not root)'
+		      let "tcount = tcount + 2" >/dev/null
+		  else
+
+		      SETFATTR=`find_path setfattr`
+		      if [ -z "$SETFATTR" ]; then
+			  log_skip 10 $MAXTEST 'ACL/SELinux test (setfattr not in path)'
+			  log_skip 11 $MAXTEST 'ACL/SELinux test (setfattr not in path)'
+			  let "tcount = tcount + 2" >/dev/null
+		      fi
+		  fi
+	      fi
 	  fi
 	  #
Index: trunk/test/testrun_2a.sh
===================================================================
--- trunk/test/testrun_2a.sh	(revision 206)
+++ trunk/test/testrun_2a.sh	(revision 207)
@@ -221,8 +221,12 @@
 	cp    ./testrc_2       ./rc.${SH_LOCALHOST}
 	mv    ./.samhain_file  ./file.${SH_LOCALHOST}
+	chmod 644 ./rc.${SH_LOCALHOST}
+	chmod 644 ./file.${SH_LOCALHOST}
 
 	ALTHOST=`find_hostname`
 	cp    ./testrc_2       "./rc.${ALTHOST}"
 	cp    ./file.${SH_LOCALHOST} "./file.${ALTHOST}" 2>/dev/null
+	chmod 644 ./rc.${ALTHOST}
+	chmod 644 ./file.${ALTHOST}
 }
 
Index: trunk/test/testrun_2d.sh
===================================================================
--- trunk/test/testrun_2d.sh	(revision 206)
+++ trunk/test/testrun_2d.sh	(revision 207)
@@ -38,29 +38,29 @@
     # PGPASSWORD=samhain; export PGPASSWORD
     create_pgpass
-    psql -U samhain -d samhain -c "SELECT * FROM log WHERE entry_status = 'NEW' and log_time > '${DATE}';" >test_log_db
+    psql -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";
+	[ -z "$verbose" ] || log_msg_fail "Server start (psql)";
 	return 1
     fi
     egrep "NEW CLIENT" test_log_db >/dev/null 2>&1
     if [ $? -ne 0 ]; then
-	[ -z "$verbose" ] || log_msg_fail "Client connect";
+	[ -z "$verbose" ] || log_msg_fail "Client connect (psql)";
 	return 1
     fi
     egrep "Checking.*/bin" test_log_db >/dev/null 2>&1
     if [ $? -ne 0 ]; then
-	[ -z "$verbose" ] || log_msg_fail "Client file check";
+	[ -z "$verbose" ] || log_msg_fail "Client file check (psql)";
 	return 1
     fi
     egrep "EXIT.*Samhain" test_log_db >/dev/null 2>&1
     if [ $? -ne 0 ]; then
-	[ -z "$verbose" ] || log_msg_fail "Client exit";
+	[ -z "$verbose" ] || log_msg_fail "Client exit (psql)";
 	return 1
     fi
     egrep "EXIT.*Yule.*SIGTERM" test_log_db >/dev/null 2>&1
     if [ $? -ne 0 ]; then
-	[ -z "$verbose" ] || log_msg_fail "Server exit";
+	[ -z "$verbose" ] || log_msg_fail "Server exit (psql)";
 	return 1
     fi