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