Changeset 410

Timestamp:

Aug 28, 2012, 7:06:46 PM (12 years ago)

Author:

katerina

Message:

Improvements for ticket #303 (option SetReportFile for writing out summary after file check).

Location:

trunk

Files:

• include/sh_error.h (modified) (1 diff)
• include/sh_static.h (modified) (2 diffs)
• include/sh_unix.h (modified) (1 diff)
• src/sh_err_log.c (modified) (7 diffs)
• src/sh_readconf.c (modified) (1 diff)
• src/sh_unix.c (modified) (1 diff)

trunk/include/sh_error.h

@@ -191 +191 @@
 void sh_efile_report();
 int sh_efile_path(const char * str);
+int sh_efile_group(const char * str);
 
 /* (re)set the console device(s)

trunk/include/sh_static.h

@@ -15 +15 @@
 void  sh_setpwent(void);
 struct group * sh_getgrnam(const char *name);
+int sh_getgrnam_r(const char *name, struct group *gbuf,
+               char *buf, size_t buflen, struct group **gbufp);
 
 struct passwd * sh_getpwnam(const char *name);
@@ -38 +40 @@
 
 #define sh_initgroups initgroups
+#define sh_getgrnam   getgrnam
+#define sh_getgrnam_r getgrnam_r
 #define sh_getgrgid   getgrgid
 #define sh_getgrgid_r getgrgid_r

trunk/include/sh_unix.h

@@ -340 +340 @@
 char *  sh_unix_getUIDdir (int level, uid_t uid, char * out, size_t len);
 
+/* get a group GID 
+ */
+long sh_group_to_gid (const char * g, int * fail);
 
 #ifdef HAVE_GETTIMEOFDAY

trunk/src/sh_err_log.c

@@ -1058 +1058 @@
 static char * gEfile = NULL;
 static int    gFail  = 0;
+static long   gGid   = 0;
+
+int sh_efile_group(const char * str)
+{
+  int  fail;
+  long gid = sh_group_to_gid(str, &fail);
+
+  if (fail < 0)
+    {
+      return -1;
+    }
+  gGid = gid;
+  return 0;
+}
+
 
 int sh_efile_path(const char * str) 
@@ -1148 +1163 @@
               fchmod (filed, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
               sl_close (fd);
+            }
+          else
+            {
+              static int nFail = 0;
+
+              if (nFail == 0)
+                {
+                  char errmsg[1024];
+                  char * tmp  = sh_util_safe_name (lockfile);
+                  
+                  sl_snprintf(errmsg, sizeof(errmsg), 
+                              _("Error creating lockfile %s"),
+                              tmp);
+                  
+                  sh_error_handle (SH_ERR_ERR, FIL__, __LINE__, 
+                                   0, MSG_E_SUBGEN,
+                                   errmsg, _("sh_efile_lock"));
+                  ++nFail;
+                  SH_FREE(tmp);
+                }
             }
         }
@@ -1191 +1226 @@
 void sh_efile_report()
 {
+  extern int get_the_fd (SL_TICKET ticket);
   SL_TICKET     fd;
   char         *efile;
@@ -1226 +1262 @@
 
               time_t now = time(NULL);
+              int  filed = get_the_fd(fd);
 
               (void) sh_unix_time (now, tstamp, sizeof(tstamp));
@@ -1233 +1270 @@
                           tstamp,
                           (long long) now,
-                          tmp[0], tmp[1], tmp[2], tmp[3], tmp[4], tmp[5]);
+                          (long) tmp[0], (long) tmp[1], (long) tmp[2], 
+                          (long) tmp[3], (long) tmp[4], (long) tmp[5]);
 #else
               sl_snprintf(report, sizeof(report), 
@@ -1239 +1277 @@
                           tstamp,
                           (long) now,
-                          tmp[0], tmp[1], tmp[2], tmp[3], tmp[4], tmp[5]);
+                          (long) tmp[0], (long) tmp[1], (long) tmp[2], 
+                          (long) tmp[3], (long) tmp[4], (long) tmp[5]);
 #endif
                           
@@ -1246 +1285 @@
                 status = sl_write (fd, report,  strlen(report));
               (void) sl_sync(fd);
+
+              /* make group writeable, such that nagios can truncate */
+              fchmod (filed, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH);
+              status = fchown (filed, -1, gGid);
+              if (status < 0)
+                {
+                  int  errnum = errno;
+                  static int nFail = 0;
+                  if (nFail == 0)
+                    {
+                      char errmsg[1024];
+                      char buf[256];
+                      char * tmp  = sh_util_safe_name (efile);
+
+                      sl_snprintf(errmsg, sizeof(errmsg), 
+                                  _("Error changing group of %s to %ld: %s"),
+                                  tmp, gGid, 
+                                  sh_error_message (errnum, buf, sizeof(buf)));
+                      sh_error_handle (SH_ERR_ERR, FIL__, __LINE__, 
+                                       errnum, MSG_E_SUBGEN,
+                                       errmsg, _("sh_efile_report"));
+                      ++nFail;
+                      SH_FREE(tmp);
+                    }
+                }
+
               (void) sl_close(fd);
             }

trunk/src/sh_readconf.c

@@ -1218 +1218 @@
   { N_("setreportfile"),     SH_SECTION_MISC,  SH_SECTION_NONE, 
     sh_efile_path },
+  { N_("setreportgroup"),    SH_SECTION_MISC,  SH_SECTION_NONE, 
+    sh_efile_group },
 
 #ifdef WITH_MESSAGE_QUEUE

trunk/src/sh_unix.c

@@ -1000 +1000 @@
 }
 
+
+/* ---------------------------------------------------------------- */
+
+long sh_group_to_gid (const char * g, int * fail)
+{
+  struct group *           w;
+  gid_t                    gid  = 0;
+
+#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETPWNAM_R)
+  struct group     grp;
+  char           * buffer;
+#endif
+
+  *fail = -1;
+
+  if (g)
+    {
+      size_t i;
+      size_t len = strlen(g);
+
+      *fail = 0;
+
+      for (i = 0; i < len; ++i)
+        {
+          char c = g[i];
+
+          if (!isdigit((int) c))
+            goto is_a_name;
+        }
+      return atol(g);
+
+    is_a_name:
+
+#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETPWNAM_R)
+      buffer = SH_ALLOC(SH_GRBUF_SIZE);
+      sh_getgrnam_r(g, &grp, buffer, SH_GRBUF_SIZE, &w);
+#else
+      w = sh_getgrnam(g);
+#endif
+
+      if (w == NULL)
+        {
+          char * tmp = sh_util_strdup(g);
+          sh_error_handle ((-1), FIL__, __LINE__, EINVAL, MSG_EINVALS, 
+                           _("sh_group_to_gid"), tmp);
+          SH_FREE(tmp);
+          *fail = -1;
+        }
+      else
+        {
+          gid = w->gr_gid;
+        }
+#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETPWNAM_R)
+      SH_FREE(buffer);
+#endif
+    }
+
+  return gid;
+}
 
 /* ---------------------------------------------------------------- */