Changeset 488 for trunk/src/sh_hash.c

Timestamp:

Sep 18, 2015, 7:39:03 PM (9 years ago)

Author:

katerina

Message:

Fix for tickets #386 (silent check) and #387 (linux audit support).

File:

• trunk/src/sh_hash.c (modified) (6 diffs)

trunk/src/sh_hash.c

@@ -248 +248 @@
 
   SH_MUTEX_LOCK(mutex_thread_nolog);
-  sh_error_handle (level, FIL__, __LINE__, 0, 
-                   MSG_FI_MISS2, tmp, str);
+  if (!sh_global_check_silent)
+    sh_error_handle (level, FIL__, __LINE__, 0, 
+                     MSG_FI_MISS2, tmp, str);
   SH_MUTEX_UNLOCK(mutex_thread_nolog);
   ++sh.statistics.files_report;
@@ -363 +364 @@
                   theFile = sh_hash_create_ft (p, fileHash);
                   str = all_items(theFile, fileHash, 0);
-                  sh_error_handle (level, FIL__, __LINE__, 0, 
-                                   MSG_FI_MISS2, tmp, str);
+                  if (!sh_global_check_silent)
+                    sh_error_handle (level, FIL__, __LINE__, 0, 
+                                     MSG_FI_MISS2, tmp, str);
                   ++sh.statistics.files_report;
                   SH_FREE(str);
@@ -405 +407 @@
           theFile = sh_hash_create_ft (p, fileHash);
           str = all_items(theFile, fileHash, 0);
-          sh_error_handle (level, FIL__, __LINE__, 0, 
-                           MSG_FI_MISS2, tmp, str);
+          if (!sh_global_check_silent)
+            sh_error_handle (level, FIL__, __LINE__, 0, 
+                             MSG_FI_MISS2, tmp, str);
           ++sh.statistics.files_report;
           SH_FREE(str);
@@ -1812 +1815 @@
       str = all_items (theFile, fileHash, 1);
       
-      sh_error_handle (log_severity, FIL__, __LINE__, 0, 
-                       MSG_FI_ADD2, 
-                       tmp, str);
+      if (!sh_global_check_silent)
+        sh_error_handle (log_severity, FIL__, __LINE__, 0, 
+                         MSG_FI_ADD2, 
+                         tmp, str);
       ++sh.statistics.files_report;
       SH_FREE(str);
@@ -2540 +2544 @@
         {
           char result[256];
-
-          if (NULL != sh_audit_fetch (theFile->fullpath, theFile->mtime, result, sizeof(result)))
+          
+          sh_error_handle (SH_ERR_INFO, FIL__, __LINE__, 
+                           0, MSG_E_SUBGPATH,
+                           _("Fetching audit record"),
+                           _("sh_hash"),  theFile->fullpath );
+
+          if (NULL != sh_audit_fetch (theFile->fullpath, theFile->mtime, theFile->ctime, result, sizeof(result)))
             {
 #ifdef SH_USE_XML
@@ -2565 +2574 @@
        ****************************************************/
       tmp_path = sh_util_safe_name(theFile->fullpath);
-      sh_error_handle(log_severity, FIL__, __LINE__, 
-                      (long) modi_mask, MSG_FI_CHAN,
-                      (policy_override == NULL) ? _(policy[class]):log_policy,
-                      change_code, tmp_path, msg);
+      if (!sh_global_check_silent)
+        sh_error_handle(log_severity, FIL__, __LINE__, 
+                        (long) modi_mask, MSG_FI_CHAN,
+                        (policy_override == NULL) ? _(policy[class]):log_policy,
+                        change_code, tmp_path, msg);
       ++sh.statistics.files_report;