X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=security%2Fkeys%2Finternal.h;h=1bb416f4bbcef7aa9315e9efcb59d292389ee8b2;hb=9666f4009c22f6520ac3fb8a19c9e32ab973e828;hp=39cba97c5eb9f63e88fd2d23efbbca62f72a165d;hpb=d99cf9d679a520d67f81d805b7cb91c68e1847f0;p=powerpc.git

diff --git a/security/keys/internal.h b/security/keys/internal.h
index 39cba97c5e..1bb416f4bb 100644
--- a/security/keys/internal.h
+++ b/security/keys/internal.h
@@ -99,7 +99,9 @@ extern int install_process_keyring(struct task_struct *tsk);
 extern struct key *request_key_and_link(struct key_type *type,
 					const char *description,
 					const char *callout_info,
-					struct key *dest_keyring);
+					void *aux,
+					struct key *dest_keyring,
+					unsigned long flags);
 
 /*
  * request_key authorisation
@@ -107,12 +109,13 @@ extern struct key *request_key_and_link(struct key_type *type,
 struct request_key_auth {
 	struct key		*target_key;
 	struct task_struct	*context;
+	const char		*callout_info;
 	pid_t			pid;
 };
 
 extern struct key_type key_type_request_key_auth;
 extern struct key *request_key_auth_new(struct key *target,
-					struct key **_rkakey);
+					const char *callout_info);
 
 extern struct key *key_get_instantiation_authkey(key_serial_t target_id);
 
@@ -136,6 +139,8 @@ extern long keyctl_instantiate_key(key_serial_t, const void __user *,
 				   size_t, key_serial_t);
 extern long keyctl_negate_key(key_serial_t, unsigned, key_serial_t);
 extern long keyctl_set_reqkey_keyring(int);
+extern long keyctl_set_timeout(key_serial_t, unsigned);
+extern long keyctl_assume_authority(key_serial_t);
 
 
 /*