diff options
| author | Martin Pitt <mpitt@debian.org> | 2016-08-09 18:11:38 +0200 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2018-12-14 12:47:10 +0100 |
| commit | 868577abc6613d776682af81906a38cc2f68d5fb (patch) | |
| tree | f48e661bd3a3bc332a77f4403443202dafddb8cc | |
| parent | 04481c8139358649196c570bff2fb32132d408a2 (diff) | |
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
| -rw-r--r-- | scheduler/log.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/scheduler/log.c b/scheduler/log.c index bab918769..5c47325f5 100644 --- a/scheduler/log.c +++ b/scheduler/log.c @@ -24,6 +24,7 @@ # include <systemd/sd-journal.h> #endif /* HAVE_ASL_H */ #include <syslog.h> +#include <grp.h> /* @@ -113,6 +114,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 */ /* @@ -133,6 +135,11 @@ cupsdCheckLogFile(cups_file_t **lf, /* IO - Log file */ } /* + * Use adm group if possible, fall back to Group + */ + loggrp = getgrnam("adm"); + + /* * Format the filename as needed... */ @@ -244,7 +251,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); } } @@ -287,7 +294,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); } |