Changeset 3 for trunk/src

Timestamp:

Dec 21, 2005, 10:07:54 PM (19 years ago)

Author:

rainer

Message:

More fixes for update function, released 2.1.1 version.

Location:

trunk/src

Files:

• sh_calls.c (modified) (1 diff)
• sh_database.c (modified) (5 diffs)
• sh_forward.c (modified) (1 diff)
• sh_hash.c (modified) (2 diffs)
• sh_kern.c (modified) (4 diffs)

trunk/src/sh_calls.c

@@ -138 +138 @@
 int sh_calls_set_bind_addr (char * str)
 {
+  static int reject = 0;
+
+  if (reject == 1)
+    return (0);
+
+  if (sh.flag.opts == S_TRUE)  
+    reject = 1;
+
   if (0 == /*@-unrecog@*/inet_aton(str, &bind_addr)/*@+unrecog@*/) 
     {

trunk/src/sh_database.c

@@ -38 +38 @@
 #include "sh_error.h"
 #include "sh_utils.h"
+
+extern int safe_logger (int signal, int method, pid_t thepid);
 
 #undef  FIL__
@@ -1009 +1011 @@
 {
   int               status = 0;
-  char            * p;
+  const char      * p;
   static MYSQL    * db_conn = NULL;
   static SH_TIMEOUT sh_timer = { 0, 3600, S_TRUE };
@@ -1447 +1449 @@
           retv = S_FALSE;
         }
+      else if (*p == '\"' && escp == 0)
+        {
+          retv = S_FALSE;
+        }
       else 
         {
@@ -1453 +1459 @@
       ++p;
     }
+  if (escp == 1) 
+    retv = S_FALSE;
   return retv;
 }
@@ -1546 +1554 @@
 
               if (S_FALSE == is_escaped(&p[j+2])) {
+                sh_error_handle((-1), FIL__, __LINE__, 0, MSG_E_SUBGEN,
+                                _("Message not properly escaped"), 
+                                _("sh_database_parse"));
                 SL_RETURN(NULL, _("sh_database_parse"));
               }

trunk/src/sh_forward.c

@@ -1944 +1944 @@
   SL_RET0(_("free_client"));
 }
+
+extern int safe_logger (int signal, int method, pid_t thepid);
 
 int sh_forward_register_client (char * str)

trunk/src/sh_hash.c

@@ -653 +653 @@
 {
   sh_file_t * p;
+  sh_file_t * q;
   int key;
 
@@ -674 +675 @@
               strlen(s->fullpath) == strlen(p->fullpath))
             {
-              SH_FREE(s->fullpath);
-              if(s->linkpath)
-                SH_FREE(s->linkpath);
+              q = p->next;
+              SH_FREE(p->fullpath);
+              if(p->linkpath)
+                SH_FREE(p->linkpath);
+              memcpy(p, s, sizeof(sh_file_t));
+              p->next = q;
               SH_FREE(s);
               s = NULL;

trunk/src/sh_kern.c

@@ -859 +859 @@
    * Stored(old) is system_call_code[]
    */
-  if (sh.flag.checkSum == SH_CHECK_INIT)
+  if (sh.flag.checkSum == SH_CHECK_INIT || sh.flag.update == S_TRUE)
     {
       store0 = 0; store1 = 0; store2 = 0;
@@ -935 +935 @@
    * Stored(old) is sh_syscalls[] array.
    */
-  if (sh.flag.checkSum == SH_CHECK_INIT)
+  if (sh.flag.checkSum == SH_CHECK_INIT || sh.flag.update == S_TRUE)
     {
       for (i = 0; i < SH_MAXCALLS; ++i) 
@@ -1125 +1125 @@
   if (ShKernIDT == S_TRUE)
     {
-      if (sh.flag.checkSum == SH_CHECK_INIT)
+      if (sh.flag.checkSum == SH_CHECK_INIT || sh.flag.update == S_TRUE)
         {
           datasize = 8;
@@ -1447 +1447 @@
    * Stored(old) is sh_syscalls[] array.
    */
-  if (sh.flag.checkSum == SH_CHECK_INIT)
+  if (sh.flag.checkSum == SH_CHECK_INIT || sh.flag.update == S_TRUE)
     {
       for (i = 0; i < SH_MAXCALLS; ++i)