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