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
|
Description: Make log files readable to group "adm", if present.
Author: Martin Pitt <mpitt@debian.org>
Bug-Ubuntu: https://launchpad.net/bugs/345953
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -32,6 +32,7 @@
#include "cupsd.h"
#include <stdarg.h>
#include <syslog.h>
+#include <grp.h>
/*
@@ -77,6 +78,7 @@
filename[1024], /* Formatted log filename */
*ptr; /* Pointer into filename */
const char *logptr; /* Pointer into log filename */
+ struct group *loggrp; /* Group entry of log filename */
/*
@@ -87,6 +89,11 @@
return (1);
/*
+ * Use adm group if possible, fall back to Group
+ */
+ loggrp = getgrnam("adm");
+
+ /*
* Format the filename as needed...
*/
@@ -196,7 +203,7 @@
* 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);
}
}
@@ -235,7 +242,7 @@
* 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);
}
|
