diff options
| author | Martin Pitt <mpitt@debian.org> | 2016-08-09 18:11:38 +0200 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2018-06-08 15:11:05 +0200 |
| commit | ecb91de222039c8c131fe7d41b03564e51e8cd57 (patch) | |
| tree | eadba412027134f0ce20014f4e064a35067c05d5 | |
| parent | c5842f42fd332bd9a09003bb12522ce269e5a38a (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 74790dc35..46a5efacd 100644 --- a/scheduler/log.c +++ b/scheduler/log.c @@ -20,6 +20,7 @@ # include <systemd/sd-journal.h> #endif /* HAVE_ASL_H */ #include <syslog.h> +#include <grp.h> /* @@ -109,6 +110,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 */ } /* + * Use adm group if possible, fall back to Group + */ + loggrp = getgrnam("adm"); + + /* * Format the filename as needed... */ @@ -240,7 +247,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); } } @@ -283,7 +290,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); } |