Index: trunk/Makefile.in
===================================================================
--- trunk/Makefile.in	(revision 99)
+++ trunk/Makefile.in	(revision 100)
@@ -1553,5 +1553,5 @@
 INITFILES=samhain.startIRIX samhain.startFreeBSD samhain.startSolaris \
 samhain.startLSB samhain.startGentoo samhain.startLinux samhain.startHPUX \
-samhain.startIRIX 
+samhain.startIRIX samhain.startMACOSX
 
 SCRIPTFILES=redhat_i386.client.spec check_samhain.pl samhainadmin.pl 
Index: trunk/configure.ac
===================================================================
--- trunk/configure.ac	(revision 99)
+++ trunk/configure.ac	(revision 100)
@@ -610,5 +610,5 @@
 
 AC_ARG_ENABLE(db-reload,
-	[  --enable-db-reload		enable database reload on SIGHUP [no]],
+	[  --enable-db-reload		enable database reload on SIGHUP [[no]]],
 	[
 	if test "x${enable_db_reload}" = xyes; then
Index: trunk/docs/Changelog
===================================================================
--- trunk/docs/Changelog	(revision 99)
+++ trunk/docs/Changelog	(revision 100)
@@ -1,3 +1,5 @@
 2.3.3:
+	* fixed typos in configure.ac and manual (reported by John Horne)
+	* don't use mysql_options on x86_64, since libmysql is broken
 	* fixed cross-compiling (patch by Joe MacDonald)
 	* refactor sh_kern.c, sh_suidchk.c
@@ -10,5 +12,5 @@
 	  (reported by Jonny Halfmoon)
 
-2.3.2:
+2.3.2 (29-01-2007):
 	* fix regression in full stealth mode (incorrect comparison of
 	  bytes read vs. maximum capacity), reported by B. Fleming
@@ -19,5 +21,5 @@
  
 2.3.1 (21-01-2007):
-	* fix bug that my cause accidental closure of yule TCP socket
+	* fix bug that may cause accidental closure of yule TCP socket
 	  (problem reported by B. Masuda)
 	* fix sh_kern.c for kernel 2.6.19 (reported by S. Clormann)
Index: trunk/scripts/samhainrc_update.sh
===================================================================
--- trunk/scripts/samhainrc_update.sh	(revision 99)
+++ trunk/scripts/samhainrc_update.sh	(revision 100)
@@ -1,3 +1,21 @@
 #! /bin/sh
+
+# Copyright Rainer Wichmann (2006)
+#
+# License Information:
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
 
 # -----------------------------------------------------------------------
Index: trunk/test/testrun_1a.sh
===================================================================
--- trunk/test/testrun_1a.sh	(revision 99)
+++ trunk/test/testrun_1a.sh	(revision 100)
@@ -135,4 +135,5 @@
 	[ -z "$quiet" ] && log_ok ${tcount} ${MAXTEST};
     fi
+    return 0
 }
 
@@ -148,5 +149,5 @@
     BUILDOPTS="$PREBUILDOPTS --enable-stealth=137"; export BUILDOPTS
     testrun_stealth
-
+    check_err $? ${tcount};
     log_end "RUN STANDALONE W/STEALTH"
     return 0
Index: trunk/test/testrun_1b.sh
===================================================================
--- trunk/test/testrun_1b.sh	(revision 99)
+++ trunk/test/testrun_1b.sh	(revision 100)
@@ -203,4 +203,5 @@
 	log_skip 1 $MAXTEST 'gpg not found in $PATH'
 	log_skip 2 $MAXTEST 'gpg not found in $PATH'
+	log_skip 3 $MAXTEST 'gpg not found in $PATH'
     else
 	eval "$GPG" --list-keys 0F571F6C >/dev/null 2>/dev/null
@@ -208,4 +209,5 @@
 	    log_skip 1 $MAXTEST 'public PGP key 0x0F571F6C not present'
 	    log_skip 2 $MAXTEST 'public PGP key 0x0F571F6C not present'
+	    log_skip 3 $MAXTEST 'public PGP key 0x0F571F6C not present'
 	else
 	    #
Index: trunk/test/testrun_2c.sh
===================================================================
--- trunk/test/testrun_2c.sh	(revision 99)
+++ trunk/test/testrun_2c.sh	(revision 100)
@@ -123,4 +123,6 @@
     if [ -z "$doall" ]; then
 	log_skip 1 $MAXTEST 'Client/server w/mysql (or use --really-all)'
+	log_skip 2 $MAXTEST 'Client/server w/mysql (or use --really-all)'
+	log_skip 3 $MAXTEST 'Client/server w/mysql (or use --really-all)'
 	return 0
     fi
@@ -131,4 +133,6 @@
     if [ -z "$MYSQL" ]; then
 	log_skip 1 $MAXTEST "mysql not found";
+	log_skip 2 $MAXTEST "mysql not found";
+	log_skip 3 $MAXTEST "mysql not found";
 	return 1
     else
@@ -136,4 +140,6 @@
 	if [ $? -ne 0 -o -z "$TEST" ]; then
 	    log_skip 1 $MAXTEST "mysql not default setup"
+	    log_skip 2 $MAXTEST "mysql not default setup"
+	    log_skip 3 $MAXTEST "mysql not default setup"
 	    return 1
 	fi
@@ -189,9 +195,9 @@
     GPG=`find_path gpg`
     if [ -z "$GPG" ]; then
-        log_skip 1 $MAXTEST 'gpg not found in $PATH'
+        log_skip 3 $MAXTEST 'gpg not found in $PATH'
     else
         eval "$GPG" --list-keys 0F571F6C >/dev/null 2>/dev/null
         if [ $? -ne 0 ]; then
-            log_skip 1 $MAXTEST 'public PGP key 0x0F571F6C not present'
+            log_skip 3 $MAXTEST 'public PGP key 0x0F571F6C not present'
         else
 	    testrun_threesockets "$GPG"