From 48fcd4a99f5e75be488426a7aa01d2e393bd5520 Mon Sep 17 00:00:00 2001 From: Martin Pitt 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 bab918769..5c47325f5 100644 --- a/scheduler/log.c +++ b/scheduler/log.c @@ -24,6 +24,7 @@ # include #endif /* HAVE_ASL_H */ #include +#include /* @@ -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 */ /* @@ -132,6 +134,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... */ @@ -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); } -- cgit v1.2.3