changes to accomodate redefinition of krb5_auth_context

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

26 files changed, 74 insertions, 53 deletions

diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index 16ee4615ee..6468bf9aa9 100644
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jun 10 23:04:52 1995  Tom Yu  (tlyu@dragons-lair)
+
+	* accept_sec_context.c, gssapiP_krb5.h, init_sec_context.c:
+		krb5_auth_context redefinitions
+
 Fri Jun  9 19:25:55 1995    <tytso@rsx-11.mit.edu>
 
 	* configure.in: Remove standardized set of autoconf macros, which
diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c
index 78f1839080..c78bf3574d 100644
--- a/src/lib/gssapi/krb5/accept_sec_context.c
+++ b/src/lib/gssapi/krb5/accept_sec_context.c
@@ -59,7 +59,7 @@ krb5_gss_accept_sec_context(context, minor_status, context_handle,
    krb5_gss_ctx_id_rec *ctx;
    krb5_timestamp now;
    gss_buffer_desc token;
-   krb5_auth_context * auth_context = NULL;
+   krb5_auth_context auth_context = NULL;
    krb5_ticket * ticket = NULL;
 
    /* set up returns to be freeable */
diff --git a/src/lib/gssapi/krb5/gssapiP_krb5.h b/src/lib/gssapi/krb5/gssapiP_krb5.h
index 768345a00a..9c46f489a4 100644
--- a/src/lib/gssapi/krb5/gssapiP_krb5.h
+++ b/src/lib/gssapi/krb5/gssapiP_krb5.h
@@ -100,7 +100,7 @@ typedef struct _krb5_gss_ctx_id_rec {
    int established;
    int big_endian;
    krb5_context context;
-   krb5_auth_context * auth_context;
+   krb5_auth_context auth_context;
 } krb5_gss_ctx_id_rec, krb5_gss_ctx_id_t;
 
 extern void *kg_vdb;
diff --git a/src/lib/gssapi/krb5/init_sec_context.c b/src/lib/gssapi/krb5/init_sec_context.c
index 5986b6e9ec..bbcb308b89 100644
--- a/src/lib/gssapi/krb5/init_sec_context.c
+++ b/src/lib/gssapi/krb5/init_sec_context.c
@@ -27,7 +27,7 @@ static krb5_error_code
 make_ap_req(context, auth_context, cred, server, endtime, chan_bindings, 
 	    do_mutual, flags, token)
     krb5_context context;
-    krb5_auth_context ** auth_context;
+    krb5_auth_context * auth_context;
     krb5_gss_cred_id_t cred;
     krb5_principal server;
     krb5_timestamp *endtime;
diff --git a/src/lib/kadm/ChangeLog b/src/lib/kadm/ChangeLog
index bf3acdcb30..4579c61e38 100644
--- a/src/lib/kadm/ChangeLog
+++ b/src/lib/kadm/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jun 10 23:05:23 1995  Tom Yu  (tlyu@dragons-lair)
+
+	* adm_conn.c, adm_rw.c: krb5_auth_context redefinitions
+
 Fri Jun  9 19:26:44 1995    <tytso@rsx-11.mit.edu>
 
 	* configure.in: Remove standardized set of autoconf macros, which
diff --git a/src/lib/kadm/adm_conn.c b/src/lib/kadm/adm_conn.c
index 1c269b6c07..cc01ab6d63 100644
--- a/src/lib/kadm/adm_conn.c
+++ b/src/lib/kadm/adm_conn.c
@@ -67,7 +67,7 @@ static krb5_error_code kadm_contact_server
 		krb5_address **));
 static krb5_error_code kadm_get_auth
 	PROTOTYPE((krb5_context,
-		krb5_auth_context * *,
+		krb5_auth_context *,
 		krb5_address *,
 		krb5_address *));
 
@@ -574,7 +574,7 @@ kadm_contact_server(kcontext, realmp, sockp, local, remote)
 static krb5_error_code
 kadm_get_auth(kcontext, ctxp, local, remote)
     krb5_context	kcontext;
-    krb5_auth_context	**ctxp;
+    krb5_auth_context	*ctxp;
     krb5_address	*local;
     krb5_address	*remote;
 {
@@ -606,7 +606,7 @@ krb5_adm_connect(kcontext, user, prompt, opassword, sockp, ctxp,
     char		*prompt;	/* Old password prompt	(In ) */
     char		*opassword;	/* Old Password		(I/O) */
     int			*sockp;		/* Socket for conn.	(Out) */
-    krb5_auth_context	**ctxp;		/* Auth context		(Out) */
+    krb5_auth_context	*ctxp;		/* Auth context		(Out) */
     krb5_ccache		*ccachep;	/* Credentials cache	(I/O) */
     char		*ccname;	/* Cred cache name	(In ) */
     krb5_timestamp	tlife;		/* Ticket lifetime	(In ) */
@@ -629,7 +629,7 @@ krb5_adm_connect(kcontext, user, prompt, opassword, sockp, ctxp,
     *sockp = -1;
     local_addr = remote_addr = (krb5_address *) NULL;
     client = (krb5_principal) NULL;
-    *ctxp = (krb5_auth_context *) NULL;
+    *ctxp = (krb5_auth_context) NULL;
     ccache_supplied = (*ccachep != (krb5_ccache) NULL);
 
     /*
@@ -708,7 +708,7 @@ krb5_adm_connect(kcontext, user, prompt, opassword, sockp, ctxp,
     if (kret) {
 	if (*ctxp) {
 	    krb5_xfree(*ctxp);
-	    *ctxp = (krb5_auth_context *) NULL;
+	    *ctxp = (krb5_auth_context) NULL;
 	}
 	if (*sockp >= 0) {
 	    close(*sockp);
@@ -745,7 +745,7 @@ void INTERFACE
 krb5_adm_disconnect(kcontext, socketp, auth_context, ccache)
     krb5_context	kcontext;
     int			*socketp;
-    krb5_auth_context	*auth_context;
+    krb5_auth_context	auth_context;
     krb5_ccache		ccache;
 {
     if (ccache)
diff --git a/src/lib/kadm/adm_rw.c b/src/lib/kadm/adm_rw.c
index dda6e7d617..bed4e4bb15 100644
--- a/src/lib/kadm/adm_rw.c
+++ b/src/lib/kadm/adm_rw.c
@@ -100,7 +100,7 @@ krb5_error_code INTERFACE
 krb5_send_adm_cmd(kcontext, sock, ctx, nargs, arglist)
     krb5_context	kcontext;	/* Context handle	(In ) */
     krb5_pointer	sock;		/* Socket to write to	(In ) */
-    krb5_auth_context	*ctx;		/* Auth context		(In ) */
+    krb5_auth_context	ctx;		/* Auth context		(In ) */
     krb5_int32			nargs;		/* Number of arguments	(In ) */
     krb5_data		*arglist;	/* Components to write	(In ) */
 {
@@ -193,7 +193,7 @@ krb5_error_code
 krb5_send_adm_reply(kcontext, sock, ctx, cmd_stat, ncomps, complist)
     krb5_context	kcontext;	/* Context handle	(In ) */
     krb5_pointer	sock;		/* Socket to write to	(In ) */
-    krb5_auth_context	*ctx;		/* Auth context		(In ) */
+    krb5_auth_context	ctx;		/* Auth context		(In ) */
     krb5_int32		cmd_stat;	/* Command status	(In ) */
     krb5_int32			ncomps;		/* Number of arguments	(In ) */
     krb5_data		*complist;	/* Components to write	(In ) */
@@ -288,7 +288,7 @@ krb5_error_code
 krb5_read_adm_cmd(kcontext, sock, ctx, nargs, arglist)
     krb5_context	kcontext;	/* Context handle	(In ) */
     krb5_pointer	sock;		/* Socket to read from	(In ) */
-    krb5_auth_context	*ctx;		/* Auth context		(In ) */
+    krb5_auth_context	ctx;		/* Auth context		(In ) */
     krb5_int32		*nargs;		/* Number of arguments	(Out) */
     krb5_data		**arglist;	/* List of arguments	(Out) */
 {
@@ -416,7 +416,7 @@ krb5_error_code INTERFACE
 krb5_read_adm_reply(kcontext, sock, ctx, cmd_stat, ncomps, complist)
     krb5_context	kcontext;	/* Context handle	(In ) */
     krb5_pointer	sock;		/* Socket to read from	(In ) */
-    krb5_auth_context	*ctx;		/* Auth context		(In ) */
+    krb5_auth_context	ctx;		/* Auth context		(In ) */
     krb5_int32		*cmd_stat;	/* Command status	(Out) */
     krb5_int32		*ncomps;	/* # of reply components(Out) */
     krb5_data		**complist;	/* List of components	(Out) */
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 6dc506193a..4657fb7d7c 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,10 @@
+Sat Jun 10 23:05:51 1995  Tom Yu  (tlyu@dragons-lair)
+
+	* auth_con.c, compat_recv.c, mk_cred.c, mk_priv.c, mk_rep.c,
+	  mk_req.c, mk_req_ext.c, mk_safe.c, rd_cred.c, rd_priv.c,
+	  rd_rep.c, rd_req.c rd_req_dec.c, rd_safe.c, recvauth.c,
+	  sendauth.c: krb5_auth_context redefinitions
+
 Fri Jun  9 18:48:43 1995    <tytso@rsx-11.mit.edu>
 
 	* rd_req_dec.c (krb5_rd_req_decoded): Fix -Wall nits
diff --git a/src/lib/krb5/krb/auth_con.c b/src/lib/krb5/krb/auth_con.c
index 44828cb3ab..c58d61cb18 100644
--- a/src/lib/krb5/krb/auth_con.c
+++ b/src/lib/krb5/krb/auth_con.c
@@ -5,9 +5,10 @@
 krb5_error_code
 krb5_auth_con_init(context, auth_context)
     krb5_context      	  context;
-    krb5_auth_context  ** auth_context;
+    krb5_auth_context  * auth_context;
 {
-    *auth_context = (krb5_auth_context *)malloc(sizeof(krb5_auth_context));
+    *auth_context =
+            (krb5_auth_context)malloc(sizeof(struct _krb5_auth_context));
     if (!*auth_context)
 	    return ENOMEM;
     
@@ -25,7 +26,7 @@ krb5_auth_con_init(context, auth_context)
 krb5_error_code
 krb5_auth_con_free(context, auth_context)
     krb5_context      	  context;
-    krb5_auth_context 	* auth_context;
+    krb5_auth_context     auth_context;
 {
     if (auth_context->local_addr) 
 	free(auth_context->local_addr);
@@ -50,7 +51,7 @@ krb5_auth_con_free(context, auth_context)
 krb5_error_code
 krb5_auth_con_setaddrs(context, auth_context, local_addr, remote_addr)
     krb5_context      	  context;
-    krb5_auth_context 	* auth_context;
+    krb5_auth_context 	  auth_context;
     krb5_address      	* local_addr;
     krb5_address      	* remote_addr;
 {
@@ -97,7 +98,7 @@ krb5_auth_con_setaddrs(context, auth_context, local_addr, remote_addr)
 krb5_error_code
 krb5_auth_con_getaddrs(context, auth_context, local_addr, remote_addr)
     krb5_context      	  context;
-    krb5_auth_context 	* auth_context;
+    krb5_auth_context 	  auth_context;
     krb5_address       ** local_addr;
     krb5_address       ** remote_addr;
 {
@@ -144,7 +145,7 @@ krb5_auth_con_getaddrs(context, auth_context, local_addr, remote_addr)
 krb5_error_code
 krb5_auth_con_setports(context, auth_context, local_port, remote_port)
     krb5_context      	  context;
-    krb5_auth_context 	* auth_context;
+    krb5_auth_context     auth_context;
     krb5_address      	* local_port;
     krb5_address      	* remote_port;
 {
@@ -199,7 +200,7 @@ krb5_auth_con_setports(context, auth_context, local_port, remote_port)
 krb5_error_code
 krb5_auth_con_setuseruserkey(context, auth_context, keyblock)
     krb5_context      	  context;
-    krb5_auth_context 	* auth_context;
+    krb5_auth_context 	  auth_context;
     krb5_keyblock       * keyblock;		
 {
     if (auth_context->keyblock)
@@ -210,7 +211,7 @@ krb5_auth_con_setuseruserkey(context, auth_context, keyblock)
 krb5_error_code
 krb5_auth_con_getkey(context, auth_context, keyblock)
     krb5_context      	  context;
-    krb5_auth_context 	* auth_context;
+    krb5_auth_context 	  auth_context;
     krb5_keyblock      ** keyblock;		
 {
     if (auth_context->keyblock)
@@ -222,7 +223,7 @@ krb5_auth_con_getkey(context, auth_context, keyblock)
 krb5_error_code
 krb5_auth_con_getlocalsubkey(context, auth_context, keyblock)
     krb5_context      	  context;
-    krb5_auth_context 	* auth_context;
+    krb5_auth_context 	  auth_context;
     krb5_keyblock      ** keyblock;		
 {
     if (auth_context->local_subkey)
@@ -234,7 +235,7 @@ krb5_auth_con_getlocalsubkey(context, auth_context, keyblock)
 krb5_error_code
 krb5_auth_con_getremotesubkey(context, auth_context, keyblock)
     krb5_context      	  context;
-    krb5_auth_context 	* auth_context;
+    krb5_auth_context 	  auth_context;
     krb5_keyblock      ** keyblock;		
 {
     if (auth_context->remote_subkey)
@@ -246,7 +247,7 @@ krb5_auth_con_getremotesubkey(context, auth_context, keyblock)
 krb5_error_code
 krb5_auth_con_setcksumtype(context, auth_context, cksumtype)
     krb5_context      	  context;
-    krb5_auth_context 	* auth_context;
+    krb5_auth_context 	  auth_context;
     krb5_cksumtype	  cksumtype;		
 {
     auth_context->cksumtype = cksumtype;
@@ -256,7 +257,7 @@ krb5_auth_con_setcksumtype(context, auth_context, cksumtype)
 krb5_error_code
 krb5_auth_con_getlocalseqnumber(context, auth_context, seqnumber)
     krb5_context      	  context;
-    krb5_auth_context 	* auth_context;
+    krb5_auth_context 	  auth_context;
     krb5_int32	  	* seqnumber;		
 {
     *seqnumber = auth_context->local_seq_number;
@@ -266,7 +267,7 @@ krb5_auth_con_getlocalseqnumber(context, auth_context, seqnumber)
 krb5_error_code
 krb5_auth_con_getauthenticator(context, auth_context, authenticator)
     krb5_context      	  context;
-    krb5_auth_context 	* auth_context;
+    krb5_auth_context 	  auth_context;
     krb5_authenticator ** authenticator;		
 {
     return (krb5_copy_authenticator(context, auth_context->authentp,
@@ -276,7 +277,7 @@ krb5_auth_con_getauthenticator(context, auth_context, authenticator)
 krb5_error_code
 krb5_auth_con_getremoteseqnumber(context, auth_context, seqnumber)
     krb5_context      	  context;
-    krb5_auth_context 	* auth_context;
+    krb5_auth_context 	  auth_context;
     krb5_int32	  	* seqnumber;		
 {
     *seqnumber = auth_context->remote_seq_number;
@@ -286,7 +287,7 @@ krb5_auth_con_getremoteseqnumber(context, auth_context, seqnumber)
 krb5_error_code
 krb5_auth_con_initivector(context, auth_context)
     krb5_context      	  context;
-    krb5_auth_context 	* auth_context;
+    krb5_auth_context 	  auth_context;
 {
     if (auth_context->keyblock) {
 	int size = krb5_keytype_array[auth_context->keyblock->keytype]->
@@ -304,7 +305,7 @@ krb5_auth_con_initivector(context, auth_context)
 krb5_error_code
 krb5_auth_con_setivector(context, auth_context, ivector)
     krb5_context      	  context;
-    krb5_auth_context 	* auth_context;
+    krb5_auth_context 	  auth_context;
     krb5_pointer	  ivector;
 {
     auth_context->i_vector = ivector;
@@ -314,7 +315,7 @@ krb5_auth_con_setivector(context, auth_context, ivector)
 krb5_error_code
 krb5_auth_con_getivector(context, auth_context, ivector)
     krb5_context      	  context;
-    krb5_auth_context 	* auth_context;
+    krb5_auth_context 	  auth_context;
     krb5_pointer	* ivector;
 {
     *ivector = auth_context->i_vector;
@@ -324,7 +325,7 @@ krb5_auth_con_getivector(context, auth_context, ivector)
 krb5_error_code
 krb5_auth_con_setflags(context, auth_context, flags)
     krb5_context      	  context;
-    krb5_auth_context 	* auth_context;
+    krb5_auth_context 	  auth_context;
     krb5_int32		  flags;
 {
     auth_context->auth_context_flags = flags;
@@ -334,7 +335,7 @@ krb5_auth_con_setflags(context, auth_context, flags)
 krb5_error_code
 krb5_auth_con_getflags(context, auth_context, flags)
     krb5_context      	  context;
-    krb5_auth_context 	* auth_context;
+    krb5_auth_context 	  auth_context;
     krb5_int32		* flags;
 {
     *flags = auth_context->auth_context_flags;
@@ -344,7 +345,7 @@ krb5_auth_con_getflags(context, auth_context, flags)
 krb5_error_code
 krb5_auth_con_setrcache(context, auth_context, rcache)
     krb5_context      	  context;
-    krb5_auth_context 	* auth_context;
+    krb5_auth_context 	  auth_context;
     krb5_rcache		  rcache;
 {
     auth_context->rcache = rcache;
diff --git a/src/lib/krb5/krb/compat_recv.c b/src/lib/krb5/krb/compat_recv.c
index 5041056b6c..b5c96d4848 100644
--- a/src/lib/krb5/krb/compat_recv.c
+++ b/src/lib/krb5/krb/compat_recv.c
@@ -62,7 +62,7 @@ krb5_compat_recvauth(context, auth_context,
 		     ticket,
 		     auth_sys, v4_kdata, v4_schedule, v4_version)
     krb5_context context;
-    krb5_auth_context **auth_context;
+    krb5_auth_context  *auth_context;
 	krb5_pointer	fdp;
 	char	*appl_version;
 	krb5_principal	server;
diff --git a/src/lib/krb5/krb/mk_cred.c b/src/lib/krb5/krb/mk_cred.c
index e476aaa939..9d2ef6d8e0 100644
--- a/src/lib/krb5/krb/mk_cred.c
+++ b/src/lib/krb5/krb/mk_cred.c
@@ -189,7 +189,7 @@ krb5_error_code INTERFACE
 krb5_mk_ncred(context, auth_context, ppcreds, ppdata, outdata)
 
     krb5_context 	  context;
-    krb5_auth_context	* auth_context;
+    krb5_auth_context	  auth_context;
     krb5_creds 	       ** ppcreds;
     krb5_data 	       ** ppdata;
     krb5_replay_data  	* outdata;
@@ -347,7 +347,7 @@ error:
 krb5_error_code INTERFACE
 krb5_mk_1cred(context, auth_context, pcreds, ppdata, outdata)
     krb5_context 	  context;
-    krb5_auth_context	* auth_context;
+    krb5_auth_context	  auth_context;
     krb5_creds 		* pcreds;
     krb5_data 	       ** ppdata;
     krb5_replay_data  	* outdata;
diff --git a/src/lib/krb5/krb/mk_priv.c b/src/lib/krb5/krb/mk_priv.c
index 7e9e37f682..cf535ff070 100644
--- a/src/lib/krb5/krb/mk_priv.c
+++ b/src/lib/krb5/krb/mk_priv.c
@@ -136,7 +136,7 @@ clean_scratch:
 krb5_error_code
 krb5_mk_priv(context, auth_context, userdata, outbuf, outdata)
     krb5_context 	  context;
-    krb5_auth_context 	* auth_context;
+    krb5_auth_context 	  auth_context;
     const krb5_data   	* userdata;
     krb5_data         	* outbuf;
     krb5_replay_data  	* outdata;
diff --git a/src/lib/krb5/krb/mk_rep.c b/src/lib/krb5/krb/mk_rep.c
index cea6404ed5..e1f31be386 100644
--- a/src/lib/krb5/krb/mk_rep.c
+++ b/src/lib/krb5/krb/mk_rep.c
@@ -39,7 +39,7 @@
 krb5_error_code
 krb5_mk_rep(context, auth_context, outbuf)
     krb5_context 	  context;
-    krb5_auth_context	* auth_context;
+    krb5_auth_context	  auth_context;
     krb5_data 		* outbuf;
 {
     krb5_error_code 	  retval;
diff --git a/src/lib/krb5/krb/mk_req.c b/src/lib/krb5/krb/mk_req.c
index 98b0b699dc..cb8a06fb43 100644
--- a/src/lib/krb5/krb/mk_req.c
+++ b/src/lib/krb5/krb/mk_req.c
@@ -52,7 +52,7 @@ krb5_error_code
 krb5_mk_req(context, auth_context, ap_req_options, service, hostname, in_data,
 	      ccache, outbuf)
     krb5_context          context;
-    krb5_auth_context  ** auth_context;
+    krb5_auth_context   * auth_context;
     const krb5_flags      ap_req_options;
     char		* service;
     char		* hostname;
diff --git a/src/lib/krb5/krb/mk_req_ext.c b/src/lib/krb5/krb/mk_req_ext.c
index 48554e013a..1afdcfd077 100644
--- a/src/lib/krb5/krb/mk_req_ext.c
+++ b/src/lib/krb5/krb/mk_req_ext.c
@@ -71,7 +71,7 @@ krb5_error_code INTERFACE
 krb5_mk_req_extended(context, auth_context, ap_req_options, in_data, in_creds,
 		     outbuf)
     krb5_context 	  context;
-    krb5_auth_context	**auth_context;
+    krb5_auth_context	* auth_context;
     const krb5_flags 	  ap_req_options;
     krb5_data		* in_data;
     krb5_creds 		* in_creds;
@@ -80,7 +80,7 @@ krb5_mk_req_extended(context, auth_context, ap_req_options, in_data, in_creds,
     krb5_error_code 	  retval;
     krb5_checksum	  checksum;
     krb5_checksum	  *checksump = 0;
-    krb5_auth_context	* new_auth_context;
+    krb5_auth_context	  new_auth_context;
 
     krb5_ap_req request;
     krb5_data *scratch = 0;
diff --git a/src/lib/krb5/krb/mk_safe.c b/src/lib/krb5/krb/mk_safe.c
index b105da8341..0dfb165918 100644
--- a/src/lib/krb5/krb/mk_safe.c
+++ b/src/lib/krb5/krb/mk_safe.c
@@ -121,7 +121,7 @@ cleanup_scratch:
 krb5_error_code
 krb5_mk_safe(context, auth_context, userdata, outbuf, outdata)
     krb5_context 	  context;
-    krb5_auth_context 	* auth_context;
+    krb5_auth_context 	  auth_context;
     const krb5_data   	* userdata;
     krb5_data         	* outbuf;
     krb5_replay_data  	* outdata;
diff --git a/src/lib/krb5/krb/rd_cred.c b/src/lib/krb5/krb/rd_cred.c
index d489dcbeba..a20837fed1 100644
--- a/src/lib/krb5/krb/rd_cred.c
+++ b/src/lib/krb5/krb/rd_cred.c
@@ -211,7 +211,7 @@ extern krb5_deltat krb5_clockskew;
 krb5_error_code INTERFACE
 krb5_rd_cred(context, auth_context, pcreddata, pppcreds, outdata)
     krb5_context          context;
-    krb5_auth_context   * auth_context;
+    krb5_auth_context     auth_context;
     krb5_data 		* pcreddata;       
     krb5_creds        *** pppcreds;
     krb5_replay_data  	* outdata;
diff --git a/src/lib/krb5/krb/rd_priv.c b/src/lib/krb5/krb/rd_priv.c
index 00ccd28280..e444d643f6 100644
--- a/src/lib/krb5/krb/rd_priv.c
+++ b/src/lib/krb5/krb/rd_priv.c
@@ -174,7 +174,7 @@ cleanup_privmsg:;
 krb5_error_code
 krb5_rd_priv(context, auth_context, inbuf, outbuf, outdata)
     krb5_context 	  context;
-    krb5_auth_context 	* auth_context;
+    krb5_auth_context 	  auth_context;
     const krb5_data   	* inbuf;
     krb5_data 	      	* outbuf;
     krb5_replay_data  	* outdata;
diff --git a/src/lib/krb5/krb/rd_rep.c b/src/lib/krb5/krb/rd_rep.c
index 2a96f4cec6..c55646be00 100644
--- a/src/lib/krb5/krb/rd_rep.c
+++ b/src/lib/krb5/krb/rd_rep.c
@@ -41,7 +41,7 @@
 krb5_error_code INTERFACE
 krb5_rd_rep(context, auth_context, inbuf, repl)
     krb5_context 	  context;
-    krb5_auth_context	* auth_context;
+    krb5_auth_context	  auth_context;
     const krb5_data 	* inbuf;
     krb5_ap_rep_enc_part **repl;
 {
diff --git a/src/lib/krb5/krb/rd_req.c b/src/lib/krb5/krb/rd_req.c
index 35c3483eb8..9ed6eb2c9e 100644
--- a/src/lib/krb5/krb/rd_req.c
+++ b/src/lib/krb5/krb/rd_req.c
@@ -46,7 +46,7 @@ krb5_error_code
 krb5_rd_req(context, auth_context, inbuf, server, keytab, 
 	    ap_req_options, ticket)
     krb5_context 	  context;
-    krb5_auth_context  ** auth_context;
+    krb5_auth_context   * auth_context;
     const krb5_data 	* inbuf;
     krb5_const_principal  server;	/* XXX do we really need this */
     krb5_keytab		  keytab;
@@ -55,7 +55,7 @@ krb5_rd_req(context, auth_context, inbuf, server, keytab,
 {
     krb5_error_code 	  retval;
     krb5_ap_req 	* request;
-    krb5_auth_context	* new_auth_context;
+    krb5_auth_context	  new_auth_context;
     krb5_keytab           new_keytab = NULL;
 
     if (!krb5_is_ap_req(inbuf))
diff --git a/src/lib/krb5/krb/rd_req_dec.c b/src/lib/krb5/krb/rd_req_dec.c
index c450a69c12..10e566aa71 100644
--- a/src/lib/krb5/krb/rd_req_dec.c
+++ b/src/lib/krb5/krb/rd_req_dec.c
@@ -95,7 +95,7 @@ krb5_error_code
 krb5_rd_req_decoded(context, auth_context, req, server, keytab, 
 		    ap_req_options, ticket)
     krb5_context 	  context;
-    krb5_auth_context  ** auth_context;
+    krb5_auth_context   * auth_context;
     const krb5_ap_req 	* req;
     krb5_const_principal  server;
     krb5_keytab           keytab;
diff --git a/src/lib/krb5/krb/rd_safe.c b/src/lib/krb5/krb/rd_safe.c
index 2e4a2fc288..cb348d9971 100644
--- a/src/lib/krb5/krb/rd_safe.c
+++ b/src/lib/krb5/krb/rd_safe.c
@@ -165,7 +165,7 @@ cleanup:
 krb5_error_code
 krb5_rd_safe(context, auth_context, inbuf, outbuf, outdata)
     krb5_context 	  context;
-    krb5_auth_context 	* auth_context;
+    krb5_auth_context 	  auth_context;
     const krb5_data   	* inbuf;
     krb5_data 	      	* outbuf;
     krb5_replay_data  	* outdata;
diff --git a/src/lib/krb5/krb/recvauth.c b/src/lib/krb5/krb/recvauth.c
index 2cfdf48da7..27052fc419 100644
--- a/src/lib/krb5/krb/recvauth.c
+++ b/src/lib/krb5/krb/recvauth.c
@@ -43,7 +43,7 @@ krb5_recvauth(context, auth_context,
 	      /* OUT */
 	      ticket)
     krb5_context 	  context;
-    krb5_auth_context  ** auth_context;
+    krb5_auth_context   * auth_context;
     krb5_pointer	  fd;
     char		* appl_version;
     krb5_principal	  server;
@@ -51,7 +51,7 @@ krb5_recvauth(context, auth_context,
     krb5_keytab		  keytab;
     krb5_ticket	       ** ticket;
 {
-    krb5_auth_context	* new_auth_context;
+    krb5_auth_context	  new_auth_context;
     krb5_flags		  ap_option;
     krb5_error_code	  retval, problem;
     krb5_data		  inbuf;
diff --git a/src/lib/krb5/krb/sendauth.c b/src/lib/krb5/krb/sendauth.c
index bd2fc0236a..631d86129e 100644
--- a/src/lib/krb5/krb/sendauth.c
+++ b/src/lib/krb5/krb/sendauth.c
@@ -49,7 +49,7 @@ krb5_sendauth(context, auth_context,
 	      /* OUT */
 	      error, rep_result, out_creds)
     	krb5_context 		  context;
-    	krb5_auth_context      ** auth_context;
+    	krb5_auth_context       * auth_context;
 	krb5_pointer		  fd;
 	char			* appl_version;
 	krb5_principal		  client;
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 64c9b8017d..34eb048fe1 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jun 10 23:07:27 1995  Tom Yu  (tlyu@dragons-lair)
+
+	* genaddrs.c: krb5_auth_context redefinitions
+
 Fri Jun  9 22:08:33 1995  Theodore Y. Ts'o  <tytso@dcl>
 
 	* gmt_mktime.c (gmt_mktime): Change assertion to check to make
diff --git a/src/lib/krb5/os/genaddrs.c b/src/lib/krb5/os/genaddrs.c
index 4f7e2b9e35..ab0da53c48 100644
--- a/src/lib/krb5/os/genaddrs.c
+++ b/src/lib/krb5/os/genaddrs.c
@@ -35,7 +35,7 @@
 krb5_error_code INTERFACE
 krb5_auth_con_genaddrs(context, auth_context, fd, flags)
     krb5_context 	  context;
-    krb5_auth_context 	* auth_context;
+    krb5_auth_context 	  auth_context;
     int			  fd, flags;
 {
     krb5_error_code 	  retval;