Changeset 50 for trunk

Timestamp:

Jul 11, 2006, 11:09:51 PM (18 years ago)

Author:

rainer

Message:

Fix for the fix in revision 48. Released as 2.2.1c

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• docs/Changelog (modified) (1 diff)
• src/sh_extern.c (modified) (1 diff)
• src/sh_socket.c (modified) (2 diffs)

trunk/configure.ac

@@ -13 +13 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 2.2.1b)
+AM_INIT_AUTOMAKE(samhain, 2.2.1c)
 AC_CANONICAL_HOST
 

trunk/docs/Changelog

@@ -1 @@
-
+2.2.1c
         * fix sh_extern.c: sh_ext_add_default() cast to (void) was too early
           (Solaris 8 build failure reported by Jesse)

trunk/src/sh_extern.c

@@ -1080 +1080 @@
   int    i;
 
-  (void) dummy;
-
   SL_ENTER(_("sh_ext_add_default"));
   if (dummy[0] == 'n' ||  dummy[0] == 'N' ||

trunk/src/sh_socket.c

@@ -224 +224 @@
 char * sh_get_sockpass ()
 {
-  int j = 0;
+  size_t j = 0;
+
   while (skey->sh_sockpass[2*j] != '\0' && j < sizeof(sh_sockpass_real))
     {
@@ -231 +232 @@
     }
   sh_sockpass_real[j] = '\0';
+
   return sh_sockpass_real;
 }