Index: trunk/src/samhain.c
===================================================================
--- trunk/src/samhain.c	(revision 24)
+++ trunk/src/samhain.c	(revision 25)
@@ -1795,5 +1795,7 @@
       /* see whether its time to check files
        */
-      if      (sh.flag.checkSum == SH_CHECK_INIT)
+      if      (sh.flag.checkSum == SH_CHECK_INIT ||
+	       (sh.flag.checkSum == SH_CHECK_CHECK &&
+		(sh.flag.isdaemon == S_FALSE && sh.flag.loop == S_FALSE)))
 	{
 	  flag_check_1 = 1;
Index: trunk/src/sh_html.c
===================================================================
--- trunk/src/sh_html.c	(revision 24)
+++ trunk/src/sh_html.c	(revision 25)
@@ -313,5 +313,5 @@
 	  sl_strlcat(&entry_orig[entry_size], line, line_size + 1);
 	  entry_size += add_size;
-	  SH_VAL_EQ(entry_orig[entry_size], '\0');
+	  SH_VALIDATE_EQ(entry_orig[entry_size], '\0');
 	}
       sl_close(fd);
Index: trunk/src/sh_unix.c
===================================================================
--- trunk/src/sh_unix.c	(revision 24)
+++ trunk/src/sh_unix.c	(revision 25)
@@ -4024,5 +4024,5 @@
     {
 #ifdef WITH_TPT
-      sl_snprintf(str, 128, _("file: %s line: %d page: %d"), 
+      sl_snprintf(str, sizeof(str), _("file: %s line: %d page: %d"), 
 		  page_list->file, page_list->line, i+1);
       sh_error_handle(SH_ERR_INFO, FIL__, __LINE__, i, MSG_E_SUBGEN,
@@ -4032,5 +4032,5 @@
       ++i;
     }
-  sl_snprintf(str, 128, _("%d pages locked"), i);
+  sl_snprintf(str, sizeof(str), _("%d pages locked"), i);
   sh_error_handle(SH_ERR_INFO, FIL__, __LINE__, i, MSG_E_SUBGEN,
 		  str, _("sh_unix_count_mlock"));
Index: trunk/src/sh_utils.c
===================================================================
--- trunk/src/sh_utils.c	(revision 24)
+++ trunk/src/sh_utils.c	(revision 25)
@@ -205,10 +205,10 @@
   SL_ENTER(_("sh_util_strdup"));
 
-  if (str != NULL)
-    {
-      len = sl_strlen(str);
-      p   = SH_ALLOC (len + 1);
-      (void) sl_strlcpy (p, str, len+1);
-    }
+  SH_VALIDATE_NE(str, NULL);
+
+  len = sl_strlen(str);
+  p   = SH_ALLOC (len + 1);
+  (void) sl_strlcpy (p, str, len+1);
+
   SL_RETURN( p, _("sh_util_strdup"));
 }
@@ -224,7 +224,5 @@
   ret = *str;
 
-  if (ret == NULL) {
-    SL_RETURN(ret, _("sh_util_strsep"));
-  }
+  SH_VALIDATE_NE(ret, NULL);
 
   for (c = *str; *c != '\0'; c++) {
Index: trunk/src/slib.c
===================================================================
--- trunk/src/slib.c	(revision 24)
+++ trunk/src/slib.c	(revision 25)
@@ -577,5 +577,5 @@
 
 #if !defined(HOST_IS_I86SOLARIS)
-#if !defined (_GNU_SOURCE)
+#if !defined (_GNU_SOURCE) && !defined(__linux__)
 /* flawfinder: ignore */
 extern int vsnprintf ( char *str, size_t n,