Changeset 185 for trunk/src/sh_unix.c

Timestamp:

Oct 29, 2008, 8:59:18 PM (16 years ago)

Author:

katerina

Message:

Bugfixes for log monitoring, samba logfile parser.

File:

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

trunk/src/sh_unix.c

@@ -3500 +3500 @@
    */
 
-  else    /* fstat_return != 0 or !S_ISREG(fbuf->st_mode) */
-    {
-      fstat_return = errno;
+  else    /* fstat_return != 0 or !S_ISREG(fbuf.st_mode) */
+    {
+      uid_t   euid;
+      int fstat_errval = errno;
       if (fileHash != NULL)
         sl_strlcpy(fileHash, SH_KEY_NULL, KEY_LEN+1);
@@ -3509 +3510 @@
         {
           tmp2 = sh_util_safe_name (theFile->fullpath);
-          sh_error_handle (level, FIL__, __LINE__, fstat_return, MSG_E_READ,
-                           tmp2);
+
+          if (fstat_return != 0)
+            {
+              (void) sl_get_euid(&euid);
+              sh_error_handle (level, FIL__, __LINE__, fstat_errval, 
+                               MSG_E_ACCESS, (long) euid, tmp2);
+            }
+          else if (!S_ISREG(fbuf.st_mode))
+            {
+              sh_error_handle (level, FIL__, __LINE__, fstat_errval, 
+                               MSG_E_NOTREG, tmp2);
+            }
+          else
+            {
+              sh_error_handle (level, FIL__, __LINE__, fstat_errval, 
+                               MSG_E_READ, tmp2);
+            }
           SH_FREE(tmp2);
         }