changes to accomodate redefinition of krb5_auth_context

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

21 files changed, 46 insertions, 30 deletions

diff --git a/src/kadmin.old/client/ChangeLog b/src/kadmin.old/client/ChangeLog
index 4919e365d0..b22b641c87 100644
--- a/src/kadmin.old/client/ChangeLog
+++ b/src/kadmin.old/client/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jun 10 23:00:53 1995  Tom Yu  (tlyu@dragons-lair)
+
+	* kadmin.c, kadmin_add.c, kadmin_apr.c, kadmin_cpr.c,
+	  kadmin_cpw.c, kadmin_del.c, kadmin_done.c, kadmin_inq.c,
+	  kadmin_mod.c, kadmin_msnd.c: krb5_auth_context redefinitions
+
 Fri Jun  9 19:06:41 1995    <tytso@rsx-11.mit.edu>
 
 	* configure.in: Remove standardized set of autoconf macros, which
diff --git a/src/kadmin.old/client/kadmin.c b/src/kadmin.old/client/kadmin.c
index b927af326f..a18cebe706 100644
--- a/src/kadmin.old/client/kadmin.c
+++ b/src/kadmin.old/client/kadmin.c
@@ -101,7 +101,7 @@ main(argc,argv)
     int nflag = 0;
     int port = 0;
 
-    krb5_auth_context * new_auth_context;
+    krb5_auth_context new_auth_context;
     krb5_replay_data replaydata;
 
     krb5_init_context(&context);
diff --git a/src/kadmin.old/client/kadmin_add.c b/src/kadmin.old/client/kadmin_add.c
index bfc05a8396..083f621665 100644
--- a/src/kadmin.old/client/kadmin_add.c
+++ b/src/kadmin.old/client/kadmin_add.c
@@ -40,7 +40,7 @@ krb5_error_code
 kadm_add_user(context, auth_context, my_creds, local_socket, 
 	      oper_type, principal)
     krb5_context 	  context;
-    krb5_auth_context	* auth_context;
+    krb5_auth_context	  auth_context;
     krb5_creds 		* my_creds;
     int 		* local_socket;
     int 		  oper_type;
diff --git a/src/kadmin.old/client/kadmin_adr.c b/src/kadmin.old/client/kadmin_adr.c
index fea68b98fe..db4927594a 100644
--- a/src/kadmin.old/client/kadmin_adr.c
+++ b/src/kadmin.old/client/kadmin_adr.c
@@ -46,7 +46,7 @@ krb5_error_code
 kadm_add_user_rnd(context, auth_context, my_creds, 
 		  local_socket, principal)
     krb5_context context;
-    krb5_auth_context *auth_context;
+    krb5_auth_context auth_context;
     int *local_socket;
     char *principal;
 {
diff --git a/src/kadmin.old/client/kadmin_cpr.c b/src/kadmin.old/client/kadmin_cpr.c
index 95b1cc374b..a3421a8015 100644
--- a/src/kadmin.old/client/kadmin_cpr.c
+++ b/src/kadmin.old/client/kadmin_cpr.c
@@ -47,7 +47,7 @@ krb5_error_code
 kadm_cpw_user_rnd(context, auth_context, my_creds, 
 		  local_socket, principal)
     krb5_context context;
-    krb5_auth_context *auth_context;
+    krb5_auth_context auth_context;
     int *local_socket;
     char *principal;
 {
diff --git a/src/kadmin.old/client/kadmin_cpw.c b/src/kadmin.old/client/kadmin_cpw.c
index 5705b9f5e1..768d49cee9 100644
--- a/src/kadmin.old/client/kadmin_cpw.c
+++ b/src/kadmin.old/client/kadmin_cpw.c
@@ -41,7 +41,7 @@ krb5_error_code
 kadm_cpw_user(context, auth_context, my_creds, 
 	      local_socket, oper_type, principal)
     krb5_context context;
-    krb5_auth_context *auth_context;
+    krb5_auth_context auth_context;
     int *local_socket;
     int oper_type;
     char *principal;
diff --git a/src/kadmin.old/client/kadmin_del.c b/src/kadmin.old/client/kadmin_del.c
index 062bff0b73..25f362eb7b 100644
--- a/src/kadmin.old/client/kadmin_del.c
+++ b/src/kadmin.old/client/kadmin_del.c
@@ -43,7 +43,7 @@ int print_status_message();
 krb5_error_code
 kadm_del_user(context, auth_context, my_creds, local_socket, principal)
     krb5_context context;
-    krb5_auth_context *auth_context;
+    krb5_auth_context auth_context;
     int *local_socket;
     char *principal;
 {
diff --git a/src/kadmin.old/client/kadmin_done.c b/src/kadmin.old/client/kadmin_done.c
index 05e837ec67..07d38909d5 100644
--- a/src/kadmin.old/client/kadmin_done.c
+++ b/src/kadmin.old/client/kadmin_done.c
@@ -34,7 +34,7 @@
 krb5_error_code
 kadm_done(context, auth_context, my_creds, local_socket)
     krb5_context context;
-    krb5_auth_context *auth_context;
+    krb5_auth_context auth_context;
     int *local_socket;
 {
     krb5_replay_data replaydata;
diff --git a/src/kadmin.old/client/kadmin_inq.c b/src/kadmin.old/client/kadmin_inq.c
index 89ce970ae8..4802de4577 100644
--- a/src/kadmin.old/client/kadmin_inq.c
+++ b/src/kadmin.old/client/kadmin_inq.c
@@ -44,7 +44,7 @@ int print_status_message();
 krb5_error_code
 kadm_inq_user(context, auth_context, my_creds, local_socket, principal)
     krb5_context context;
-    krb5_auth_context *auth_context;
+    krb5_auth_context auth_context;
     int *local_socket;
     char *principal;
 {
diff --git a/src/kadmin.old/client/kadmin_mod.c b/src/kadmin.old/client/kadmin_mod.c
index 71a1df8edd..2a73030d00 100644
--- a/src/kadmin.old/client/kadmin_mod.c
+++ b/src/kadmin.old/client/kadmin_mod.c
@@ -44,7 +44,7 @@ int print_status_message();
 krb5_error_code
 kadm_mod_user(context, auth_context, my_creds, local_socket, principal)
     krb5_context context;
-    krb5_auth_context *auth_context;
+    krb5_auth_context auth_context;
     krb5_creds *my_creds;
     int *local_socket;
     char *principal;
diff --git a/src/kadmin.old/client/kadmin_msnd.c b/src/kadmin.old/client/kadmin_msnd.c
index 8cfe639068..2f5adae35c 100644
--- a/src/kadmin.old/client/kadmin_msnd.c
+++ b/src/kadmin.old/client/kadmin_msnd.c
@@ -51,7 +51,7 @@ extern char *malloc(), *calloc(), *realloc();
 krb5_error_code
 kadm_snd_mod(context, auth_context, my_creds, local_socket)
     krb5_context context;
-    krb5_auth_context *auth_context;
+    krb5_auth_context auth_context;
     krb5_creds *my_creds;
     int *local_socket;
 {
diff --git a/src/kadmin.old/kpasswd/ChangeLog b/src/kadmin.old/kpasswd/ChangeLog
index c456e8a3dc..f7c80df89f 100644
--- a/src/kadmin.old/kpasswd/ChangeLog
+++ b/src/kadmin.old/kpasswd/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jun 10 23:02:12 1995  Tom Yu  (tlyu@dragons-lair)
+
+	* kpasswd.c: krb5_auth_context redefinitions
+
 Fri Jun  9 19:06:53 1995    <tytso@rsx-11.mit.edu>
 
 	* configure.in: Remove standardized set of autoconf macros, which
diff --git a/src/kadmin.old/kpasswd/kpasswd.c b/src/kadmin.old/kpasswd/kpasswd.c
index 1aa2e6685a..0e550ac9c1 100644
--- a/src/kadmin.old/kpasswd/kpasswd.c
+++ b/src/kadmin.old/kpasswd/kpasswd.c
@@ -109,7 +109,7 @@ main(argc,argv)
     char *new_password;
     int new_pwsize;
 
-    krb5_auth_context * new_auth_context;
+    krb5_auth_context new_auth_context;
     krb5_replay_data replaydata;
 
 #ifdef SANDIA
diff --git a/src/kadmin.old/server/ChangeLog b/src/kadmin.old/server/ChangeLog
index 3337030ffd..a8189e6ad7 100644
--- a/src/kadmin.old/server/ChangeLog
+++ b/src/kadmin.old/server/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jun 10 23:02:30 1995  Tom Yu  (tlyu@dragons-lair)
+
+	* adm_adm_func.c, adm_extern.h, adm_funcs.c, adm_kadmin.c,
+	  adm_kpasswd.c, adm_nego.c, adm_process.c: krb5_auth_context
+		redefinitions
+
 Fri Jun  9 19:06:45 1995    <tytso@rsx-11.mit.edu>
 
 	* configure.in: Remove standardized set of autoconf macros, which
diff --git a/src/kadmin.old/server/adm_adm_func.c b/src/kadmin.old/server/adm_adm_func.c
index 8fd57b6e82..b654152795 100644
--- a/src/kadmin.old/server/adm_adm_func.c
+++ b/src/kadmin.old/server/adm_adm_func.c
@@ -48,7 +48,7 @@ extern int classification;
 krb5_error_code
 adm_build_key (context, auth_context, new_passwd, oper_type, entry)
     krb5_context context;
-    krb5_auth_context * auth_context;
+    krb5_auth_context auth_context;
     char *new_passwd;
     int oper_type;
     krb5_db_entry entry;
@@ -171,7 +171,7 @@ adm_build_key (context, auth_context, new_passwd, oper_type, entry)
 krb5_error_code
 adm_change_pwd(context, auth_context, prog, customer_name, salttype)
     krb5_context context;
-    krb5_auth_context * auth_context;
+    krb5_auth_context auth_context;
     char *prog;
     char *customer_name;
     int salttype;
@@ -295,7 +295,7 @@ adm_change_pwd_rnd(context, cmdname, customer_name)
 krb5_error_code
 adm_add_new_key(context, auth_context, cmdname, customer_name, salttype)
     krb5_context context;
-    krb5_auth_context *auth_context;
+    krb5_auth_context auth_context;
     char *cmdname;
     char *customer_name;
     int salttype;
@@ -470,7 +470,7 @@ adm_del_old_key(context, cmdname, customer_name)
 krb5_error_code
 adm_mod_old_key(context, auth_context, cmdname, customer_name)
     krb5_context context;
-    krb5_auth_context * auth_context;
+    krb5_auth_context auth_context;
     char *cmdname;
     char *customer_name;
 {
@@ -682,7 +682,7 @@ adm_mod_old_key(context, auth_context, cmdname, customer_name)
 krb5_error_code
 adm_inq_old_key(context, auth_context, cmdname, customer_name)
     krb5_context context;
-    krb5_auth_context * auth_context;
+    krb5_auth_context auth_context;
     char *cmdname;
     char *customer_name;
 {
diff --git a/src/kadmin.old/server/adm_extern.h b/src/kadmin.old/server/adm_extern.h
index 017689643b..f6ec870841 100644
--- a/src/kadmin.old/server/adm_extern.h
+++ b/src/kadmin.old/server/adm_extern.h
@@ -93,14 +93,14 @@ extern char *kadmind_kadmin_response[];
 
 krb5_error_code adm_build_key
 	PROTOTYPE((krb5_context,
-		   krb5_auth_context *,
+		   krb5_auth_context,
 		   char *,
 		   int,
 		   krb5_db_entry));
 
 krb5_error_code adm_change_pwd
 	PROTOTYPE((krb5_context,
-		   krb5_auth_context *,
+		   krb5_auth_context,
 		   char *,
 		   char *,
 		   int));
@@ -112,7 +112,7 @@ krb5_error_code adm_change_pwd_rnd
 
 krb5_error_code adm_add_new_key
 	PROTOTYPE((krb5_context,
-		   krb5_auth_context *,
+		   krb5_auth_context,
 		   char *,
 		   char *,
 		   int));
@@ -129,13 +129,13 @@ krb5_error_code adm_del_old_key
 
 krb5_error_code adm_mod_old_key
 	PROTOTYPE((krb5_context,
-		   krb5_auth_context *,
+		   krb5_auth_context,
 		   char *,
 		   char *));
 
 krb5_error_code adm_inq_old_key
 	PROTOTYPE((krb5_context, 
-		   krb5_auth_context *,
+		   krb5_auth_context,
 		   char *,
 		   char *));
 
@@ -160,14 +160,14 @@ krb5_error_code adm_enter_rnd_pwd_key
 
 krb5_error_code adm5_kadmin
 	PROTOTYPE((krb5_context,
-		   krb5_auth_context *,
+		   krb5_auth_context,
     		   char *,  
     		   char *,
     		   int *));
 
 krb5_error_code adm_negotiate_key
 	PROTOTYPE((krb5_context,
-		   krb5_auth_context *,
+		   krb5_auth_context,
 		   char const *,
 		   char *));
 
@@ -218,7 +218,7 @@ krb5_error_code adm_enter_pwd_key
 
 krb5_error_code adm5_change
 	PROTOTYPE((krb5_context,
-		   krb5_auth_context *,
+		   krb5_auth_context,
 	    	   char *,
     		   krb5_principal));
 
@@ -228,7 +228,7 @@ int adm5_listen_and_process
 
 krb5_error_code adm5_kpasswd
 	PROTOTYPE((krb5_context,
-		   krb5_auth_context *,
+		   krb5_auth_context,
     		   char *,
     		   kadmin_requests *,
     		   char *,
diff --git a/src/kadmin.old/server/adm_funcs.c b/src/kadmin.old/server/adm_funcs.c
index 7d61c7e067..8b316cc858 100644
--- a/src/kadmin.old/server/adm_funcs.c
+++ b/src/kadmin.old/server/adm_funcs.c
@@ -405,7 +405,7 @@ cleanup:
 krb5_error_code
 adm5_change(context, auth_context, prog, newprinc)
     krb5_context context;
-    krb5_auth_context * auth_context;
+    krb5_auth_context auth_context;
     char *prog;
     krb5_principal newprinc;
 {
diff --git a/src/kadmin.old/server/adm_kadmin.c b/src/kadmin.old/server/adm_kadmin.c
index 556c357398..171516d0fd 100644
--- a/src/kadmin.old/server/adm_kadmin.c
+++ b/src/kadmin.old/server/adm_kadmin.c
@@ -35,7 +35,7 @@
 krb5_error_code
 adm5_kadmin(context, auth_context, prog, retbuf, otype)
     krb5_context context;
-    krb5_auth_context * auth_context;
+    krb5_auth_context auth_context;
     char *prog;
     char *retbuf;		/* Allocated in Calling Routine */
     int *otype;
diff --git a/src/kadmin.old/server/adm_kpasswd.c b/src/kadmin.old/server/adm_kpasswd.c
index 5ab7c74d35..7149654d13 100644
--- a/src/kadmin.old/server/adm_kpasswd.c
+++ b/src/kadmin.old/server/adm_kpasswd.c
@@ -44,7 +44,7 @@ struct cpw_keyproc_arg {
 krb5_error_code
 adm5_kpasswd(context, auth_context, prog, request_type, retbuf, otype)
     krb5_context context;
-    krb5_auth_context *auth_context;
+    krb5_auth_context auth_context;
     char *prog;
     kadmin_requests *request_type;
     char *retbuf;
diff --git a/src/kadmin.old/server/adm_nego.c b/src/kadmin.old/server/adm_nego.c
index abde3419a2..331e8f52a4 100644
--- a/src/kadmin.old/server/adm_nego.c
+++ b/src/kadmin.old/server/adm_nego.c
@@ -45,7 +45,7 @@
 krb5_error_code
 adm_negotiate_key(context, auth_context, prog, new_passwd)
     krb5_context context;
-    krb5_auth_context *auth_context;
+    krb5_auth_context auth_context;
     char const * prog;
     char * new_passwd;
 {
diff --git a/src/kadmin.old/server/adm_process.c b/src/kadmin.old/server/adm_process.c
index 7498f2a198..58f35b7743 100644
--- a/src/kadmin.old/server/adm_process.c
+++ b/src/kadmin.old/server/adm_process.c
@@ -112,7 +112,7 @@ process_client(context, prog)
     krb5_data final_msg;
     char completion_msg[520];
     kadmin_requests request_type;
-    krb5_auth_context *auth_context = NULL;
+    krb5_auth_context auth_context = NULL;
     krb5_ticket * client_ticket = NULL;
     krb5_replay_data replaydata;