Removed all references to DECLARG and OLDDECLARG.

Added krb5_context to all krb5_*() routines.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4815 dc483132-0cff-0310-8789-dd5450dbe970

1 files changed, 236 insertions, 129 deletions

diff --git a/src/include/krb5/func-proto.h b/src/include/krb5/func-proto.h
index f5def17a50..b4b6245e79 100644
--- a/src/include/krb5/func-proto.h
+++ b/src/include/krb5/func-proto.h
@@ -32,44 +32,57 @@ krb5_error_code krb5_init_context
 void krb5_free_context
 	PROTOTYPE((krb5_context));
 
+/* This is a hack to find what needs fixing later, when we've all forgotten
+ which rotuines still need fixing */
+extern krb5_context global_context;
+
 /* libkrb.spec */
 krb5_error_code krb5_kdc_rep_decrypt_proc
-	PROTOTYPE((const krb5_keyblock *,
+	PROTOTYPE((krb5_context,
+		   const krb5_keyblock *,
 		   krb5_const_pointer,
 		   krb5_kdc_rep * ));
 krb5_error_code krb5_encode_ticket
-	PROTOTYPE((const krb5_ticket *,
+	PROTOTYPE((krb5_context,
+		   const krb5_ticket *,
 		   krb5_data ** ));
 krb5_error_code krb5_encrypt_tkt_part
-	PROTOTYPE((krb5_encrypt_block *,
+	PROTOTYPE((krb5_context,
+		   krb5_encrypt_block *,
 		   const krb5_keyblock *,
 		   krb5_ticket * ));
 krb5_error_code krb5_decrypt_tkt_part
-	PROTOTYPE((const krb5_keyblock *,
+	PROTOTYPE((krb5_context,
+		   const krb5_keyblock *,
 		   krb5_ticket * ));
 krb5_error_code krb5_get_cred_from_kdc
-	PROTOTYPE((krb5_ccache,		/* not const, as reading may save
+	PROTOTYPE((krb5_context,
+		   krb5_ccache,		/* not const, as reading may save
 					   state */
 		   krb5_creds *,
 		   krb5_creds *** ));
 void krb5_free_tgt_creds
-	PROTOTYPE((krb5_creds ** ));	/* XXX too hard to do with const */
+	PROTOTYPE((krb5_context,
+		   krb5_creds ** ));	/* XXX too hard to do with const */
 
 #define	KRB5_GC_USER_USER	1	/* want user-user ticket */
 #define	KRB5_GC_CACHED		2	/* want cached ticket only */
 
 krb5_error_code krb5_get_credentials
-	PROTOTYPE((const krb5_flags,
+	PROTOTYPE((krb5_context,
+		   const krb5_flags,
 		   krb5_ccache,
 		   krb5_creds * ));
 krb5_error_code krb5_mk_req
-	PROTOTYPE((krb5_const_principal,
+	PROTOTYPE((krb5_context,
+		   krb5_const_principal,
 		   const krb5_flags,
 		   const krb5_checksum *,
 		   krb5_ccache,
 		   krb5_data * ));
 krb5_error_code krb5_mk_req_extended
-	PROTOTYPE((const krb5_flags,
+	PROTOTYPE((krb5_context,
+		   const krb5_flags,
 		   const krb5_checksum *,
 		   const krb5_flags,
 		   krb5_int32,
@@ -79,26 +92,32 @@ krb5_error_code krb5_mk_req_extended
 		   krb5_authenticator *,
 		   krb5_data * ));
 krb5_error_code krb5_rd_req_simple
-	PROTOTYPE((const krb5_data *,
+	PROTOTYPE((krb5_context,
+		   const krb5_data *,
 		   krb5_const_principal,
 		   const krb5_address *,
 		   krb5_tkt_authent ** ));
 krb5_error_code krb5_mk_rep
-	PROTOTYPE((const krb5_ap_rep_enc_part *,
+	PROTOTYPE((krb5_context,
+		   const krb5_ap_rep_enc_part *,
 		   const krb5_keyblock *,
 		   krb5_data *));
 krb5_error_code krb5_rd_rep
-	PROTOTYPE((const krb5_data *,
+	PROTOTYPE((krb5_context,
+		   const krb5_data *,
 		   const krb5_keyblock *,
 		   krb5_ap_rep_enc_part **));
 krb5_error_code krb5_mk_error
-	PROTOTYPE((const krb5_error *,
+	PROTOTYPE((krb5_context,
+		   const krb5_error *,
 		   krb5_data * ));
 krb5_error_code krb5_rd_error
-	PROTOTYPE((const krb5_data *,
+	PROTOTYPE((krb5_context,
+		   const krb5_data *,
 		   krb5_error ** ));
 krb5_error_code krb5_rd_safe
-	PROTOTYPE((const krb5_data *,
+	PROTOTYPE((krb5_context,
+		   const krb5_data *,
 		   const krb5_keyblock *,
 		   const krb5_address *,
 		   const krb5_address *,
@@ -106,7 +125,8 @@ krb5_error_code krb5_rd_safe
 		   krb5_rcache,
 		   krb5_data * ));
 krb5_error_code krb5_rd_priv
-	PROTOTYPE((const krb5_data *,
+	PROTOTYPE((krb5_context,
+		   const krb5_data *,
 		   const krb5_keyblock *,
 		   const krb5_address *,
 		   const krb5_address *,
@@ -115,202 +135,270 @@ krb5_error_code krb5_rd_priv
 		   krb5_rcache,
 		   krb5_data * ));
 krb5_error_code krb5_parse_name
-	PROTOTYPE((const char *,
+	PROTOTYPE((krb5_context,
+		   const char *,
 		   krb5_principal * ));
 krb5_error_code krb5_unparse_name
-	PROTOTYPE((krb5_const_principal,
+	PROTOTYPE((krb5_context,
+		   krb5_const_principal,
 		   char ** ));
 krb5_error_code krb5_unparse_name_ext
-	PROTOTYPE((krb5_const_principal,
+	PROTOTYPE((krb5_context,
+		   krb5_const_principal,
 		   char **,
 		   int *));
 krb5_boolean krb5_address_search
-	PROTOTYPE((const krb5_address *,
+	PROTOTYPE((krb5_context,
+		   const krb5_address *,
 		   krb5_address * const *));
 krb5_boolean krb5_address_compare
-	PROTOTYPE((const krb5_address *,
+	PROTOTYPE((krb5_context,
+		   const krb5_address *,
 		   const krb5_address *));
 int krb5_address_order
-	PROTOTYPE((const krb5_address *,
+	PROTOTYPE((krb5_context,
+		   const krb5_address *,
 		   const krb5_address *));
 krb5_boolean krb5_realm_compare
-	PROTOTYPE((krb5_const_principal,
+	PROTOTYPE((krb5_context,
+		   krb5_const_principal,
 		   krb5_const_principal));
 krb5_boolean krb5_principal_compare
-	PROTOTYPE((krb5_const_principal,
+	PROTOTYPE((krb5_context,
+		   krb5_const_principal,
 		   krb5_const_principal));
 int krb5_fulladdr_order
-	PROTOTYPE((const krb5_fulladdr *,
+	PROTOTYPE((krb5_context,
+		   const krb5_fulladdr *,
 		   const krb5_fulladdr *));
 krb5_error_code krb5_copy_keyblock
-    PROTOTYPE((const krb5_keyblock *,
+    	PROTOTYPE((krb5_context,
+		   const krb5_keyblock *,
 	       krb5_keyblock **));
 krb5_error_code krb5_copy_keyblock_contents
-    PROTOTYPE((const krb5_keyblock *,
+    	PROTOTYPE((krb5_context,
+		   const krb5_keyblock *,
 	       krb5_keyblock *));
 krb5_error_code krb5_copy_creds
-    PROTOTYPE((const krb5_creds *,
+    	PROTOTYPE((krb5_context,
+		   const krb5_creds *,
 	       krb5_creds **));
 krb5_error_code krb5_copy_data
-    PROTOTYPE((const krb5_data *,
+    	PROTOTYPE((krb5_context,
+		   const krb5_data *,
 	       krb5_data **));
 krb5_error_code krb5_copy_principal
-    PROTOTYPE((krb5_const_principal,
+    	PROTOTYPE((krb5_context,
+		   krb5_const_principal,
 	       krb5_principal *));
 krb5_error_code krb5_copy_addresses
-    PROTOTYPE((krb5_address * const *,
+    	PROTOTYPE((krb5_context,
+		   krb5_address * const *,
 	       krb5_address ***));
 krb5_error_code krb5_copy_ticket
-    PROTOTYPE((const krb5_ticket *, krb5_ticket **));
+    	PROTOTYPE((krb5_context,
+		   const krb5_ticket *, krb5_ticket **));
 krb5_error_code krb5_copy_authdata
-    PROTOTYPE((krb5_authdata * const *,
+    	PROTOTYPE((krb5_context,
+		   krb5_authdata * const *,
 	       krb5_authdata ***));
 krb5_error_code krb5_copy_authenticator
-    PROTOTYPE((const krb5_authenticator *,
+    	PROTOTYPE((krb5_context,
+		   const krb5_authenticator *,
 	       krb5_authenticator **));
 krb5_error_code krb5_copy_checksum
-    PROTOTYPE((const krb5_checksum *,
+    	PROTOTYPE((krb5_context,
+		   const krb5_checksum *,
 	       krb5_checksum **));
-void krb5_init_ets PROTOTYPE((void));
+void krb5_init_ets PROTOTYPE((krb5_context));
 krb5_error_code krb5_generate_subkey
-    PROTOTYPE((const krb5_keyblock *, krb5_keyblock **));
+    	PROTOTYPE((krb5_context,
+		   const krb5_keyblock *, krb5_keyblock **));
 krb5_error_code krb5_generate_seq_number
-    PROTOTYPE((const krb5_keyblock *, krb5_int32 *));
+    	PROTOTYPE((krb5_context,
+		   const krb5_keyblock *, krb5_int32 *));
 krb5_error_code krb5_get_server_rcache
-    PROTOTYPE((const krb5_data *, krb5_rcache *));
+    	PROTOTYPE((krb5_context,
+		   const krb5_data *, krb5_rcache *));
 krb5_error_code krb5_build_principal_ext
-    STDARG_P((krb5_principal *, int, const char *, ...));
+    	STDARG_P((krb5_context, krb5_principal *, int, const char *, ...));
 krb5_error_code krb5_build_principal
-    STDARG_P((krb5_principal *, int, const char *, ...));
+    	STDARG_P((krb5_context, krb5_principal *, int, const char *, ...));
 #ifdef va_start
 /* XXX depending on varargs include file defining va_start... */
 krb5_error_code krb5_build_principal_va
-    PROTOTYPE((krb5_principal *, int, const char *, va_list));
+    	PROTOTYPE((krb5_context,
+		   krb5_principal *, int, const char *, va_list));
 #endif
 
 krb5_error_code krb5_425_conv_principal
-	PROTOTYPE((const char *name, const char *instance, const char *realm,
+	PROTOTYPE((krb5_context,
+		   const char *name, const char *instance, const char *realm,
 		   krb5_principal *princ));
 
 krb5_error_code krb5_obtain_padata
-    PROTOTYPE((int type, krb5_principal client, krb5_address **src_addr,
+    	PROTOTYPE((krb5_context,
+		   int type, krb5_principal client, krb5_address **src_addr,
 	           krb5_keyblock *encrypt_key, krb5_pa_data **data));
 
 krb5_error_code krb5_verify_padata
-    PROTOTYPE((krb5_pa_data * data, krb5_principal client,
+    	PROTOTYPE((krb5_context,
+		   krb5_pa_data * data, krb5_principal client,
 	       krb5_address **src_addr, krb5_keyblock *decrypt_key,
 	       int *req_id, int *flags));
 
 /* libkt.spec */
 krb5_error_code krb5_kt_register
-	PROTOTYPE((krb5_kt_ops * ));
+	PROTOTYPE((krb5_context,
+		   krb5_kt_ops * ));
 krb5_error_code krb5_kt_resolve
-	PROTOTYPE((const char *,
+	PROTOTYPE((krb5_context,
+		   const char *,
 		   krb5_keytab * ));
 krb5_error_code krb5_kt_default_name
-	PROTOTYPE((char *,
+	PROTOTYPE((krb5_context,
+		   char *,
 		   int ));
 krb5_error_code krb5_kt_default
-	PROTOTYPE((krb5_keytab * ));
+	PROTOTYPE((krb5_context,
+		   krb5_keytab * ));
 krb5_error_code krb5_kt_free_entry
-	PROTOTYPE((krb5_keytab_entry * ));
+	PROTOTYPE((krb5_context,
+		   krb5_keytab_entry * ));
 /* remove and add are functions, so that they can return NOWRITE
    if not a writable keytab */
 krb5_error_code krb5_kt_remove_entry
-	PROTOTYPE((krb5_keytab,
+	PROTOTYPE((krb5_context,
+		   krb5_keytab,
 		   krb5_keytab_entry * ));
 krb5_error_code krb5_kt_add_entry
-	PROTOTYPE((krb5_keytab,
+	PROTOTYPE((krb5_context,
+		   krb5_keytab,
 		   krb5_keytab_entry * ));
 krb5_error_code krb5_principal2salt
-	PROTOTYPE((krb5_const_principal, krb5_data *));
+	PROTOTYPE((krb5_context,
+		   krb5_const_principal, krb5_data *));
 krb5_error_code krb5_principal2salt_norealm
-	PROTOTYPE((krb5_const_principal, krb5_data *));
+	PROTOTYPE((krb5_context,
+		   krb5_const_principal, krb5_data *));
 
 /* librc.spec--see rcache.h */
 
 /* libcc.spec */
 krb5_error_code krb5_cc_resolve
-	PROTOTYPE((char *,
+	PROTOTYPE((krb5_context,
+		   char *,
 		   krb5_ccache * ));
 krb5_error_code krb5_cc_generate_new
-	PROTOTYPE((krb5_cc_ops *,
+	PROTOTYPE((krb5_context,
+		   krb5_cc_ops *,
 		   krb5_ccache * ));
 char *krb5_cc_default_name
-	PROTOTYPE((void ));
+	PROTOTYPE((krb5_context));
 krb5_error_code krb5_cc_default
-	PROTOTYPE((krb5_ccache *));
+	PROTOTYPE((krb5_context,
+		   krb5_ccache *));
 
 /* chk_trans.c */
 krb5_error_code krb5_check_transited_list
-    PROTOTYPE((krb5_data *trans, krb5_data *realm1, krb5_data *realm2));
+    PROTOTYPE((krb5_context,
+		   krb5_data *trans, krb5_data *realm1, krb5_data *realm2));
 
 /* free_rtree.c */
 void krb5_free_realm_tree
-	PROTOTYPE((krb5_principal *));
+	PROTOTYPE((krb5_context,
+		   krb5_principal *));
 
 /* krb5_free.c */
 void krb5_free_principal
-	PROTOTYPE((krb5_principal ));
+	PROTOTYPE((krb5_context,
+		   krb5_principal ));
 void krb5_free_authenticator
-	PROTOTYPE((krb5_authenticator * ));
+	PROTOTYPE((krb5_context,
+		   krb5_authenticator * ));
 void krb5_free_authenticator_contents
-	PROTOTYPE((krb5_authenticator * ));
+	PROTOTYPE((krb5_context,
+		   krb5_authenticator * ));
 void krb5_free_addresses
-	PROTOTYPE((krb5_address ** ));
+	PROTOTYPE((krb5_context,
+		   krb5_address ** ));
 void krb5_free_address
-	PROTOTYPE((krb5_address * ));
+	PROTOTYPE((krb5_context,
+		   krb5_address * ));
 void krb5_free_authdata
-	PROTOTYPE((krb5_authdata ** ));
+	PROTOTYPE((krb5_context,
+		   krb5_authdata ** ));
 void krb5_free_enc_tkt_part
-	PROTOTYPE((krb5_enc_tkt_part * ));
+	PROTOTYPE((krb5_context,
+		   krb5_enc_tkt_part * ));
 void krb5_free_ticket
-	PROTOTYPE((krb5_ticket * ));
+	PROTOTYPE((krb5_context,
+		   krb5_ticket * ));
 void krb5_free_tickets
-	PROTOTYPE((krb5_ticket ** ));
+	PROTOTYPE((krb5_context,
+		   krb5_ticket ** ));
 void krb5_free_kdc_req
-	PROTOTYPE((krb5_kdc_req * ));
+	PROTOTYPE((krb5_context,
+		   krb5_kdc_req * ));
 void krb5_free_kdc_rep
-	PROTOTYPE((krb5_kdc_rep * ));
+	PROTOTYPE((krb5_context,
+		   krb5_kdc_rep * ));
 void krb5_free_last_req
-	PROTOTYPE((krb5_last_req_entry ** ));
+	PROTOTYPE((krb5_context,
+		   krb5_last_req_entry ** ));
 void krb5_free_enc_kdc_rep_part
-	PROTOTYPE((krb5_enc_kdc_rep_part * ));
+	PROTOTYPE((krb5_context,
+		   krb5_enc_kdc_rep_part * ));
 void krb5_free_error
-	PROTOTYPE((krb5_error * ));
+	PROTOTYPE((krb5_context,
+		   krb5_error * ));
 void krb5_free_ap_req
-	PROTOTYPE((krb5_ap_req * ));
+	PROTOTYPE((krb5_context,
+		   krb5_ap_req * ));
 void krb5_free_ap_rep
-	PROTOTYPE((krb5_ap_rep * ));
+	PROTOTYPE((krb5_context,
+		   krb5_ap_rep * ));
 void krb5_free_safe
-	PROTOTYPE((krb5_safe * ));
+	PROTOTYPE((krb5_context,
+		   krb5_safe * ));
 void krb5_free_priv
-	PROTOTYPE((krb5_priv * ));
+	PROTOTYPE((krb5_context,
+		   krb5_priv * ));
 void krb5_free_priv_enc_part
-	PROTOTYPE((krb5_priv_enc_part * ));
+	PROTOTYPE((krb5_context,
+		   krb5_priv_enc_part * ));
 void krb5_free_kdc_req
-	PROTOTYPE((krb5_kdc_req * ));
+	PROTOTYPE((krb5_context,
+		   krb5_kdc_req * ));
 void krb5_free_creds
-	PROTOTYPE((krb5_creds *));
+	PROTOTYPE((krb5_context,
+		   krb5_creds *));
 void krb5_free_cred_contents
-	PROTOTYPE((krb5_creds *));
+	PROTOTYPE((krb5_context,
+		   krb5_creds *));
 void krb5_free_checksum
-	PROTOTYPE((krb5_checksum *));
+	PROTOTYPE((krb5_context,
+		   krb5_checksum *));
 void krb5_free_keyblock
-	PROTOTYPE((krb5_keyblock *));
+	PROTOTYPE((krb5_context,
+		   krb5_keyblock *));
 void krb5_free_pa_data
-	PROTOTYPE((krb5_pa_data **));
+	PROTOTYPE((krb5_context,
+		   krb5_pa_data **));
 void krb5_free_ap_rep_enc_part
-	PROTOTYPE((krb5_ap_rep_enc_part *));
+	PROTOTYPE((krb5_context,
+		   krb5_ap_rep_enc_part *));
 void krb5_free_tkt_authent
-	PROTOTYPE((krb5_tkt_authent *));
+	PROTOTYPE((krb5_context,
+		   krb5_tkt_authent *));
 #include <krb5/widen.h>
 
 /* Only put things which don't have pointers to the narrow types in this
    section */
 
 krb5_error_code krb5_encode_kdc_rep
-	PROTOTYPE((const krb5_msgtype,
+	PROTOTYPE((krb5_context,
+		   const krb5_msgtype,
 		   const krb5_enc_kdc_rep_part *,
 		   krb5_encrypt_block *,
 		   const krb5_keyblock *,
@@ -318,7 +406,8 @@ krb5_error_code krb5_encode_kdc_rep
 		   krb5_data ** ));
 
 krb5_error_code krb5_send_tgs
-	PROTOTYPE((const krb5_flags,
+	PROTOTYPE((krb5_context,
+		   const krb5_flags,
 		   const krb5_ticket_times *,
 		   const krb5_enctype,
 		   const krb5_cksumtype,
@@ -331,17 +420,20 @@ krb5_error_code krb5_send_tgs
 		   krb5_response * ));
 
 krb5_error_code krb5_get_in_tkt
-	PROTOTYPE((const krb5_flags,
+	PROTOTYPE((krb5_context,
+		   const krb5_flags,
 		   krb5_address * const *,
 		   const krb5_preauthtype,
    		   const krb5_enctype,
 		   const krb5_keytype,
-		   krb5_error_code (* )(const krb5_keytype,
+		   krb5_error_code (* )(krb5_context,
+					const krb5_keytype,
                                         krb5_keyblock **,
                                         krb5_const_pointer,
                                         krb5_pa_data **),
 		   krb5_const_pointer,
-		   krb5_error_code (* )(const krb5_keyblock *,
+		   krb5_error_code (* )(krb5_context,
+					const krb5_keyblock *,
 					krb5_const_pointer,
 					krb5_kdc_rep * ),
 		   krb5_const_pointer,
@@ -350,7 +442,8 @@ krb5_error_code krb5_get_in_tkt
 		   krb5_kdc_rep ** ));
 
 krb5_error_code krb5_get_in_tkt_with_password
-	PROTOTYPE((const krb5_flags,
+	PROTOTYPE((krb5_context,
+		   const krb5_flags,
 		   krb5_address * const *,
 		   const krb5_preauthtype pre_auth_type,
 		   const krb5_enctype,
@@ -361,7 +454,8 @@ krb5_error_code krb5_get_in_tkt_with_password
 		   krb5_kdc_rep ** ));
 
 krb5_error_code krb5_get_in_tkt_with_skey
-	PROTOTYPE((const krb5_flags,
+	PROTOTYPE((krb5_context,
+		   const krb5_flags,
 		   krb5_address * const *,
 		   const krb5_preauthtype pre_auth_type,
 		   const krb5_enctype,
@@ -371,19 +465,22 @@ krb5_error_code krb5_get_in_tkt_with_skey
 		   krb5_kdc_rep ** ));
 
 krb5_error_code krb5_decode_kdc_rep
-	PROTOTYPE((krb5_data *,
+	PROTOTYPE((krb5_context,
+		   krb5_data *,
 		   const krb5_keyblock *,
 		   const krb5_enctype,
 
 		   krb5_kdc_rep ** ));
 
-typedef krb5_error_code (*krb5_rdreq_key_proc) PROTOTYPE((krb5_pointer, 
+typedef krb5_error_code (*krb5_rdreq_key_proc) PROTOTYPE((krb5_context,
+							  krb5_pointer, 
 							  krb5_principal,
 							  krb5_kvno,
 							  krb5_keyblock **));
 	
 krb5_error_code krb5_rd_req
-	PROTOTYPE((const krb5_data *,
+	PROTOTYPE((krb5_context,
+		   const krb5_data *,
 		   krb5_const_principal,
 		   const krb5_address *,
 		   const char *,
@@ -393,7 +490,8 @@ krb5_error_code krb5_rd_req
 		   krb5_tkt_authent ** ));
 
 krb5_error_code krb5_rd_req_decoded
-	PROTOTYPE((const krb5_ap_req *,
+	PROTOTYPE((krb5_context,
+		   const krb5_ap_req *,
 		   krb5_const_principal,
 		   const krb5_address *,
 		   const char *,
@@ -403,12 +501,14 @@ krb5_error_code krb5_rd_req_decoded
 		   krb5_tkt_authent ** ));
 
 krb5_error_code krb5_kt_read_service_key
-	PROTOTYPE((krb5_pointer,
+	PROTOTYPE((krb5_context,
+		   krb5_pointer,
 		   krb5_principal,
 		   krb5_kvno,
 		   krb5_keyblock **));
 krb5_error_code krb5_mk_safe
-	PROTOTYPE((const krb5_data *,
+	PROTOTYPE((krb5_context,
+		   const krb5_data *,
 		   const krb5_cksumtype ,
 		   const krb5_keyblock *,
 		   const krb5_address *,
@@ -417,7 +517,8 @@ krb5_error_code krb5_mk_safe
 		   krb5_rcache,
 		   krb5_data * ));
 krb5_error_code krb5_mk_priv
-	PROTOTYPE((const krb5_data *,
+	PROTOTYPE((krb5_context,
+		   const krb5_data *,
 		   const krb5_enctype,
 		   const krb5_keyblock *,
 		   const krb5_address *,
@@ -427,46 +528,52 @@ krb5_error_code krb5_mk_priv
 		   krb5_pointer,
 		   krb5_data * ));
 krb5_error_code krb5_cc_register
-	PROTOTYPE((krb5_cc_ops *,
+	PROTOTYPE((krb5_context,
+		   krb5_cc_ops *,
 		   krb5_boolean ));
 
-krb5_error_code krb5_sendauth PROTOTYPE((krb5_pointer,
-					 char *,
-					 krb5_principal,
-					 krb5_principal,
-					 krb5_flags,
-					 krb5_checksum *,
-					 krb5_creds *,
-					 krb5_ccache,
-					 krb5_int32 *,
-					 krb5_keyblock **,
-					 krb5_error **,
-					 krb5_ap_rep_enc_part **));
+krb5_error_code krb5_sendauth 
+	PROTOTYPE((krb5_context,
+		   krb5_pointer,
+		   char *,
+		   krb5_principal,
+		   krb5_principal,
+		   krb5_flags,
+		   krb5_checksum *,
+		   krb5_creds *,
+		   krb5_ccache,
+		   krb5_int32 *,
+		   krb5_keyblock **,
+		   krb5_error **,
+		   krb5_ap_rep_enc_part **));
 	
-krb5_error_code krb5_recvauth PROTOTYPE((krb5_pointer,
-					 char *,
-					 krb5_principal,
-					 krb5_address *,
-					 krb5_pointer,
-					 krb5_rdreq_key_proc,
-					 krb5_pointer,
-					 char *,
-					 krb5_int32, 
-					 krb5_int32 *,
-					 krb5_principal*,
-					 krb5_ticket **,
-					 krb5_authenticator **));
+krb5_error_code krb5_recvauth PROTOTYPE((krb5_context,
+		   krb5_pointer,
+		   char *,
+		   krb5_principal,
+		   krb5_address *,
+		   krb5_pointer,
+		   krb5_rdreq_key_proc,
+		   krb5_pointer,
+		   char *,
+		   krb5_int32, 
+		   krb5_int32 *,
+		   krb5_principal*,
+		   krb5_ticket **,
+		   krb5_authenticator **));
 
 
 #ifdef NARROW_PROTOTYPES
 krb5_error_code krb5_walk_realm_tree
-    PROTOTYPE((const krb5_data *,
+    	PROTOTYPE((krb5_context,
+		   const krb5_data *,
 	       const krb5_data *,
 	       krb5_principal **,
 	       char));
 #else
 krb5_error_code krb5_walk_realm_tree
-    PROTOTYPE((const krb5_data *,
+    	PROTOTYPE((krb5_context,
+		   const krb5_data *,
 	       const krb5_data *,
 	       krb5_principal **,
 	       int));