summaryrefslogtreecommitdiff
path: root/debian/patches/logfiles_adm_readable.patch
diff options
context:
space:
mode:
authorDidier Raboud <odyx@debian.org>2018-12-10 08:57:27 +0100
committerDidier Raboud <odyx@debian.org>2018-12-10 09:08:07 +0100
commitf88299b16ea2e4bb4d06495b365f4fba2396dd8d (patch)
tree4cde43ec87b730368963199846d304f775ee6d8c /debian/patches/logfiles_adm_readable.patch
parent49b18281fce03edbc0905895230d77cd83648450 (diff)
parentdadbae12448a8c85bb8181f88349f6e7bfd6862f (diff)
merge patched-debian/experimental into debian/experimental
Diffstat (limited to 'debian/patches/logfiles_adm_readable.patch')
-rw-r--r--debian/patches/logfiles_adm_readable.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/debian/patches/logfiles_adm_readable.patch b/debian/patches/logfiles_adm_readable.patch
index 1745becbc..75da42f05 100644
--- a/debian/patches/logfiles_adm_readable.patch
+++ b/debian/patches/logfiles_adm_readable.patch
@@ -1,4 +1,4 @@
-From 531aeeb37ca12fec86817e289c874a842ba0ca8f Mon Sep 17 00:00:00 2001
+From 6b02385777bac4afc282a59098e53bef542802e4 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:38 +0200
Subject: Make log files readable to group "adm", if present.
@@ -12,10 +12,10 @@ Patch-Name: logfiles_adm_readable.patch
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/scheduler/log.c b/scheduler/log.c
-index 74790dc35..46a5efacd 100644
+index cdb5437dc..d53d1401c 100644
--- a/scheduler/log.c
+++ b/scheduler/log.c
-@@ -20,6 +20,7 @@
+@@ -21,6 +21,7 @@
# include <systemd/sd-journal.h>
#endif /* HAVE_ASL_H */
#include <syslog.h>
@@ -23,7 +23,7 @@ index 74790dc35..46a5efacd 100644
/*
-@@ -109,6 +110,7 @@ cupsdCheckLogFile(cups_file_t **lf, /* IO - Log file */
+@@ -110,6 +111,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 */
@@ -31,7 +31,7 @@ index 74790dc35..46a5efacd 100644
/*
-@@ -128,6 +130,11 @@ cupsdCheckLogFile(cups_file_t **lf, /* IO - Log file */
+@@ -129,6 +131,11 @@ cupsdCheckLogFile(cups_file_t **lf, /* IO - Log file */
return (1);
}
@@ -43,7 +43,7 @@ index 74790dc35..46a5efacd 100644
/*
* Format the filename as needed...
*/
-@@ -240,7 +247,7 @@ cupsdCheckLogFile(cups_file_t **lf, /* IO - Log file */
+@@ -241,7 +248,7 @@ cupsdCheckLogFile(cups_file_t **lf, /* IO - Log file */
* Change ownership and permissions of non-device logs...
*/
@@ -52,7 +52,7 @@ index 74790dc35..46a5efacd 100644
fchmod(cupsFileNumber(*lf), LogFilePerm);
}
}
-@@ -283,7 +290,7 @@ cupsdCheckLogFile(cups_file_t **lf, /* IO - Log file */
+@@ -284,7 +291,7 @@ cupsdCheckLogFile(cups_file_t **lf, /* IO - Log file */
* Change ownership and permissions of non-device logs...
*/