diff options
Diffstat (limited to 'include/linux/key.h')
-rw-r--r-- | include/linux/key.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/include/linux/key.h b/include/linux/key.h index 1c8b88b455ef..8b297b94bfb3 100644 --- a/include/linux/key.h +++ b/include/linux/key.h | |||
@@ -305,6 +305,11 @@ extern int key_update(key_ref_t key, | |||
305 | extern int key_link(struct key *keyring, | 305 | extern int key_link(struct key *keyring, |
306 | struct key *key); | 306 | struct key *key); |
307 | 307 | ||
308 | extern int key_move(struct key *key, | ||
309 | struct key *from_keyring, | ||
310 | struct key *to_keyring, | ||
311 | unsigned int flags); | ||
312 | |||
308 | extern int key_unlink(struct key *keyring, | 313 | extern int key_unlink(struct key *keyring, |
309 | struct key *key); | 314 | struct key *key); |
310 | 315 | ||
@@ -397,8 +402,8 @@ extern struct ctl_table key_sysctls[]; | |||
397 | * the userspace interface | 402 | * the userspace interface |
398 | */ | 403 | */ |
399 | extern int install_thread_keyring_to_cred(struct cred *cred); | 404 | extern int install_thread_keyring_to_cred(struct cred *cred); |
400 | extern void key_fsuid_changed(struct task_struct *tsk); | 405 | extern void key_fsuid_changed(struct cred *new_cred); |
401 | extern void key_fsgid_changed(struct task_struct *tsk); | 406 | extern void key_fsgid_changed(struct cred *new_cred); |
402 | extern void key_init(void); | 407 | extern void key_init(void); |
403 | 408 | ||
404 | #else /* CONFIG_KEYS */ | 409 | #else /* CONFIG_KEYS */ |
@@ -413,8 +418,8 @@ extern void key_init(void); | |||
413 | #define make_key_ref(k, p) NULL | 418 | #define make_key_ref(k, p) NULL |
414 | #define key_ref_to_ptr(k) NULL | 419 | #define key_ref_to_ptr(k) NULL |
415 | #define is_key_possessed(k) 0 | 420 | #define is_key_possessed(k) 0 |
416 | #define key_fsuid_changed(t) do { } while(0) | 421 | #define key_fsuid_changed(c) do { } while(0) |
417 | #define key_fsgid_changed(t) do { } while(0) | 422 | #define key_fsgid_changed(c) do { } while(0) |
418 | #define key_init() do { } while(0) | 423 | #define key_init() do { } while(0) |
419 | 424 | ||
420 | #endif /* CONFIG_KEYS */ | 425 | #endif /* CONFIG_KEYS */ |