|
![](https://seccdn.libravatar.org/avatar/ea65bbbf308b4e40b533a7d82d44d78439b3dfed89f97118a80e7f7e69cb92d8?s=16&d=retro) |
8d1f53d |
diff -up cups-2.1b1/scheduler/log.c.logrotate cups-2.1b1/scheduler/log.c
|
|
![](https://seccdn.libravatar.org/avatar/ea65bbbf308b4e40b533a7d82d44d78439b3dfed89f97118a80e7f7e69cb92d8?s=16&d=retro) |
8d1f53d |
--- cups-2.1b1/scheduler/log.c.logrotate 2015-06-04 20:00:31.000000000 +0200
|
|
![](https://seccdn.libravatar.org/avatar/ea65bbbf308b4e40b533a7d82d44d78439b3dfed89f97118a80e7f7e69cb92d8?s=16&d=retro) |
8d1f53d |
+++ cups-2.1b1/scheduler/log.c 2015-06-29 13:25:09.623350218 +0200
|
|
![](https://seccdn.libravatar.org/avatar/ea65bbbf308b4e40b533a7d82d44d78439b3dfed89f97118a80e7f7e69cb92d8?s=16&d=retro) |
8d1f53d |
@@ -26,6 +26,9 @@
|
|
![](https://seccdn.libravatar.org/avatar/ea65bbbf308b4e40b533a7d82d44d78439b3dfed89f97118a80e7f7e69cb92d8?s=16&d=retro) |
8d1f53d |
# include <systemd/sd-journal.h>
|
|
![](https://seccdn.libravatar.org/avatar/ea65bbbf308b4e40b533a7d82d44d78439b3dfed89f97118a80e7f7e69cb92d8?s=16&d=retro) |
8d1f53d |
#endif /* HAVE_ASL_H */
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
#include <syslog.h>
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
+#include <sys/types.h>
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
+#include <sys/stat.h>
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
+#include <unistd.h>
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
/*
|
|
![](https://seccdn.libravatar.org/avatar/ea65bbbf308b4e40b533a7d82d44d78439b3dfed89f97118a80e7f7e69cb92d8?s=16&d=retro) |
8d1f53d |
@@ -135,12 +138,10 @@ cupsdCheckLogFile(cups_file_t **lf, /* I
|
|
![](https://seccdn.libravatar.org/avatar/ea65bbbf308b4e40b533a7d82d44d78439b3dfed89f97118a80e7f7e69cb92d8?s=16&d=retro) |
8d1f53d |
}
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
/*
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
- * Format the filename as needed...
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
+ * Format the filename...
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
*/
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
- if (!*lf ||
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
- (strncmp(logname, "/dev/", 5) && cupsFileTell(*lf) > MaxLogSize &&
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
- MaxLogSize > 0))
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
+ if (strncmp(logname, "/dev/", 5))
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
{
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
/*
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
* Handle format strings...
|
|
![](https://seccdn.libravatar.org/avatar/ea65bbbf308b4e40b533a7d82d44d78439b3dfed89f97118a80e7f7e69cb92d8?s=16&d=retro) |
8d1f53d |
@@ -254,6 +255,34 @@ cupsdCheckLogFile(cups_file_t **lf, /* I
|
|
![](https://seccdn.libravatar.org/avatar/ea65bbbf308b4e40b533a7d82d44d78439b3dfed89f97118a80e7f7e69cb92d8?s=16&d=retro) |
8d1f53d |
/*
|
|
![](https://seccdn.libravatar.org/avatar/ea65bbbf308b4e40b533a7d82d44d78439b3dfed89f97118a80e7f7e69cb92d8?s=16&d=retro) |
8d1f53d |
* Change ownership and permissions of non-device logs...
|
|
![](https://seccdn.libravatar.org/avatar/ea65bbbf308b4e40b533a7d82d44d78439b3dfed89f97118a80e7f7e69cb92d8?s=16&d=retro) |
8d1f53d |
*/
|
|
![](https://seccdn.libravatar.org/avatar/ea65bbbf308b4e40b533a7d82d44d78439b3dfed89f97118a80e7f7e69cb92d8?s=16&d=retro) |
8d1f53d |
+
|
|
![](https://seccdn.libravatar.org/avatar/ea65bbbf308b4e40b533a7d82d44d78439b3dfed89f97118a80e7f7e69cb92d8?s=16&d=retro) |
8d1f53d |
+ fchown(cupsFileNumber(*lf), RunUser, Group);
|
|
![](https://seccdn.libravatar.org/avatar/ea65bbbf308b4e40b533a7d82d44d78439b3dfed89f97118a80e7f7e69cb92d8?s=16&d=retro) |
8d1f53d |
+ fchmod(cupsFileNumber(*lf), LogFilePerm);
|
|
![](https://seccdn.libravatar.org/avatar/ea65bbbf308b4e40b533a7d82d44d78439b3dfed89f97118a80e7f7e69cb92d8?s=16&d=retro) |
8d1f53d |
+ }
|
|
![](https://seccdn.libravatar.org/avatar/ea65bbbf308b4e40b533a7d82d44d78439b3dfed89f97118a80e7f7e69cb92d8?s=16&d=retro) |
8d1f53d |
+ }
|
|
![](https://seccdn.libravatar.org/avatar/ea65bbbf308b4e40b533a7d82d44d78439b3dfed89f97118a80e7f7e69cb92d8?s=16&d=retro) |
8d1f53d |
+
|
|
![](https://seccdn.libravatar.org/avatar/ea65bbbf308b4e40b533a7d82d44d78439b3dfed89f97118a80e7f7e69cb92d8?s=16&d=retro) |
8d1f53d |
+ /*
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
+ * Has someone else (i.e. logrotate) already rotated the log for us?
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
+ */
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
+ else if (strncmp(filename, "/dev/", 5))
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
+ {
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
+ struct stat st;
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
+ if (stat(filename, &st) || st.st_size == 0)
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
+ {
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
+ /* File is either missing or has zero size. */
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
+
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
+ cupsFileClose(*lf);
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
+ if ((*lf = cupsFileOpen(filename, "a")) == NULL)
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
+ {
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
+ syslog(LOG_ERR, "Unable to open log file \"%s\" - %s", filename,
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
+ strerror(errno));
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
+
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
+ return (0);
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
+ }
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
+
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
+ /*
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
+ * Change ownership and permissions of non-device logs...
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
+ */
|
|
![](https://seccdn.libravatar.org/avatar/dced3daff0eaf593785c2ba80f2363745a00be2d6d10edf37e22f3d6862b4f98?s=16&d=retro) |
df50584 |
|
|
![](https://seccdn.libravatar.org/avatar/ea65bbbf308b4e40b533a7d82d44d78439b3dfed89f97118a80e7f7e69cb92d8?s=16&d=retro) |
8d1f53d |
fchown(cupsFileNumber(*lf), RunUser, Group);
|
|
![](https://seccdn.libravatar.org/avatar/ea65bbbf308b4e40b533a7d82d44d78439b3dfed89f97118a80e7f7e69cb92d8?s=16&d=retro) |
8d1f53d |
fchmod(cupsFileNumber(*lf), LogFilePerm);
|