Changeset 489 for trunk/src

Timestamp:

Sep 24, 2015, 8:18:00 PM (9 years ago)

Author:

katerina

Message:

Version 4.1.0 final.

Location:

trunk/src

Files:

• samhain.c (modified) (2 diffs)
• sh_audit.c (modified) (3 diffs)
• sh_err_console.c (modified) (1 diff)
• sh_mem.c (modified) (3 diffs)
• sh_xfer_client.c (modified) (1 diff)

trunk/src/samhain.c

@@ -1199 +1199 @@
       FileSchedIn = NULL;
       *status = 0;
-      return NULL;
+      SL_RETURN(NULL, _("sh_set_schedule_int"));
     }
 
@@ -1210 +1210 @@
       SL_RETURN(FileSchedIn , _("sh_set_schedule_int"));
     }
-  FileSched->next = FileSchedIn;
+  else {
+    FileSched->next = FileSchedIn;
+  }
   SL_RETURN(FileSched , _("sh_set_schedule_int"));
 }

trunk/src/sh_audit.c

@@ -34 +34 @@
 #include "sh_error.h"
 
+#undef  FIL__
+#define FIL__  _("sh_audit.c")
+
 #if !defined(SH_COMPILE_STATIC) && defined(__linux__) && defined(HAVE_AUPARSE_H) && defined(HAVE_AUPARSE_LIB)
 #include <auparse.h>
@@ -40 +43 @@
 #include "sh_utils.h"
 
-#undef  FIL__
-#define FIL__  _("sh_audit.c")
 
 #define REC_SIZE_SYSCALL 32
@@ -217 +218 @@
     {
       time_t new;
-      char buf[64];
       
       if (mtime >= ctime) { new = mtime; }

trunk/src/sh_err_console.c

@@ -273 +273 @@
 char *  sh_log_console_name (void)
 {
-  if (! sh.srvcons.name || sh.srvcons.name[0] == '\0' ||
+  if (sh.srvcons.name[0] == '\0' ||
       0 == strcmp(sh.srvcons.name, _("NULL")))
     return (_("/dev/console"));

trunk/src/sh_mem.c

@@ -246 +246 @@
                            tmp->file, tmp->line, FIL__, __LINE__);
       free(tmp);
+      SH_ABORT;
+      _exit (EXIT_FAILURE);
     }
 
@@ -340 +342 @@
       sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_E_MNULL,
                        file, line, FIL__, __LINE__);
+      SH_ABORT;
+      _exit (EXIT_FAILURE);
       SL_RET0(_("sh_mem_free"));
     }
@@ -422 +426 @@
                            tmp->file, tmp->line, file, line);
       free(tmp);
+      SH_ABORT;
+      _exit (EXIT_FAILURE);
     }
 

trunk/src/sh_xfer_client.c

@@ -1541 +1541 @@
               /* --- Send (nclt, msg) ---
                */
-              buffersize = strlen(nclt)+strlen(errmsg)+2;
-              buffer = SH_ALLOC(buffersize);
-
-              sl_strlcpy(buffer, nclt,   buffersize);
-              sl_strlcat(buffer, errmsg, buffersize);
-
+              if (S_TRUE == sl_ok_adds(strlen(errmsg), strlen(nclt)+2+KEY_LEN))
+                {
+                  buffersize = strlen(nclt)+strlen(errmsg)+2;
+                  
 #if !defined(SH_ENCRYPT)
-              if (4 == sl_strlen(errmsg)) {      /* backward compatibility */
-                buffersize = sl_strlen(buffer);
-                buffer[buffersize]   = theProto; /* nctl//DATA//theProto   */
-                buffer[buffersize+1] = '\0';
+                  buffersize += KEY_LEN;
+#endif
+                  buffer = SH_ALLOC(buffersize);
+
+                  sl_strlcpy(buffer, nclt,   buffersize);
+                  sl_strlcat(buffer, errmsg, buffersize);
+                  
+#if !defined(SH_ENCRYPT)
+                  if (4 == sl_strlen(errmsg)) {  /* backward compatibility   */
+                    buffersize = sl_strlen(buffer);
+                    buffer[buffersize]   = theProto; /* nctl//DATA//theProto */
+                    buffer[buffersize+1] = '\0';
+                  }
+                  sh_tools_hash_add(foo_M1, buffer, buffersize+1);
+#endif
+              
+                  flag_err = 
+                    xfer_send_crypt (sockfd, (char) theProto, _("NCLT"),
+                                     buffer, 
+                                     (unsigned long) sl_strlen(buffer));
+                  
+                  TPT(( 0, FIL__, __LINE__, _("msg=<Sent %s, status %d.>\n"), 
+                        buffer, flag_err));
+                  SH_FREE (buffer);
+                }
+              else {
+                flag_err = -1;
               }
-              sh_tools_hash_add(foo_M1, buffer, buffersize+1);
-#endif
-
-              flag_err = 
-                xfer_send_crypt (sockfd, (char) theProto, _("NCLT"),
-                                 buffer, 
-                                 (unsigned long) sl_strlen(buffer));
- 
-              TPT(( 0, FIL__, __LINE__, _("msg=<Sent %s, status %d.>\n"), 
-                    buffer, flag_err));
-              SH_FREE (buffer);
-            }   
+            } 
         }