Blame SOURCES/cups-logrotate.patch

87cf9a
diff -up cups-1.5b1/scheduler/log.c.logrotate cups-1.5b1/scheduler/log.c
87cf9a
--- cups-1.5b1/scheduler/log.c.logrotate	2011-05-14 01:04:16.000000000 +0200
87cf9a
+++ cups-1.5b1/scheduler/log.c	2011-05-24 15:47:20.000000000 +0200
87cf9a
@@ -32,6 +32,9 @@
87cf9a
 #include "cupsd.h"
87cf9a
 #include <stdarg.h>
87cf9a
 #include <syslog.h>
87cf9a
+#include <sys/types.h>
87cf9a
+#include <sys/stat.h>
87cf9a
+#include <unistd.h>
87cf9a
 
87cf9a
 
87cf9a
 /*
87cf9a
@@ -71,12 +74,10 @@ cupsdCheckLogFile(cups_file_t **lf,	/* I
87cf9a
     return (1);
87cf9a
 
87cf9a
  /*
87cf9a
-  * Format the filename as needed...
87cf9a
+  * Format the filename...
87cf9a
   */
87cf9a
 
87cf9a
-  if (!*lf ||
87cf9a
-      (strncmp(logname, "/dev/", 5) && cupsFileTell(*lf) > MaxLogSize &&
87cf9a
-       MaxLogSize > 0))
87cf9a
+  if (strncmp(logname, "/dev/", 5))
87cf9a
   {
87cf9a
    /*
87cf9a
     * Handle format strings...
87cf9a
@@ -186,6 +187,34 @@ cupsdCheckLogFile(cups_file_t **lf,	/* I
87cf9a
   }
87cf9a
 
87cf9a
  /*
87cf9a
+  * Has someone else (i.e. logrotate) already rotated the log for us?
87cf9a
+  */
87cf9a
+  else if (strncmp(filename, "/dev/", 5))
87cf9a
+  {
87cf9a
+    struct stat st;
87cf9a
+    if (stat(filename, &st) || st.st_size == 0)
87cf9a
+    {
87cf9a
+      /* File is either missing or has zero size. */
87cf9a
+
87cf9a
+      cupsFileClose(*lf);
87cf9a
+      if ((*lf = cupsFileOpen(filename, "a")) == NULL)
87cf9a
+      {
87cf9a
+	syslog(LOG_ERR, "Unable to open log file \"%s\" - %s", filename,
87cf9a
+             strerror(errno));
87cf9a
+
87cf9a
+	return (0);
87cf9a
+      }
87cf9a
+
87cf9a
+     /*
87cf9a
+      * Change ownership and permissions of non-device logs...
87cf9a
+      */
87cf9a
+
87cf9a
+      fchown(cupsFileNumber(*lf), RunUser, Group);
87cf9a
+      fchmod(cupsFileNumber(*lf), LogFilePerm);
87cf9a
+    }
87cf9a
+  }
87cf9a
+
87cf9a
+ /*
87cf9a
   * Do we need to rotate the log?
87cf9a
   */
87cf9a