Changeset 402 for trunk

Timestamp:

May 1, 2012, 5:50:32 PM (13 years ago)

Author:

katerina

Message:

Fix for ticket #298, #299 (inotify related extraneous warnings and messages).

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• docs/Changelog (modified) (2 diffs)
• src/sh_fInotify.c (modified) (2 diffs)
• src/sh_files.c (modified) (1 diff)
• src/sh_hash.c (modified) (2 diffs)
• src/sh_unix.c (modified) (1 diff)

trunk/configure.ac

@@ -12 +12 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 3.0.3)
+AM_INIT_AUTOMAKE(samhain, 3.0.4)
 AC_DEFINE([SAMHAIN], 1, [Application is samhain])
 AC_CANONICAL_HOST

trunk/docs/Changelog

@@ -1 @@
-3.0.3:
+3.0.4:
+        * fix verbosity of message for alerts on already deleted watches
+          (set it to debug - suggested by xrx)
+        * fix extraneous error messages about file not found from
+          sh_fInotify_init_internal() (bug reports by xrx and aj)
+
+3.0.3 (28-03-2012):
         * fix potential deadlock in sh_ext_popen()
         * make sure sh_processes_readps cannot hang forever
@@ -10 +16 @@
         * fixed lacking support for O_NOATIME on 64bit linux
 
-3.0.2a:
+3.0.2a (23-02-2012):
         * Fix compile error on Solaris 10
 
-3.0.2:
+3.0.2 (16-02-2012):
         * change sql init scripts to make bigint fields unsigned (problem
           reported by A. Sabitov)

trunk/src/sh_fInotify.c

@@ -363 +363 @@
           if ((errnum == ENOENT) || (errnum == EEXIST))
             {
-              char * epath = sh_util_safe_name (filename);
-              SH_MUTEX_LOCK(mutex_thread_nolog);
-              sh_error_handle( (class == SH_LEVEL_ALLIGNORE) ? 
-                               ShDFLevel[class] : 
-                               ShDFLevel[SH_ERR_T_FILE], 
-                               FIL__, __LINE__, errnum, MSG_E_SUBGPATH, 
-                               errbuf, _("sh_fInotify_init_internal"), epath);
-              SH_MUTEX_UNLOCK(mutex_thread_nolog);
-              SH_FREE(epath);
+              /* (1) Did it exist at init ? 
+               */
+              if (sh_hash_have_it (filename) >= 0)
+                {
+                  /* (2) Do we want to report on it ?
+                   */
+                  if (S_FALSE == sh_ignore_chk_del(filename))
+                    {
+                      char * epath = sh_util_safe_name (filename);
+
+                      SH_MUTEX_LOCK(mutex_thread_nolog);
+                      sh_error_handle( (class == SH_LEVEL_ALLIGNORE) ? 
+                                       ShDFLevel[class] : 
+                                       ShDFLevel[SH_ERR_T_FILE], 
+                                       FIL__, __LINE__, errnum, MSG_E_SUBGPATH, 
+                                       errbuf, _("sh_fInotify_init_internal"), epath);
+                      SH_MUTEX_UNLOCK(mutex_thread_nolog);
+                      SH_FREE(epath);
+                    }
+                }
             }
           else
@@ -457 +468 @@
 
           SH_MUTEX_LOCK(mutex_thread_nolog);
-          sh_error_handle((-1), FIL__, __LINE__, event->wd, MSG_E_SUBGEN, 
+          sh_error_handle(SH_ERR_ALL, FIL__, __LINE__, event->wd, MSG_E_SUBGEN, 
                           _("Watch removed: file path unknown"), 
                           _("sh_fInotify_process"));

trunk/src/sh_files.c

@@ -451 +451 @@
                   CLEAR_SH_FFLAG_REPORTED(ptr->is_reported);
                 }
+
               /* Catchall
                */

trunk/src/sh_hash.c

@@ -1239 +1239 @@
   sh_do_decode(ft.checksum, sl_strlen(ft.checksum));
   
-  
+  /* TXT entries are c_mode[0] != 'l' and do not get decoded 
+   */
   if (ft.c_mode[0] == 'l' && linkpath != notalink)
     {  
       sh_do_decode(linkpath, sl_strlen(linkpath));
     }
+
   if ((ft.mark & REC_FLAGS_ATTR) != 0)
     {  
@@ -1772 +1774 @@
   }
 
+  /* NOTE: TXT entries are c_mode[0] != 'l' and do not get decoded 
+   */
   if (buf != NULL /* && buf->c_mode[0] == 'l' */ && buf->link_path != NULL) 
     {  

trunk/src/sh_unix.c

@@ -4252 +4252 @@
       SH_FREE(linknamebuf);
     }
-  else /* not a link */
+  else /* not a link, theFile->c_mode[0] != 'l' */
     {
       if (content)