Changeset 68 for trunk/src/sh_suidchk.c

Timestamp:

Oct 30, 2006, 12:03:44 AM (18 years ago)

Author:

rainer

Message:

Update trunk to samhain 2.3

File:

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

trunk/src/sh_suidchk.c

@@ -146 +146 @@
 static int     ShSuidchkSeverity = SH_ERR_SEVERE;
 static char *  ShSuidchkExclude  = NULL;
-static int     ExcludeLen        = 0;
+static size_t  ExcludeLen        = 0;
 
 static time_t  FileLimNow        = 0;
@@ -554 +554 @@
                     )
                    )
-            {
+            { /* way too long routine */
               
               (void) sl_strlcpy (theFile.fullpath, tmpcat, PATH_MAX);
-              theFile.check_mask = sh_files_maskof(SH_LEVEL_READONLY);
-              theFile.reported   = S_FALSE;
+              theFile.check_mask  = sh_files_maskof(SH_LEVEL_READONLY);
+              theFile.reported    = S_FALSE;
+              theFile.attr_string = NULL;
+
               status = sh_unix_getinfo (ShDFLevel[SH_ERR_T_RO], 
                                         thisEntry->d_name,
@@ -971 +973 @@
                 }
               SH_FREE(tmp);
-
-            }
+              if (theFile.attr_string)
+                SH_FREE(theFile.attr_string);
+
+            } /* end of way too long routine */
         }
       SH_FREE(tmpcat);
     }
+
 #ifdef HAVE_SCHED_YIELD
     if (ShSuidchkYield == S_TRUE)
@@ -989 +994 @@
       }
 #endif
+
   }  while (thisEntry != NULL);
 
@@ -1087 +1093 @@
  *************/
 
-int sh_suidchk_set_severity  (char * c)
+int sh_suidchk_set_severity  (const char * c)
 {
   int retval;
@@ -1099 +1105 @@
 }
 
-int sh_suidchk_set_exclude (char * c)
+int sh_suidchk_set_exclude (const char * c)
 {
   SL_ENTER(_("sh_suidchk_set_exclude"));
+
   if (c == NULL || c[0] == '\0')
     {
@@ -1118 +1125 @@
     SH_FREE(ShSuidchkExclude);
 
-  ExcludeLen       = (int) sl_strlen(c);
-  if (c[ExcludeLen-1] == '/')
-    {
-      c[ExcludeLen-1] = '\0';
+  ShSuidchkExclude = sh_util_strdup (c);
+  ExcludeLen       = sl_strlen (ShSuidchkExclude);
+  if (ShSuidchkExclude[ExcludeLen-1] == '/')
+    {
+      ShSuidchkExclude[ExcludeLen-1] = '\0';
       ExcludeLen--;
     }
-  ShSuidchkExclude = SH_ALLOC((size_t) ExcludeLen + 1);
-  (void) sl_strlcpy(ShSuidchkExclude, c, (size_t)(ExcludeLen + 1));
-
   SL_RETURN(0, _("sh_suidchk_set_exclude"));
 }
 
-int sh_suidchk_set_timer (char * c)
+int sh_suidchk_set_timer (const char * c)
 {
   long val;
@@ -1163 +1168 @@
 }
 
-int sh_suidchk_set_schedule (char * str)
+int sh_suidchk_set_schedule (const char * str)
 {
   int status;
@@ -1201 +1206 @@
 
 
-int sh_suidchk_set_fps (char * c)
+int sh_suidchk_set_fps (const char * c)
 {
   long val;
@@ -1218 +1223 @@
 }
 
-int sh_suidchk_set_yield (char * c)
+int sh_suidchk_set_yield (const char * c)
 {
   int i;
@@ -1231 +1236 @@
 }
 
-int sh_suidchk_set_activate (char * c)
+int sh_suidchk_set_activate (const char * c)
 {
   int i;
@@ -1239 +1244 @@
 }
 
-int sh_suidchk_set_quarantine (char * c)
+int sh_suidchk_set_quarantine (const char * c)
 {
   int i;
@@ -1247 +1252 @@
 }
 
-int sh_suidchk_set_qdelete (char * c)
+int sh_suidchk_set_qdelete (const char * c)
 {
   int i;
@@ -1255 +1260 @@
 }
 
-int sh_suidchk_set_qmethod (char * c)
+int sh_suidchk_set_qmethod (const char * c)
 {
   long val;