Changeset 481 for trunk/src/sh_suidchk.c

Timestamp:

Jul 18, 2015, 5:06:52 PM (9 years ago)

Author:

katerina

Message:

Enhancements and fixes for tickets #374, #375, #376, #377, #378, and #379.

File:

• trunk/src/sh_suidchk.c (modified) (9 diffs)

trunk/src/sh_suidchk.c

@@ -78 +78 @@
 #include "sh_suidchk.h"
 #include "sh_hash.h"
+#include "sh_dbIO.h"
 #include "sh_unix.h"
 #include "sh_files.h"
@@ -140 +141 @@
 static int     ShSuidchkActive   = S_TRUE;
 static time_t  ShSuidchkInterval = 7200;
-static long    ShSuidchkFps      = 0;
+static unsigned long    ShSuidchkFps      = 0;
 static int     ShSuidchkNosuid   = S_FALSE;
 static int     ShSuidchkYield    = S_FALSE;
@@ -150 +151 @@
 static time_t  FileLimNow        = 0;
 static time_t  FileLimStart      = 0;
-static long    FileLimNum        = 0;
-static long    FileLimTotal      = 0;
+static unsigned long    FileLimNum        = 0;
+static unsigned long    FileLimTotal      = 0;
 
 static sh_schedule_t * ShSuidchkSched = NULL;
@@ -1134 +1135 @@
     /* Rate limit (Fps == Files per second)
      */
-    if ((ShSuidchkFps > 0 && FileLimNum > ShSuidchkFps && FileLimTotal > 0)&&
+    if ((ShSuidchkFps > 0 && FileLimNum > ShSuidchkFps) &&
         (ShSuidchkYield == S_FALSE))
       {
@@ -1222 +1223 @@
             int dummy;
             int class;
-            unsigned long check_mask = 0;
+            unsigned long check_flags = 0;
 
             theFile = SH_ALLOC(sizeof(file_type));
 
             (void) sl_strlcpy (theFile->fullpath, tmpcat, PATH_MAX);
-            theFile->check_mask  = sh_files_maskof(SH_LEVEL_READONLY);
+            theFile->check_flags  = sh_files_maskof(SH_LEVEL_READONLY);
             CLEAR_SH_FFLAG_REPORTED(theFile->file_reported);
             theFile->attr_string = NULL;
             theFile->link_path   = NULL;
             
-            sh_files_search_file(tmpcat, &class,  &check_mask, &dummy);
-            if ((check_mask & MODI_PREL) != 0)
-              {
-                theFile->check_mask |= MODI_PREL;
-              }
+            sh_files_search_file(tmpcat, &class,  &check_flags, &dummy);
+            if ((check_flags & MODI_PREL) != 0)
+              MODI_SET(theFile->check_flags, MODI_PREL);
 
             status = sh_unix_getinfo (ShDFLevel[SH_ERR_T_RO], 
@@ -1303 +1302 @@
                     /* Running init. Report on files detected.
                      */
-                    sh_hash_pushdata (theFile, fileHash); /* no call to sh_error_handle */
+                    sh_dbIO_data_write (theFile, fileHash); /* no call to sh_error_handle */
                     SH_MUTEX_LOCK(mutex_thread_nolog);
                     sh_error_handle ((-1), FIL__, __LINE__, 
@@ -2215 +2214 @@
 }
 
-/* This variable is not used anywhere. It only exists
- * to assign &dirlist to it, which keeps gcc from
- * putting it into a register, and avoids the 'clobbered
- * by longjmp' warning. And no, 'volatile' proved insufficient.
- */
-static void * sh_dummy_type = NULL;
-
-
 /* Return a newly allocated string naming the type of filesystem that the
    file PATH, described by STATP, is on.
    RELPATH is the file name relative to the current directory.
    Return "unknown" if its filesystem type is unknown.  */
+
+void * sh_dummy_2229_type;
 
 static char *
@@ -2243 +2236 @@
   FILE *mfp;
   struct mntent *mnt;
+
+  /* Take the address to keep gcc from putting it into a register. 
+   * Avoids the 'clobbered by longjmp' warning. 
+   */
+  sh_dummy_2229_type = (void *) &type;
 
   if (path == NULL || relpath == NULL)
@@ -2257 +2255 @@
       return NULL;
     }
-
-  /* Take the address to keep gcc from putting it into a register. 
-   * Avoids the 'clobbered by longjmp' warning. 
-   */
-  sh_dummy_type = (void*) &type;
 
   /* Find the entry with the same device number as STATP, and return