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