Changeset 262 for trunk/src

Timestamp:

Dec 8, 2009, 11:25:50 PM (15 years ago)

Author:

katerina

Message:

Fix for ticket #179, and some minor bugfixes.

Location:

trunk/src

Files:

• sh_forward.c (modified) (6 diffs)
• sh_log_evalrule.c (modified) (1 diff)
• sh_utmp.c (modified) (1 diff)

trunk/src/sh_forward.c

@@ -1990 +1990 @@
 #include "zAVLTree.h"
 
+static char * sh_tolower (char * s)
+{
+  char * ret = s;
+  if (s)
+    {
+      for (; *s; ++s)
+        { 
+          *s = tolower((unsigned char) *s);
+        }
+    }
+  return ret;
+}
+
 /* Function to return the key for indexing
  * the argument 
@@ -2109 +2122 @@
         newclt->status_arr[i] = CLT_INACTIVE;
       (void) sh_unix_time(0, newclt->timestamp[CLT_INACTIVE], TIM_MAX);
+
       /* truncate */
       sl_strlcpy(newclt->hostname,  &str[0],        sep[0]+1);
+      sh_tolower(newclt->hostname);
+
       /* truncate */
       sl_strlcpy(newclt->salt,      &str[sep[0]+1], sep[1]-sep[0]);
@@ -2613 +2629 @@
    */
   if (he != NULL && he->h_name != NULL)
-    sl_strlcpy(h_name, he->h_name, MAXHOSTNAMELEN + 1);
+    {
+      sl_strlcpy(h_name, he->h_name, MAXHOSTNAMELEN + 1);
+    }
   else
     {
@@ -2684 +2702 @@
     }
 
+  sh_tolower(h_peer);
+  sh_tolower(h_name);
 
   if ((0 == sl_strcmp(h_peer, h_name)) || (0 == sl_strcmp(h_peer_IP, h_name)))
@@ -2694 +2714 @@
       while (he->h_aliases[i] != NULL)
         {
-          if (0 == sl_strcmp(he->h_aliases[i], h_name))
+          if (0 == sl_strcmp(sh_tolower(he->h_aliases[i]), h_name))
             {
               flag = 1;
@@ -2794 +2814 @@
         } 
     }
+
+  sh_tolower(search_string);
 
   /* ----  search the register  -----

trunk/src/sh_log_evalrule.c

@@ -682 +682 @@
 
   int           qpos = 0;
-  int           rpos = 1;
+  volatile int  rpos = 1;
   unsigned long dsec = 0;
   char *        dstr = NULL;

trunk/src/sh_utmp.c

@@ -581 +581 @@
   int errnum = 0;
   
-  if (sh.flag.checkSum != SH_CHECK_INIT)
-    sh_inotify_wait_for_change(mode_path[1], &inotify_watch, 
-                               &errnum, ShUtmpInterval);
-
+  if ( (sh.flag.isdaemon == S_TRUE || sh.flag.loop == S_TRUE) &&
+       sh.flag.checkSum != SH_CHECK_INIT )
+    {
+      sh_inotify_wait_for_change(mode_path[1], &inotify_watch, 
+                                 &errnum, ShUtmpInterval);
+    }
+  
   lastcheck  = tcurrent;
+
   if (SH_INOTIFY_ERROR(errnum))
     {