1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
From ba8db70c9122b50e57d9177239ea152ad5f59c3a Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:38 +0200
Subject: Make log files readable to group "adm", if present.
Bug-Ubuntu: https://launchpad.net/bugs/345953
Last-Update: 2015-02-10
Patch-Name: logfiles_adm_readable.patch
---
scheduler/log.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/scheduler/log.c b/scheduler/log.c
index cdb5437dc..d53d1401c 100644
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -21,6 +21,7 @@
# include <systemd/sd-journal.h>
#endif /* HAVE_ASL_H */
#include <syslog.h>
+#include <grp.h>
/*
@@ -110,6 +111,7 @@ cupsdCheckLogFile(cups_file_t **lf, /* IO - Log file */
filename[1024], /* Formatted log filename */
*ptr; /* Pointer into filename */
const char *logptr; /* Pointer into log filename */
+ struct group *loggrp; /* Group entry of log filename */
/*
@@ -129,6 +131,11 @@ cupsdCheckLogFile(cups_file_t **lf, /* IO - Log file */
return (1);
}
+ /*
+ * Use adm group if possible, fall back to Group
+ */
+ loggrp = getgrnam("adm");
+
/*
* Format the filename as needed...
*/
@@ -241,7 +248,7 @@ cupsdCheckLogFile(cups_file_t **lf, /* IO - Log file */
* Change ownership and permissions of non-device logs...
*/
- fchown(cupsFileNumber(*lf), RunUser, Group);
+ fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
fchmod(cupsFileNumber(*lf), LogFilePerm);
}
}
@@ -284,7 +291,7 @@ cupsdCheckLogFile(cups_file_t **lf, /* IO - Log file */
* Change ownership and permissions of non-device logs...
*/
- fchown(cupsFileNumber(*lf), RunUser, Group);
+ fchown(cupsFileNumber(*lf), RunUser, loggrp ? loggrp->gr_gid : Group);
fchmod(cupsFileNumber(*lf), LogFilePerm);
}
|
