Changeset 293

Timestamp:

Sep 23, 2010, 6:05:38 AM (14 years ago)

Author:

katerina

Message:

Fix for ticket #221 (client/server problem if client hostname has uppercase chars).

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• docs/Changelog (modified) (1 diff)
• src/sh_unix.c (modified) (4 diffs)
• src/sh_utils.c (modified) (1 diff)

trunk/configure.ac

@@ -12 +12 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 2.7.2b)
+AM_INIT_AUTOMAKE(samhain, 2.7.2c)
 AC_DEFINE([SAMHAIN], 1, [Application is samhain])
 AC_CANONICAL_HOST

trunk/docs/Changelog

@@ +1 @@
+2.7.2c:
+        * Fix uppercase hostname problem in client/server communication
+
 2.7.2b:
         * Fix compile errors on Solaris 10 (reported by A. Saheba)

trunk/src/sh_unix.c

@@ -1559 +1559 @@
 /* Get the local hostname (FQDN)
  */
+static char * sh_tolower (char * s)
+{
+  char * ret = s;
+  if (s)
+    {
+      for (; *s; ++s)
+        { 
+          *s = tolower((unsigned char) *s);
+        }
+    }
+  return ret;
+}
+
+
 #include <sys/socket.h> 
 
@@ -1648 +1662 @@
     {
       sl_strlcpy (sh.host.name, sh_unix_h_name(he1), SH_PATHBUF);
+      sh_tolower (sh.host.name);
     }
   SH_MUTEX_UNLOCK(mutex_resolv);
@@ -1657 +1672 @@
            hostname);
       sl_strlcpy (sh.host.name, hostname,    SH_PATHBUF);
+      sh_tolower (sh.host.name);
     }
   
@@ -1727 +1743 @@
     {
       sl_strlcpy (sh.host.name, sh_unix_h_name(he1), SH_PATHBUF);
+      sh_tolower (sh.host.name);
     }
   SH_MUTEX_UNLOCK(mutex_resolv);

trunk/src/sh_utils.c

@@ -796 +796 @@
   SL_RETURN( 0, _("sh_util_sigtype"));
 }
+
 
 char * sh_util_siggen (char * hexkey,