Changeset 425 for trunk/src/sh_hash.c

Timestamp:

Feb 20, 2013, 7:30:02 PM (12 years ago)

Author:

katerina

Message:

Fix for tickets #329, #330, #331, #332

File:

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

trunk/src/sh_hash.c

@@ -3035 +3035 @@
     }
 
+  /* ---------  Skip if we don't want to report changes. ------------
+   */
+  
+  if (S_TRUE == sh_ignore_chk_mod(theFile->fullpath))
+    {
+      goto unlock_and_return;
+    }
+
   p->modi_mask = theFile->check_mask;
 
@@ -3057 +3065 @@
       else
         {
-          if (0 != strncmp (&fileHash[KEY_LEN + 1], 
-                            p->theFile.checksum, KEY_LEN))
+          if (0 != strncmp (&fileHash[KEY_LEN + 1], p->theFile.checksum, KEY_LEN))
             {
-              modi_mask |= MODI_CHK;
-              change_code[0] = 'C';
-              TPT ((0, FIL__, __LINE__, _("mod=<checksum>")));
+              if (S_FALSE == sh_check_rotated_log (theFile->fullpath, (UINT64) p->theFile.size, 
+                                                   (UINT64) p->theFile.ino, p->theFile.checksum))
+                {
+                  modi_mask |= MODI_CHK;
+                  change_code[0] = 'C';
+                  TPT ((0, FIL__, __LINE__, _("mod=<checksum>")));
+                }
+              else
+                {
+                  /* logfile has been rotated */
+                  p->theFile.size  = theFile->size;
+                  p->theFile.ino   = theFile->ino;
+                  sl_strlcpy(p->theFile.checksum, fileHash, KEY_LEN+1);
+                }
             }
           else