From 1576f4f7364ed6493c00246eced1da68a74f7ffb Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Sat, 11 Jan 2014 15:38:59 +0100 Subject: [PATCH] Consolidate logfiles modes and groups to be 0640 and root:adm - Update cups-daemon.logrotate - Update logfiles_adm_readable patch LP: #1268011 --- debian/cups-daemon.logrotate | 2 +- debian/patches/logfiles_adm_readable.patch | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/debian/cups-daemon.logrotate b/debian/cups-daemon.logrotate index 7355257..48aba45 100644 --- a/debian/cups-daemon.logrotate +++ b/debian/cups-daemon.logrotate @@ -18,5 +18,5 @@ endscript compress notifempty - create 640 root lpadmin + create 640 root adm } diff --git a/debian/patches/logfiles_adm_readable.patch b/debian/patches/logfiles_adm_readable.patch index dd89241..8fe319b 100644 --- a/debian/patches/logfiles_adm_readable.patch +++ b/debian/patches/logfiles_adm_readable.patch @@ -1,6 +1,8 @@ -Description: Make log files readable to group "adm", if present. +Description: Make log files readable to group "adm" if present and with mode 0640 Author: Martin Pitt +Author: Didier Raboud Bug-Ubuntu: https://launchpad.net/bugs/345953 +Bug-Ubuntu: https://launchpad.net/bugs/1268011 --- a/scheduler/log.c +++ b/scheduler/log.c @@ -50,3 +52,14 @@ Bug-Ubuntu: https://launchpad.net/bugs/345953 fchmod(cupsFileNumber(*lf), LogFilePerm); } +--- a/scheduler/conf.h ++++ b/scheduler/conf.h +@@ -174,7 +174,7 @@ + /* Require strict IPP conformance? */ + SyncOnClose VALUE(FALSE), + /* Call fsync() when closing files? */ +- LogFilePerm VALUE(0644); ++ LogFilePerm VALUE(0640); + /* Permissions for log files */ + VAR cupsd_loglevel_t LogLevel VALUE(CUPSD_LOG_WARN); + /* Error log level */ -- 1.8.5.2