Index: unk/docs/TODO
===================================================================
--- /trunk/docs/TODO	(revision 488)
+++ 	(revision )
@@ -1,3 +1,0 @@
-
-Patch for 'setmailport'
-
Index: /trunk/src/samhain.c
===================================================================
--- /trunk/src/samhain.c	(revision 488)
+++ /trunk/src/samhain.c	(revision 489)
@@ -1199,5 +1199,5 @@
       FileSchedIn = NULL;
       *status = 0;
-      return NULL;
+      SL_RETURN(NULL, _("sh_set_schedule_int"));
     }
 
@@ -1210,5 +1210,7 @@
       SL_RETURN(FileSchedIn , _("sh_set_schedule_int"));
     }
-  FileSched->next = FileSchedIn;
+  else {
+    FileSched->next = FileSchedIn;
+  }
   SL_RETURN(FileSched , _("sh_set_schedule_int"));
 }
Index: /trunk/src/sh_audit.c
===================================================================
--- /trunk/src/sh_audit.c	(revision 488)
+++ /trunk/src/sh_audit.c	(revision 489)
@@ -34,4 +34,7 @@
 #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,6 +43,4 @@
 #include "sh_utils.h"
 
-#undef  FIL__
-#define FIL__  _("sh_audit.c")
 
 #define REC_SIZE_SYSCALL 32
@@ -217,5 +218,4 @@
     {
       time_t new;
-      char buf[64];
       
       if (mtime >= ctime) { new = mtime; }
Index: /trunk/src/sh_err_console.c
===================================================================
--- /trunk/src/sh_err_console.c	(revision 488)
+++ /trunk/src/sh_err_console.c	(revision 489)
@@ -273,5 +273,5 @@
 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"));
Index: /trunk/src/sh_mem.c
===================================================================
--- /trunk/src/sh_mem.c	(revision 488)
+++ /trunk/src/sh_mem.c	(revision 489)
@@ -246,4 +246,6 @@
 			   tmp->file, tmp->line, FIL__, __LINE__);
       free(tmp);
+      SH_ABORT;
+      _exit (EXIT_FAILURE);
     }
 
@@ -340,4 +342,6 @@
       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,4 +426,6 @@
 			   tmp->file, tmp->line, file, line);
       free(tmp);
+      SH_ABORT;
+      _exit (EXIT_FAILURE);
     }
 
Index: /trunk/src/sh_xfer_client.c
===================================================================
--- /trunk/src/sh_xfer_client.c	(revision 488)
+++ /trunk/src/sh_xfer_client.c	(revision 489)
@@ -1541,28 +1541,38 @@
 	      /* --- 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);
-	    }   
+	    } 
 	}