From 85f8df5b7835800f6f51d42cb9fc51025c3b56ad6c7ddcb35ebfa7a7b03a07b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Sun, 16 Jun 2013 20:47:48 +0000 Subject: [PATCH] Accepting request 179173 from home:lmuelle:branches:security Remove deprecated -c arg while calling cifs.upcall from request-key.conf. OBS-URL: https://build.opensuse.org/request/show/179173 OBS-URL: https://build.opensuse.org/package/show/security/keyutils?expand=0&rev=24 --- keyutils.changes | 5 +++++ request-key-cifs.patch | 2 +- request-key-nfs4.patch | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/keyutils.changes b/keyutils.changes index 6f7e17e..6436450 100644 --- a/keyutils.changes +++ b/keyutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jun 16 16:59:30 UTC 2013 - lmuelle@suse.com + +- Remove deprecated -c arg while calling cifs.upcall from request-key.conf. + ------------------------------------------------------------------- Fri Feb 1 18:53:40 UTC 2013 - coolo@suse.com diff --git a/request-key-cifs.patch b/request-key-cifs.patch index 86a82eb..1937bc2 100644 --- a/request-key-cifs.patch +++ b/request-key-cifs.patch @@ -6,5 +6,5 @@ Index: request-key.conf create user debug:* revoked /bin/keyctl reject %k 30 %c %S create user debug:loop:* * |/bin/cat create user debug:* * /usr/share/keyutils/request-key-debug.sh %k %d %c %S -+create cifs.spnego * * /usr/sbin/cifs.upcall -c %k ++create cifs.spnego * * /usr/sbin/cifs.upcall %k negate * * * /bin/keyctl negate %k 30 %S diff --git a/request-key-nfs4.patch b/request-key-nfs4.patch index c273f9b..913ac2e 100644 --- a/request-key-nfs4.patch +++ b/request-key-nfs4.patch @@ -6,7 +6,7 @@ +++ b/request-key.conf @@ -40,3 +40,5 @@ create user debug:loop:* * |/bin/cat create user debug:* * /usr/share/keyutils/request-key-debug.sh %k %d %c %S - create cifs.spnego * * /usr/sbin/cifs.upcall -c %k + create cifs.spnego * * /usr/sbin/cifs.upcall %k negate * * * /bin/keyctl negate %k 30 %S +create id_resolver * * /usr/sbin/nfsidmap %k %d -t 600 +