Changeset 75 for trunk

Timestamp:

Nov 1, 2006, 10:46:20 PM (18 years ago)

Author:

rainer

Message:

Fix compile failure with portcheck + stealth.

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• docs/Changelog (modified) (1 diff)
• src/sh_portcheck.c (modified) (1 diff)
• test/testcompile.sh (modified) (4 diffs)

trunk/configure.ac

@@ -13 +13 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 2.3.0)
+AM_INIT_AUTOMAKE(samhain, 2.3.0a)
 AC_CANONICAL_HOST
 

trunk/docs/Changelog

@@ -1 @@
-2.3.0:
+2.3.0a:
+        * fix compile failure with portcheck + stealth (reported by lucas)
+
+2.3.0 (01-11-2006):
         * fix concurrency for inserts in oracle db
         * add acl_(new|old) to database schema

trunk/src/sh_portcheck.c

@@ -391 +391 @@
 {
   struct sh_portentry * portlist;
-  char iface_all[8] = _("0.0.0.0");
+  char iface_all[8];
+
+  sl_strlcpy (iface_all, _("0.0.0.0"), sizeof(iface_all));
   
   if (0 == strcmp(proto, "tcp"))

trunk/test/testcompile.sh

@@ -20 +20 @@
 #
 
-MAXTEST=63; export MAXTEST
+MAXTEST=65; export MAXTEST
 
 run_flawfinder ()
@@ -164 +164 @@
         # test standalone compilation
         #
-        TEST="${S}standalone w/suidcheck w/processcheck${E}"
+        TEST="${S}standalone w/suidcheck w/procchk${E}"
         #
         if test -r "Makefile"; then
@@ -180 +180 @@
         # test standalone compilation
         #
-        TEST="${S}standalone w/processcheck w/portcheck${E}"
+        TEST="${S}standalone w/procchk w/portchk${E}"
         #
         if test -r "Makefile"; then
@@ -187 +187 @@
         #
         ${TOP_SRCDIR}/configure --quiet  --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$PW_DIR/samhainrc.test  --enable-process-check --enable-port-check > /dev/null 2>> test_log
+        #
+        let "num = num + 1" >/dev/null
+        testmake $? $num || let "numfail = numfail + 1"  >/dev/null
+        let "num = num + 1" >/dev/null
+        run_smatch $? $num || let "numfail = numfail + 1"  >/dev/null
+
+        #
+        # test standalone compilation
+        #
+        TEST="${S}standalone w/procchk w/portchk w/stealth${E}"
+        #
+        if test -r "Makefile"; then
+                $MAKE distclean 
+        fi
+        #
+        ${TOP_SRCDIR}/configure --quiet  --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$PW_DIR/samhainrc.test  --enable-stealth=164 --enable-process-check --enable-port-check > /dev/null 2>> test_log
         #
         let "num = num + 1" >/dev/null