Changeset 341

Timestamp:

May 11, 2011, 9:34:15 PM (14 years ago)

Author:

katerina

Message:

Fix for ticket #250: Compile error if option --enable-udp is used

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• docs/Changelog (modified) (1 diff)
• src/sh_forward.c (modified) (7 diffs)
• src/sh_restrict.c (modified) (1 diff)
• test/testcompile.sh (modified) (2 diffs)

trunk/configure.ac

@@ -12 +12 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 2.8.3a)
+AM_INIT_AUTOMAKE(samhain, 2.8.4a)
 AC_DEFINE([SAMHAIN], 1, [Application is samhain])
 AC_CANONICAL_HOST

trunk/docs/Changelog

@@ +1 @@
+2.8.4a:
+        * Fix for compile error with --enable-udp (reported by Sean Chittenden)
+
 2.8.4:
+        * Fix another reload bug in the log monitoring module
         * Add unit tests for IgnoreAdded/IgnoreDeleted configuration directives
         * Fix deadlock after reload when compiled with --enable-login-watch

trunk/src/sh_forward.c

@@ -5774 +5774 @@
    * should be no problem as long as  sizeof(struct sockaddr_in) < INT_MAX ...
    */
-  int                fromlen = sizeof(from);
+  unsigned int fromlen = sizeof(from);
 
   if (enable_syslog_socket == S_FALSE)
@@ -5791 +5791 @@
   res = recvfrom(fd,  buf,  1047, 0, (struct sockaddr *) &from, &fromlen);
 
-  sh_ipvx_save(&ss, sa->sa_family, &from);
+  sh_ipvx_save(&ss, sa->sa_family, (struct sockaddr *) &from);
   sh_ipvx_ntoa(namebuf, sizeof(namebuf), &ss);
 
@@ -5855 +5855 @@
       tmp = sh_tools_safe_name (ptr, 1);
       sh_error_handle((-1), FIL__, __LINE__, 0, MSG_INET_SYSLOG,
-                      my_inet_ntoa(from.sin_addr), 
+                      namebuf, 
                       (cfac == NULL) ? _("none") : cfac, 
                       (cpri == NULL) ? _("none") : cpri, 
@@ -5959 +5959 @@
   if (callerFlag == S_FALSE)
     {
-      if (enable_syslog_socket == S_FALSE && syslog_sock >= 0)
+      if (enable_syslog_socket == S_FALSE && syslog_sock_n > 0)
         {
           /* user does not wish to use this facility
            */
           TPT(( 0, FIL__, __LINE__, _("msg=<close syslog socket>\n")));
-          sl_close_fd(FIL__, __LINE__, syslog_sock);
-          syslog_sock[0] = -1;
+          for (sock = 0; sock < syslog_sock_n; ++sock)
+            {
+              sl_close_fd(FIL__, __LINE__, syslog_sock[sock]);
+              syslog_sock[0] = -1;
+            }
         }
       SL_RETURN((-1), _("create_syslog_socket"));
@@ -5978 +5981 @@
   addr.sin_port        = htons(514);
   
-  do_syslog_socket(AF_INET, SOCK_DGRAM, 0, (struct sockaddr *) &addr, addrlen);
+  sock = do_syslog_socket(AF_INET, SOCK_DGRAM, 0, 
+                          (struct sockaddr *) &addr, addrlen);
 
   if (sock >= 0) {
@@ -5991 +5995 @@
   if (getaddrinfo (NULL, "syslog", &hints, &ai) != 0)
     {
-      errnum = errno;
+      int errnum = errno;
       sh_forward_printerr (_("getaddrinfo"), errnum, 514, __LINE__);
-      sl_close_fd (FIL__, __LINE__, sock);
       SL_RETURN((-1), _("create_syslog_socket"));
     }
@@ -6019 +6022 @@
     }
   freeaddrinfo (ai);
-#endif
 
  end:
+#endif
   if (syslog_sock_n > 1)
     SH_MINSOCK += (syslog_sock_n - 1);

trunk/src/sh_restrict.c

@@ -591 +591 @@
   CuAssertPtrNotNull(tc, sh_restrict_list);
 
+#if !defined(HOST_IS_CYGWIN)
   res = sh_restrict_this("/bin/sh", 1000, 0755, fd);
   CuAssertIntEquals(tc,1,res);
+#endif
 
   sl_close(fd);

trunk/test/testcompile.sh

@@ -765 +765 @@
         # test client/server compilation
         #
-        TEST="${S}client/server application w/o srp${E}"
-        #
-        if test -r "Makefile"; then
-                $MAKE clean
-        fi
-        #
-        ${TOP_SRCDIR}/configure --quiet --enable-network=server --disable-srp --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$PW_DIR/samhainrc.test > /dev/null 2>> test_log   
+        TEST="${S}client/server application w/o srp, w/udp${E}"
+        #
+        if test -r "Makefile"; then
+                $MAKE clean
+        fi
+        #
+        ${TOP_SRCDIR}/configure --quiet --enable-network=server --enable-udp --disable-srp --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$PW_DIR/samhainrc.test > /dev/null 2>> test_log   
         #
         let "num = num + 1" >/dev/null
@@ -858 +858 @@
         # test  client/server compilation w/logwatch
         #
-        TEST="${S}client/server application w/login-watch${E}"
-        #
-        if test -r "Makefile"; then
-                $MAKE clean
-        fi
-        #
-        ${TOP_SRCDIR}/configure --quiet --enable-network=server  --enable-srp --enable-login-watch --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$PW_DIR/samhainrc.test  > /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
-        let "num = num + 1" >/dev/null
-        run_uno $? $num || let "numfail = numfail + 1"  >/dev/null
-        #
-        if test -r "Makefile"; then
-                $MAKE clean
-        fi
-        #
-        ${TOP_SRCDIR}/configure --quiet --enable-network=client  --enable-srp --enable-login-watch --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$PW_DIR/samhainrc.test  > /dev/null 2>> test_log  
+        TEST="${S}client/server application w/login-watch,udp,no_ipv6${E}"
+        #
+        if test -r "Makefile"; then
+                $MAKE clean
+        fi
+        #
+        ${TOP_SRCDIR}/configure --quiet --enable-network=server  --enable-udp --disable-ipv6 --enable-srp --enable-login-watch --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$PW_DIR/samhainrc.test  > /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
+        let "num = num + 1" >/dev/null
+        run_uno $? $num || let "numfail = numfail + 1"  >/dev/null
+        #
+        if test -r "Makefile"; then
+                $MAKE clean
+        fi
+        #
+        ${TOP_SRCDIR}/configure --quiet --enable-network=client  --disable-ipv6 --enable-srp --enable-login-watch --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$PW_DIR/samhainrc.test  > /dev/null 2>> test_log  
         #
         let "num = num + 1" >/dev/null