Changeset 310 for trunk/src

Timestamp:

Feb 16, 2011, 9:33:00 PM (14 years ago)

Author:

katerina

Message:

Add option to skip checksum for certain files (ticket #232). Also fix for #231 (missing warning on invalid recursion depth).

Location:

trunk/src

Files:

• samhain.c (modified) (2 diffs)
• sh_files.c (modified) (2 diffs)
• sh_filetype.c (added)
• sh_readconf.c (modified) (2 diffs)
• sh_restrict.c (added)
• sh_unix.c (modified) (3 diffs)

trunk/src/samhain.c

@@ -71 +71 @@
 #include "sh_readconf.h"
 #include "sh_hash.h"
+#include "sh_restrict.h"
 
 #include "sh_nmail.h"
@@ -1786 +1787 @@
 #endif
 #if defined(SH_WITH_CLIENT) || defined(SH_STANDALONE)
+              sh_restrict_purge ();
 
 

trunk/src/sh_files.c

@@ -1147 +1147 @@
   p = sh_files_C_dequote(p, &len);
   if (!p || len == 0)
-    SL_RETURN((-1), _("sh_files_pushdir"));
+    SL_RETURN((-1), _("sh_files_pushfile"));
 
   if (len >= PATH_MAX) 
@@ -1544 +1544 @@
   
 
-  if (rdepth < (-1) || tail == p || rdepth > 99)
-    rdepth = (-2);
+  if (tail == p)
+    {
+      /* Setting to an invalid number will force MaxRecursionLevel,
+       * see sh_files_setrec_int()
+       */
+      rdepth = (-2);
+    }
+  else if ( (rdepth < (-1) || rdepth > 99) || 
+            ((rdepth == (-1)) && (class != SH_LEVEL_ALLIGNORE)) )
+    {
+      SH_FREE(p);
+      SL_RETURN((-1), _("sh_files_pushdir"));
+    }
 
   len = sl_strlen(tail);

trunk/src/sh_readconf.c

@@ -48 +48 @@
 #include "sh_unix.h"
 #include "sh_utils.h"
+#include "sh_restrict.h"
 
 
@@ -942 +943 @@
     sh_files_pushfile_prelink },
 
-  { N_("ignoreadded"), SH_SECTION_MISC,   SH_SECTION_NONE, 
+  { N_("ignoreadded"),   SH_SECTION_MISC,   SH_SECTION_NONE, 
     sh_ignore_add_new },
   { N_("ignoremissing"), SH_SECTION_MISC,   SH_SECTION_NONE, 
     sh_ignore_add_del },
+
+  { N_("skipchecksum"),  SH_SECTION_MISC,   SH_SECTION_NONE, 
+    sh_restrict_define },
+  { N_("filetype"),      SH_SECTION_MISC,   SH_SECTION_NONE, 
+    sh_restrict_add_ftype },
+
 
   { N_("filecheckscheduleone"), SH_SECTION_MISC,   SH_SECTION_NONE, 

trunk/src/sh_unix.c

@@ -98 +98 @@
 #include "sh_hash.h"
 #include "sh_tools.h"
+#include "sh_restrict.h"
 #include "sh_ipvx.h"
 #include "sh_tiger.h"
@@ -3749 +3750 @@
       if (fileHash != NULL)
         {
-          if ((theFile->check_mask & MODI_CHK) == 0)
+          if ((theFile->check_mask & MODI_CHK) == 0 ||
+              sh_restrict_this(theFile->fullpath, (UINT64) fbuf.st_size, 
+                               (UINT64) fbuf.st_mode, rval_open))
             {
               sl_strlcpy(fileHash, SH_KEY_NULL, KEY_LEN+1);
@@ -3802 +3805 @@
       if (fileHash != NULL)
         {
-          if ((theFile->check_mask & MODI_CHK) == 0)
+          if ((theFile->check_mask & MODI_CHK) == 0 ||
+              sh_restrict_this(theFile->fullpath, (UINT64) fbuf.st_size, 
+                               (UINT64) fbuf.st_mode, rval_open))
             {
               sl_strlcpy(fileHash, SH_KEY_NULL, KEY_LEN+1);