summaryrefslogtreecommitdiffstats
path: root/security/keys/compat.c
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2006-01-08 10:02:43 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-09 05:13:53 +0100
commit017679c4d45783158dba1dd6f79e712c22bb3d9a (patch)
treea536f0b581eacd88a64077f5ff15b29d23fc6405 /security/keys/compat.c
parent[PATCH] kmsg_write: don't return printk return value (diff)
downloadlinux-017679c4d45783158dba1dd6f79e712c22bb3d9a.tar.xz
linux-017679c4d45783158dba1dd6f79e712c22bb3d9a.zip
[PATCH] keys: Permit key expiry time to be set
Add a new keyctl function that allows the expiry time to be set on a key or removed from a key, provided the caller has attribute modification access. Signed-off-by: David Howells <dhowells@redhat.com> Cc: Trond Myklebust <trond.myklebust@fys.uio.no> Cc: Alexander Zangerl <az@bond.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'security/keys/compat.c')
-rw-r--r--security/keys/compat.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/security/keys/compat.c b/security/keys/compat.c
index 3303673c636e..e8e7ef4a290c 100644
--- a/security/keys/compat.c
+++ b/security/keys/compat.c
@@ -74,6 +74,9 @@ asmlinkage long compat_sys_keyctl(u32 option,
case KEYCTL_SET_REQKEY_KEYRING:
return keyctl_set_reqkey_keyring(arg2);
+ case KEYCTL_SET_TIMEOUT:
+ return keyctl_set_timeout(arg2, arg3);
+
default:
return -EOPNOTSUPP;
}