diff options
author | Didier Raboud <odyx@debian.org> | 2017-01-15 12:35:32 +0100 |
---|---|---|
committer | Didier Raboud <odyx@debian.org> | 2017-01-15 12:38:52 +0100 |
commit | b8263b2e464e465f40ce7b6e548f48ca0ec58bc1 (patch) | |
tree | 6b73541319642caca6e4eba5d14d66c3bf2cbf20 /debian/patches/confdirperms.patch | |
parent | 2e76defe6ca465a91c43bf59421f6f80d6a68f29 (diff) | |
parent | 7ce65f2332eb3e8db55078f6f31486c8c09c6150 (diff) |
merge patched-debian/experimental into debian/experimental
Diffstat (limited to 'debian/patches/confdirperms.patch')
-rw-r--r-- | debian/patches/confdirperms.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches/confdirperms.patch b/debian/patches/confdirperms.patch index df499a96c..db3646d9c 100644 --- a/debian/patches/confdirperms.patch +++ b/debian/patches/confdirperms.patch @@ -1,4 +1,4 @@ -From dfab7ccb586804b22f0372572de7a01e36482cff Mon Sep 17 00:00:00 2001 +From af26a48918fdb80781688b66d2d78eb3297a0579 Mon Sep 17 00:00:00 2001 From: Martin Pitt <mpitt@debian.org> Date: Tue, 9 Aug 2016 18:11:41 +0200 Subject: Do not mess with the permissions of cupsd.conf. @@ -11,10 +11,10 @@ Patch-Name: confdirperms.patch 1 file changed, 2 insertions(+) diff --git a/scheduler/conf.c b/scheduler/conf.c -index dc828bc25..5a5a5d477 100644 +index 018eb768c..0c0e5248c 100644 --- a/scheduler/conf.c +++ b/scheduler/conf.c -@@ -1133,10 +1133,12 @@ cupsdReadConfiguration(void) +@@ -1135,10 +1135,12 @@ cupsdReadConfiguration(void) Group, 1, 1) < 0 || cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser, Group, 1, 0) < 0 || |