diff options
96 files changed, 282 insertions, 162 deletions
diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog index 5614c66676..c98a8ecc3e 100644 --- a/src/appl/bsd/ChangeLog +++ b/src/appl/bsd/ChangeLog @@ -1,3 +1,8 @@ +Sat Jun 10 22:56:10 1995 Tom Yu (tlyu@dragons-lair) + + * forward.c, kcmd.c, krcp.c, krlogind.c, krshd.c: + krb5_auth_context redefinitions + Fri Jun 9 18:26:30 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/appl/bsd/forward.c b/src/appl/bsd/forward.c index 0f6f65aed4..3ecd2ab63d 100644 --- a/src/appl/bsd/forward.c +++ b/src/appl/bsd/forward.c @@ -33,7 +33,7 @@ krb5_error_code rd_and_store_for_creds(context, auth_context, inbuf, ticket, lusername) krb5_context context; - krb5_auth_context * auth_context; + krb5_auth_context auth_context; krb5_data *inbuf; krb5_ticket *ticket; char *lusername; @@ -86,7 +86,7 @@ cleanup: krb5_error_code get_for_creds(context, auth_context, rhost, client, forwardable, out_buf) krb5_context context; - krb5_auth_context * auth_context; + krb5_auth_context auth_context; char *rhost; krb5_principal client; int forwardable; /* Should forwarded TGT also be forwardable? */ diff --git a/src/appl/bsd/kcmd.c b/src/appl/bsd/kcmd.c index 9cfb8f4235..9d0ebceba1 100644 --- a/src/appl/bsd/kcmd.c +++ b/src/appl/bsd/kcmd.c @@ -103,7 +103,7 @@ kcmd(sock, ahost, rport, locuser, remuser, cmd, fd2p, service, realm, krb5_ccache cc; krb5_data outbuf; krb5_flags options = authopts; - krb5_auth_context * auth_context = NULL; + krb5_auth_context auth_context = NULL; pid = getpid(); hp = gethostbyname(*ahost); diff --git a/src/appl/bsd/krcp.c b/src/appl/bsd/krcp.c index 24259e9e22..0e30ebe14f 100644 --- a/src/appl/bsd/krcp.c +++ b/src/appl/bsd/krcp.c @@ -1221,7 +1221,7 @@ void send_auth() krb5_error_code status; krb5_address faddr; krb5_ticket * ticket = NULL; - krb5_auth_context * auth_context = NULL; + krb5_auth_context auth_context = NULL; if (status = krb5_cc_default(bsd_context, &cc)){ @@ -1347,7 +1347,7 @@ void krb5_creds creds, *new_creds; krb5_ccache cc; krb5_error_code status; - krb5_auth_context *auth_context = NULL; + krb5_auth_context auth_context = NULL; if (config_file) { const char * filenames[2]; diff --git a/src/appl/bsd/krlogind.c b/src/appl/bsd/krlogind.c index 53110d74a3..7170e9dfec 100644 --- a/src/appl/bsd/krlogind.c +++ b/src/appl/bsd/krlogind.c @@ -1536,7 +1536,7 @@ int default_realm(principal) krb5_error_code recvauth() { - krb5_auth_context * auth_context = NULL; + krb5_auth_context auth_context = NULL; krb5_error_code status; struct sockaddr_in peersin, laddr; char krb_vers[KRB_SENDAUTH_VLEN + 1]; diff --git a/src/appl/bsd/krshd.c b/src/appl/bsd/krshd.c index 0c542e58db..3b07b6b0e3 100644 --- a/src/appl/bsd/krshd.c +++ b/src/appl/bsd/krshd.c @@ -1590,7 +1590,7 @@ recvauth(netf, peersin) int netf; struct sockaddr_in peersin; { - krb5_auth_context *auth_context = NULL; + krb5_auth_context auth_context = NULL; krb5_error_code status; struct sockaddr_in laddr; char krb_vers[KRB_SENDAUTH_VLEN + 1]; diff --git a/src/appl/mailquery/ChangeLog b/src/appl/mailquery/ChangeLog index 43b7abb33f..1b8b3e00ff 100644 --- a/src/appl/mailquery/ChangeLog +++ b/src/appl/mailquery/ChangeLog @@ -1,3 +1,7 @@ +Sat Jun 10 22:57:11 1995 Tom Yu (tlyu@dragons-lair) + + * poplib.c: krb5_auth_context redefinitions + Fri Jun 9 18:27:03 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/appl/mailquery/poplib.c b/src/appl/mailquery/poplib.c index ac20b871a6..1f53888bf3 100644 --- a/src/appl/mailquery/poplib.c +++ b/src/appl/mailquery/poplib.c @@ -85,7 +85,7 @@ int reserved; krb5_principal client = NULL, server = NULL; krb5_error *err_ret = NULL; register char *cp; - krb5_auth_context * auth_context; + krb5_auth_context auth_context; #endif #endif diff --git a/src/appl/movemail/ChangeLog b/src/appl/movemail/ChangeLog index a087146a03..90fb8aa6bc 100644 --- a/src/appl/movemail/ChangeLog +++ b/src/appl/movemail/ChangeLog @@ -1,3 +1,7 @@ +Sat Jun 10 22:57:39 1995 Tom Yu (tlyu@dragons-lair) + + * movemail.c: krb5_auth_context redefinitions + Fri Jun 9 18:27:12 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/appl/movemail/movemail.c b/src/appl/movemail/movemail.c index 6798899bf9..7fa8bd0f79 100644 --- a/src/appl/movemail/movemail.c +++ b/src/appl/movemail/movemail.c @@ -544,7 +544,7 @@ char *host; krb5_context context; krb5_principal client, server; krb5_error *err_ret = NULL; - krb5_auth_context * auth_context; + krb5_auth_context auth_context; char *hostname; #endif /* KRB5 */ #endif /* KERBEROS */ diff --git a/src/appl/popper/ChangeLog b/src/appl/popper/ChangeLog index db3659dde9..6737c5c71b 100644 --- a/src/appl/popper/ChangeLog +++ b/src/appl/popper/ChangeLog @@ -1,3 +1,7 @@ +Sat Jun 10 22:57:55 1995 Tom Yu (tlyu@dragons-lair) + + * pop_init.c: krb5_auth_context redefinitions + Fri Jun 9 18:27:22 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/appl/popper/pop_init.c b/src/appl/popper/pop_init.c index 452bbfa64e..40b97d3296 100644 --- a/src/appl/popper/pop_init.c +++ b/src/appl/popper/pop_init.c @@ -287,7 +287,7 @@ authenticate(p, addr) #endif #ifdef KRB5 - krb5_auth_context * auth_context = NULL; + krb5_auth_context auth_context = NULL; krb5_error_code retval; krb5_principal server; int sock = 0; diff --git a/src/appl/sample/sclient/ChangeLog b/src/appl/sample/sclient/ChangeLog index f18f90c8fc..596e284bcb 100644 --- a/src/appl/sample/sclient/ChangeLog +++ b/src/appl/sample/sclient/ChangeLog @@ -1,3 +1,7 @@ +Sat Jun 10 22:58:15 1995 Tom Yu (tlyu@dragons-lair) + + * sclient.c: krb5_auth_context redefinitions + Fri Jun 9 18:27:44 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/appl/sample/sclient/sclient.c b/src/appl/sample/sclient/sclient.c index 01151f81f1..a233f5efa3 100644 --- a/src/appl/sample/sclient/sclient.c +++ b/src/appl/sample/sclient/sclient.c @@ -64,7 +64,7 @@ char *argv[]; krb5_principal client, server; krb5_error *err_ret; krb5_ap_rep_enc_part *rep_ret; - krb5_auth_context * auth_context = 0; + krb5_auth_context auth_context = 0; short xmitlen; if (argc != 2 && argc != 3) { diff --git a/src/appl/sample/sserver/ChangeLog b/src/appl/sample/sserver/ChangeLog index d4f1b1fdcb..c91b11fc98 100644 --- a/src/appl/sample/sserver/ChangeLog +++ b/src/appl/sample/sserver/ChangeLog @@ -1,3 +1,7 @@ +Sat Jun 10 22:58:40 1995 Tom Yu (tlyu@dragons-lair) + + * sserver.c: krb5_auth_context redefinitions + Fri Jun 9 18:28:33 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/appl/sample/sserver/sserver.c b/src/appl/sample/sserver/sserver.c index 166ebf585f..c7826760a9 100644 --- a/src/appl/sample/sserver/sserver.c +++ b/src/appl/sample/sserver/sserver.c @@ -65,7 +65,7 @@ main(argc, argv) char *argv[]; { krb5_context context; - krb5_auth_context * auth_context = NULL; + krb5_auth_context auth_context = NULL; krb5_ticket * ticket; krb5_address peeraddr; struct sockaddr_in peername; diff --git a/src/appl/simple/client/ChangeLog b/src/appl/simple/client/ChangeLog index a9130142ff..4ab149e75d 100644 --- a/src/appl/simple/client/ChangeLog +++ b/src/appl/simple/client/ChangeLog @@ -1,3 +1,7 @@ +Sat Jun 10 22:58:57 1995 Tom Yu (tlyu@dragons-lair) + + * sim_client.c: krb5_auth_context redefinitions + Fri Jun 9 18:29:09 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/appl/simple/client/sim_client.c b/src/appl/simple/client/sim_client.c index bb58c65348..a39013f2db 100644 --- a/src/appl/simple/client/sim_client.c +++ b/src/appl/simple/client/sim_client.c @@ -69,7 +69,7 @@ main(argc, argv) extern krb5_deltat krb5_clockskew; krb5_context context; - krb5_auth_context * auth_context = NULL; + krb5_auth_context auth_context = NULL; krb5_replay_data replaydata; if (argc != 2 && argc != 3) { diff --git a/src/appl/simple/server/ChangeLog b/src/appl/simple/server/ChangeLog index 48beb610b9..7d688c8280 100644 --- a/src/appl/simple/server/ChangeLog +++ b/src/appl/simple/server/ChangeLog @@ -1,3 +1,7 @@ +Sat Jun 10 22:59:20 1995 Tom Yu (tlyu@dragons-lair) + + * sim_server.c: krb5_auth_context redefinitions + Fri Jun 9 18:23:58 1995 <tytso@rsx-11.mit.edu> * sim_server.c: #include krb5.h first, to reduce size of debugging diff --git a/src/appl/simple/server/sim_server.c b/src/appl/simple/server/sim_server.c index f9822d7c87..1cb9a27bed 100644 --- a/src/appl/simple/server/sim_server.c +++ b/src/appl/simple/server/sim_server.c @@ -66,7 +66,7 @@ char *argv[]; unsigned char pktbuf[BUFSIZ]; krb5_principal sprinc; krb5_context context; - krb5_auth_context *auth_context = NULL; + krb5_auth_context auth_context = NULL; krb5_address addr; krb5_ticket *ticket = NULL; diff --git a/src/appl/telnet/libtelnet/ChangeLog b/src/appl/telnet/libtelnet/ChangeLog index 3ed548755e..b5fc6033a1 100644 --- a/src/appl/telnet/libtelnet/ChangeLog +++ b/src/appl/telnet/libtelnet/ChangeLog @@ -1,3 +1,7 @@ +Sat Jun 10 22:59:42 1995 Tom Yu (tlyu@dragons-lair) + + * forward.c, kerberos5.c: krb5_auth_context redefinitions + Fri Jun 9 18:30:02 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/appl/telnet/libtelnet/forward.c b/src/appl/telnet/libtelnet/forward.c index ac42885cab..7e1d78e8d9 100644 --- a/src/appl/telnet/libtelnet/forward.c +++ b/src/appl/telnet/libtelnet/forward.c @@ -34,7 +34,7 @@ krb5_error_code rd_and_store_for_creds(context, auth_context, inbuf, ticket, lusername) krb5_context context; - krb5_auth_context * auth_context; + krb5_auth_context auth_context; krb5_data *inbuf; krb5_ticket *ticket; char *lusername; @@ -79,7 +79,7 @@ cleanup: krb5_error_code INTERFACE get_for_creds(context, auth_context, rhost, client, forwardable, outbuf) krb5_context context; - krb5_auth_context * auth_context; + krb5_auth_context auth_context; char *rhost; krb5_principal client; int forwardable; /* Should forwarded TGT also be forwardable? */ diff --git a/src/appl/telnet/libtelnet/kerberos5.c b/src/appl/telnet/libtelnet/kerberos5.c index 46816bcd49..42255b3496 100644 --- a/src/appl/telnet/libtelnet/kerberos5.c +++ b/src/appl/telnet/libtelnet/kerberos5.c @@ -112,7 +112,7 @@ static unsigned char str_data[1024] = { IAC, SB, TELOPT_AUTHENTICATION, 0, #define KRB_FORWARD_REJECT 6 /* Forwarded credentials rejected */ #endif /* FORWARD */ -krb5_auth_context * auth_context; +krb5_auth_context auth_context; static krb5_data auth; /* telnetd gets session key from here */ diff --git a/src/appl/user_user/ChangeLog b/src/appl/user_user/ChangeLog index 0e508d0743..a5d8c487cb 100644 --- a/src/appl/user_user/ChangeLog +++ b/src/appl/user_user/ChangeLog @@ -1,3 +1,7 @@ +Sat Jun 10 23:00:05 1995 Tom Yu (tlyu@dragons-lair) + + * client.c, server.c: krb5_auth_context redefinitions + Fri Jun 9 18:30:36 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/appl/user_user/client.c b/src/appl/user_user/client.c index eca380848a..f8345a8a9a 100644 --- a/src/appl/user_user/client.c +++ b/src/appl/user_user/client.c @@ -50,7 +50,7 @@ char *argv[]; krb5_ccache cc; krb5_creds creds, *new_creds; krb5_data reply, msg, princ_data; - krb5_auth_context * auth_context = NULL; + krb5_auth_context auth_context = NULL; krb5_ticket * ticket = NULL; krb5_context context; unsigned short port; diff --git a/src/appl/user_user/server.c b/src/appl/user_user/server.c index f20347a8e1..7fb00888e1 100644 --- a/src/appl/user_user/server.c +++ b/src/appl/user_user/server.c @@ -51,7 +51,7 @@ char *argv[]; krb5_ccache cc; krb5_data msgtext, msg; krb5_context context; - krb5_auth_context * auth_context = NULL; + krb5_auth_context auth_context = NULL; #ifndef DEBUG freopen("/tmp/uu-server.log", "w", stderr); diff --git a/src/include/ChangeLog b/src/include/ChangeLog index f429bf962b..93ed9b3ec2 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,8 @@ +Sat Jun 10 22:10:46 1995 Tom Yu (tlyu@dragons-lair) + + * krb5.hin: declare krb5_auth_context as + struct _krb5_auth_context FAR * + Fri Jun 9 18:43:20 1995 <tytso@rsx-11.mit.edu> * krb5.hin: Remove definition of the krb5_fulladdr structure, and diff --git a/src/include/krb5.hin b/src/include/krb5.hin index a75339c5b1..7008b0d7cd 100644 --- a/src/include/krb5.hin +++ b/src/include/krb5.hin @@ -266,7 +266,7 @@ struct _krb5_context; typedef struct _krb5_context FAR * krb5_context; struct _krb5_auth_context; -typedef struct _krb5_auth_context krb5_auth_context; +typedef struct _krb5_auth_context FAR * krb5_auth_context; /* * begin "encryption.h" @@ -1256,7 +1256,7 @@ krb5_error_code INTERFACE krb5_get_cred_via_tkt krb5_creds **)); krb5_error_code krb5_mk_req PROTOTYPE((krb5_context, - krb5_auth_context **, + krb5_auth_context *, const krb5_flags, char *, char *, @@ -1265,18 +1265,18 @@ krb5_error_code krb5_mk_req krb5_data * )); krb5_error_code INTERFACE krb5_mk_req_extended PROTOTYPE((krb5_context, - krb5_auth_context FAR * FAR *, + krb5_auth_context FAR *, const krb5_flags, krb5_data FAR *, krb5_creds FAR *, krb5_data FAR * )); krb5_error_code krb5_mk_rep PROTOTYPE((krb5_context, - krb5_auth_context *, + krb5_auth_context, krb5_data *)); krb5_error_code INTERFACE krb5_rd_rep PROTOTYPE((krb5_context, - krb5_auth_context FAR *, + krb5_auth_context, const krb5_data FAR *, krb5_ap_rep_enc_part FAR * FAR *)); krb5_error_code krb5_mk_error @@ -1289,13 +1289,13 @@ krb5_error_code krb5_rd_error krb5_error ** )); krb5_error_code krb5_rd_safe PROTOTYPE((krb5_context, - krb5_auth_context *, + krb5_auth_context, const krb5_data *, krb5_data *, krb5_replay_data *)); krb5_error_code krb5_rd_priv PROTOTYPE((krb5_context, - krb5_auth_context *, + krb5_auth_context, const krb5_data *, krb5_data *, krb5_replay_data *)); @@ -1682,7 +1682,7 @@ krb5_error_code krb5_decode_kdc_rep krb5_error_code krb5_rd_req PROTOTYPE((krb5_context, - krb5_auth_context **, + krb5_auth_context *, const krb5_data *, krb5_const_principal, krb5_keytab, @@ -1691,7 +1691,7 @@ krb5_error_code krb5_rd_req krb5_error_code krb5_rd_req_decoded PROTOTYPE((krb5_context, - krb5_auth_context **, + krb5_auth_context *, const krb5_ap_req *, krb5_const_principal, krb5_keytab, @@ -1707,13 +1707,13 @@ krb5_error_code krb5_kt_read_service_key krb5_keyblock **)); krb5_error_code krb5_mk_safe PROTOTYPE((krb5_context, - krb5_auth_context *, + krb5_auth_context, const krb5_data *, krb5_data *, krb5_replay_data *)); krb5_error_code krb5_mk_priv PROTOTYPE((krb5_context, - krb5_auth_context *, + krb5_auth_context, const krb5_data *, krb5_data *, krb5_replay_data *)); @@ -1724,7 +1724,7 @@ krb5_error_code krb5_cc_register krb5_error_code krb5_sendauth PROTOTYPE((krb5_context, - krb5_auth_context **, + krb5_auth_context *, krb5_pointer, char *, krb5_principal, @@ -1738,7 +1738,7 @@ krb5_error_code krb5_sendauth krb5_creds **)); krb5_error_code krb5_recvauth PROTOTYPE((krb5_context, - krb5_auth_context **, + krb5_auth_context *, krb5_pointer, char *, krb5_principal, @@ -1755,117 +1755,117 @@ krb5_error_code krb5_walk_realm_tree krb5_error_code INTERFACE krb5_mk_ncred PROTOTYPE((krb5_context, - krb5_auth_context *, + krb5_auth_context, krb5_creds **, krb5_data **, krb5_replay_data *)); krb5_error_code INTERFACE krb5_mk_1cred PROTOTYPE((krb5_context, - krb5_auth_context *, + krb5_auth_context, krb5_creds *, krb5_data **, krb5_replay_data *)); krb5_error_code krb5_auth_con_init PROTOTYPE((krb5_context, - krb5_auth_context **)); + krb5_auth_context *)); krb5_error_code krb5_auth_con_free PROTOTYPE((krb5_context, - krb5_auth_context *)); + krb5_auth_context)); krb5_error_code krb5_auth_con_setflags PROTOTYPE((krb5_context, - krb5_auth_context *, + krb5_auth_context, krb5_int32)); krb5_error_code krb5_auth_con_getflags PROTOTYPE((krb5_context, - krb5_auth_context *, + krb5_auth_context, krb5_int32 *)); krb5_error_code krb5_auth_con_setaddrs PROTOTYPE((krb5_context, - krb5_auth_context *, + krb5_auth_context, krb5_address *, krb5_address *)); krb5_error_code krb5_auth_con_getaddrs PROTOTYPE((krb5_context, - krb5_auth_context *, + krb5_auth_context, krb5_address **, krb5_address **)); krb5_error_code krb5_auth_con_setports PROTOTYPE((krb5_context, - krb5_auth_context *, + krb5_auth_context, krb5_address *, krb5_address *)); krb5_error_code krb5_auth_con_setuseruserkey PROTOTYPE((krb5_context, - krb5_auth_context *, + krb5_auth_context, krb5_keyblock *)); krb5_error_code krb5_auth_con_getkey PROTOTYPE((krb5_context, - krb5_auth_context *, + krb5_auth_context, krb5_keyblock **)); krb5_error_code krb5_auth_con_getlocalsubkey PROTOTYPE((krb5_context, - krb5_auth_context *, + krb5_auth_context, krb5_keyblock **)); krb5_error_code krb5_auth_con_setcksumtype PROTOTYPE((krb5_context, - krb5_auth_context *, + krb5_auth_context, krb5_cksumtype)); krb5_error_code krb5_auth_con_getcksumtype PROTOTYPE((krb5_context, - krb5_auth_context *, + krb5_auth_context, krb5_cksumtype *)); krb5_error_code krb5_auth_con_getlocalseqnumber PROTOTYPE((krb5_context, - krb5_auth_context *, + krb5_auth_context, krb5_int32 *)); krb5_error_code krb5_auth_con_getremoteseqnumber PROTOTYPE((krb5_context, - krb5_auth_context *, + krb5_auth_context, krb5_int32 *)); krb5_error_code krb5_auth_con_setivector PROTOTYPE((krb5_context, - krb5_auth_context *, + krb5_auth_context, krb5_pointer)); krb5_error_code krb5_auth_con_getivector PROTOTYPE((krb5_context, - krb5_auth_context *, + krb5_auth_context, krb5_pointer *)); krb5_error_code krb5_auth_con_setrcache PROTOTYPE((krb5_context, - krb5_auth_context *, + krb5_auth_context, krb5_rcache)); krb5_error_code krb5_auth_con_getrcache PROTOTYPE((krb5_context, - krb5_auth_context *, + krb5_auth_context, krb5_rcache *)); krb5_error_code krb5_auth_con_getauthenticator PROTOTYPE((krb5_context, - krb5_auth_context *, + krb5_auth_context, krb5_authenticator **)); krb5_error_code krb5_auth_con_getremotesubkey PROTOTYPE((krb5_context, - krb5_auth_context *, + krb5_auth_context, krb5_keyblock **)); #define KRB5_REALM_BRANCH_CHAR '.' diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog index e084b54f45..58b03f9d51 100644 --- a/src/include/krb5/ChangeLog +++ b/src/include/krb5/ChangeLog @@ -1,3 +1,7 @@ +Sat Jun 10 22:11:45 1995 Tom Yu (tlyu@dragons-lair) + + * adm_proto.h: update krb5_auth_context stuff + Fri Jun 9 18:42:30 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/include/krb5/adm_proto.h b/src/include/krb5/adm_proto.h index 11881340b0..beeb056b29 100644 --- a/src/include/krb5/adm_proto.h +++ b/src/include/krb5/adm_proto.h @@ -43,14 +43,14 @@ krb5_error_code INTERFACE krb5_adm_connect char *, char *, int *, - krb5_auth_context **, + krb5_auth_context *, krb5_ccache *, char *, krb5_timestamp)); void INTERFACE krb5_adm_disconnect PROTOTYPE((krb5_context, int *, - krb5_auth_context *, + krb5_auth_context, krb5_ccache)); #if ! defined(_WINDOWS) @@ -96,26 +96,26 @@ void INTERFACE krb5_free_adm_data krb5_error_code INTERFACE krb5_send_adm_cmd PROTOTYPE((krb5_context, krb5_pointer, - krb5_auth_context *, + krb5_auth_context, krb5_int32, krb5_data *)); krb5_error_code krb5_send_adm_reply PROTOTYPE((krb5_context, krb5_pointer, - krb5_auth_context *, + krb5_auth_context, krb5_int32, krb5_int32, krb5_data *)); krb5_error_code krb5_read_adm_cmd PROTOTYPE((krb5_context, krb5_pointer, - krb5_auth_context *, + krb5_auth_context, krb5_int32 *, krb5_data **)); krb5_error_code INTERFACE krb5_read_adm_reply PROTOTYPE((krb5_context, krb5_pointer, - krb5_auth_context *, + krb5_auth_context, krb5_int32 *, krb5_int32 *, krb5_data **)); 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; diff --git a/src/kadmin/kpasswd/ChangeLog b/src/kadmin/kpasswd/ChangeLog index e0ba37e61a..db2caf35af 100644 --- a/src/kadmin/kpasswd/ChangeLog +++ b/src/kadmin/kpasswd/ChangeLog @@ -1,3 +1,7 @@ +Sat Jun 10 23:03:25 1995 Tom Yu (tlyu@dragons-lair) + + * kpasswd.c: krb5_auth_context redefinitions + Fri Jun 9 19:05:49 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/kadmin/kpasswd/kpasswd.c b/src/kadmin/kpasswd/kpasswd.c index 2c015dc204..f030b8e622 100644 --- a/src/kadmin/kpasswd/kpasswd.c +++ b/src/kadmin/kpasswd/kpasswd.c @@ -177,7 +177,7 @@ main(argc, argv) krb5_error_code kret; krb5_context kcontext; - krb5_auth_context *auth_context; + krb5_auth_context auth_context; krb5_ccache ccache; char *opassword; char *npassword; diff --git a/src/kadmin/v5client/ChangeLog b/src/kadmin/v5client/ChangeLog index e12ff7e03d..c86e030d3a 100644 --- a/src/kadmin/v5client/ChangeLog +++ b/src/kadmin/v5client/ChangeLog @@ -1,3 +1,7 @@ +Sat Jun 10 23:03:41 1995 Tom Yu (tlyu@dragons-lair) + + * network.c: krb5_auth_context redefinitions + Fri Jun 9 23:04:56 1995 Theodore Y. Ts'o <tytso@dcl> * kadmin5.c: Change the default kadmin instance to be "admin" diff --git a/src/kadmin/v5client/network.c b/src/kadmin/v5client/network.c index 89d6ecf865..27f096912d 100644 --- a/src/kadmin/v5client/network.c +++ b/src/kadmin/v5client/network.c @@ -35,7 +35,7 @@ * Own storage. */ static int server_socket = -1; -static krb5_auth_context *server_auth_context = (krb5_auth_context *) NULL; +static krb5_auth_context server_auth_context = (krb5_auth_context) NULL; static krb5_ccache server_ccache = (krb5_ccache) NULL; static krb5_boolean server_active = 0; static krb5_error_code server_stat = 0; @@ -243,7 +243,7 @@ net_disconnect(force) /* Clean up our state. */ server_socket = -1; - server_auth_context = (krb5_auth_context *) NULL; + server_auth_context = (krb5_auth_context) NULL; server_ccache = (krb5_ccache) NULL; server_active = 0; server_op_in_prog = 0; diff --git a/src/kadmin/v5server/ChangeLog b/src/kadmin/v5server/ChangeLog index aedf4cd7e5..9d2d6ce52e 100644 --- a/src/kadmin/v5server/ChangeLog +++ b/src/kadmin/v5server/ChangeLog @@ -1,3 +1,8 @@ +Sat Jun 10 23:04:00 1995 Tom Yu (tlyu@dragons-lair) + + * kadm5_defs.h, passwd.c, proto_serv.c: krb5_auth_context + redefinitions + Fri Jun 9 19:06:04 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/kadmin/v5server/kadm5_defs.h b/src/kadmin/v5server/kadm5_defs.h index fb3e9c071b..7d3d4d095f 100644 --- a/src/kadmin/v5server/kadm5_defs.h +++ b/src/kadmin/v5server/kadm5_defs.h @@ -205,14 +205,14 @@ krb5_error_code proto_serv krb5_int32 passwd_check PROTOTYPE((krb5_context, int, - krb5_auth_context *, + krb5_auth_context, krb5_ticket *, krb5_data *, krb5_int32 *)); krb5_int32 passwd_change PROTOTYPE((krb5_context, int, - krb5_auth_context *, + krb5_auth_context, krb5_ticket *, krb5_data *, krb5_data *, diff --git a/src/kadmin/v5server/passwd.c b/src/kadmin/v5server/passwd.c index 74acada6fa..48525537a8 100644 --- a/src/kadmin/v5server/passwd.c +++ b/src/kadmin/v5server/passwd.c @@ -309,7 +309,7 @@ krb5_int32 passwd_check(kcontext, debug_level, auth_context, ticket, pwdata, supp) krb5_context kcontext; int debug_level; - krb5_auth_context *auth_context; + krb5_auth_context auth_context; krb5_ticket *ticket; krb5_data *pwdata; krb5_int32 *supp; @@ -381,7 +381,7 @@ passwd_change(kcontext, debug_level, auth_context, ticket, olddata, newdata, supp) krb5_context kcontext; int debug_level; - krb5_auth_context *auth_context; + krb5_auth_context auth_context; krb5_ticket *ticket; krb5_data *olddata; krb5_data *newdata; diff --git a/src/kadmin/v5server/proto_serv.c b/src/kadmin/v5server/proto_serv.c index 0b85f59a4f..38b95c337f 100644 --- a/src/kadmin/v5server/proto_serv.c +++ b/src/kadmin/v5server/proto_serv.c @@ -106,7 +106,7 @@ proto_serv(kcontext, my_id, cl_sock, sv_p, cl_p) krb5_data in_data; krb5_data out_data; krb5_rcache rcache; - krb5_auth_context *auth_context; + krb5_auth_context auth_context; krb5_flags ap_options; krb5_ticket *ticket; krb5_address *local; diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog index 1357d6a592..c3af5a6556 100644 --- a/src/kdc/ChangeLog +++ b/src/kdc/ChangeLog @@ -1,3 +1,7 @@ +Sat Jun 10 23:04:31 1995 Tom Yu (tlyu@dragons-lair) + + * kdc_util.c: krb5_auth_context redefinitions + Fri Jun 9 19:13:08 1995 <tytso@rsx-11.mit.edu> * dispatch.c, kdc_util.h, kerberos_v4.c: Use KRB5_KRB4_COMPAT diff --git a/src/kdc/kdc_util.c b/src/kdc/kdc_util.c index ca68cabe75..f96282b820 100644 --- a/src/kdc/kdc_util.c +++ b/src/kdc/kdc_util.c @@ -173,7 +173,7 @@ kdc_process_tgs_req(request, from, pkt, ticket, subkey) krb5_data scratch1; krb5_data * scratch = NULL; krb5_boolean foreign_server = FALSE; - krb5_auth_context * auth_context = NULL; + krb5_auth_context auth_context = NULL; krb5_authenticator * authenticator = NULL; krb5_checksum * his_cksum = NULL; krb5_keyblock * key = NULL; 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; diff --git a/src/slave/ChangeLog b/src/slave/ChangeLog index e74c0754b2..8d3180408e 100644 --- a/src/slave/ChangeLog +++ b/src/slave/ChangeLog @@ -1,3 +1,7 @@ +Sat Jun 10 23:07:45 1995 Tom Yu (tlyu@dragons-lair) + + * kprop.c, kpropd.c: krb5_auth_context redefinitions + Fri Jun 9 18:56:39 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/slave/kprop.c b/src/slave/kprop.c index 922b19e1f1..de32fddd1a 100644 --- a/src/slave/kprop.c +++ b/src/slave/kprop.c @@ -75,14 +75,14 @@ static void usage krb5_error_code open_connection PROTOTYPE((char *, int *, char *)); void kerberos_authenticate - PROTOTYPE((krb5_context, krb5_auth_context **, + PROTOTYPE((krb5_context, krb5_auth_context *, int, krb5_principal, krb5_creds **)); int open_database PROTOTYPE((krb5_context, char *, int *)); void close_database PROTOTYPE((krb5_context, int)); void xmit_database - PROTOTYPE((krb5_context, krb5_auth_context *, krb5_creds *, + PROTOTYPE((krb5_context, krb5_auth_context, krb5_creds *, int, int, int)); void send_error PROTOTYPE((krb5_context, krb5_creds *, int, char *, krb5_error_code)); @@ -105,7 +105,7 @@ main(argc, argv) krb5_error_code retval; krb5_context context; krb5_creds *my_creds; - krb5_auth_context * auth_context; + krb5_auth_context auth_context; char Errmsg[256]; PRS(context, argv); @@ -389,7 +389,7 @@ open_connection(host, fd, Errmsg) void kerberos_authenticate(context, auth_context, fd, me, new_creds) krb5_context context; - krb5_auth_context **auth_context; + krb5_auth_context *auth_context; int fd; krb5_principal me; krb5_creds ** new_creds; @@ -538,7 +538,7 @@ close_database(context, fd) void xmit_database(context, auth_context, my_creds, fd, database_fd, database_size) krb5_context context; - krb5_auth_context * auth_context; + krb5_auth_context auth_context; krb5_creds *my_creds; int fd; int database_fd; diff --git a/src/slave/kpropd.c b/src/slave/kpropd.c index 0a2dac886e..013c47e841 100644 --- a/src/slave/kpropd.c +++ b/src/slave/kpropd.c @@ -68,7 +68,7 @@ int standalone = 0; krb5_principal server; /* This is our server principal name */ krb5_principal client; /* This is who we're talking to */ krb5_context kpropd_context; -krb5_auth_context * auth_context; +krb5_auth_context auth_context; char *realm = NULL; /* Our realm */ char *file = KPROPD_DEFAULT_FILE; char *temp_file_name; diff --git a/src/tests/hammer/ChangeLog b/src/tests/hammer/ChangeLog index 894ee29dd8..e4dae90899 100644 --- a/src/tests/hammer/ChangeLog +++ b/src/tests/hammer/ChangeLog @@ -1,3 +1,7 @@ +Sat Jun 10 23:08:04 1995 Tom Yu (tlyu@dragons-lair) + + * kdc5_hammer.c: krb5_auth_context redefinitions + Fri Jun 9 18:58:36 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/tests/hammer/kdc5_hammer.c b/src/tests/hammer/kdc5_hammer.c index 099715fc88..b9ef256dc0 100644 --- a/src/tests/hammer/kdc5_hammer.c +++ b/src/tests/hammer/kdc5_hammer.c @@ -317,7 +317,7 @@ int verify_cs_pair(context, p_client_str, p_client, service, hostname, krb5_creds * credsp; krb5_ticket * ticket = NULL; krb5_keyblock * keyblock = NULL; - krb5_auth_context * auth_context = NULL; + krb5_auth_context auth_context = NULL; krb5_data request_data; if (brief) diff --git a/src/windows/cns/changelo b/src/windows/cns/changelo index ce3cae9c23..015a211e3a 100644 --- a/src/windows/cns/changelo +++ b/src/windows/cns/changelo @@ -1,3 +1,7 @@ +Sat Jun 10 23:08:57 1995 Tom Yu (tlyu@dragons-lair) + + * kpasswd.c: krb5_auth_context redefinitions + Mon Jun 5 14:19:51 EDT 1995 Paul Park (pjpark@mit.edu) * kpasswd.c : Use new krb5_adm_connect() calling sequence. diff --git a/src/windows/cns/kpasswd.c b/src/windows/cns/kpasswd.c index 93939e095d..f3687f4487 100644 --- a/src/windows/cns/kpasswd.c +++ b/src/windows/cns/kpasswd.c @@ -81,7 +81,7 @@ static krb5_error_code keyadmin_send_receive ( krb5_context k5context, int * conn_socket, - krb5_auth_context * auth_context, + krb5_auth_context auth_context, krb5_int32 nargs, krb5_data * arglist, krb5_int32 * cmd_stat, @@ -116,7 +116,7 @@ k5_change_password ( char **text) { krb5_error_code kret, kret2; - krb5_auth_context * auth_context; + krb5_auth_context auth_context; krb5_ccache ccache; int conn_socket; /* Socket for talking over */ krb5_int32 nreplies; diff --git a/src/windows/wintel/auth.c b/src/windows/wintel/auth.c index 51e5d3f31c..ed3f82d1aa 100644 --- a/src/windows/wintel/auth.c +++ b/src/windows/wintel/auth.c @@ -75,7 +75,7 @@ #ifdef KRB5 static krb5_data auth; static int auth_how; - static krb5_auth_context *auth_context; + static krb5_auth_context auth_context; #define KRB_SERVICE_NAME "host" #define KERBEROS_VERSION KERBEROS_V5 diff --git a/src/windows/wintel/changelo b/src/windows/wintel/changelo index 7552a212b1..669e2cf5db 100644 --- a/src/windows/wintel/changelo +++ b/src/windows/wintel/changelo @@ -1,3 +1,7 @@ +Sat Jun 10 23:09:20 1995 Tom Yu (tlyu@dragons-lair) + + * auth.c: krb5_auth_context redefinitions + Fri Jun 2 10:51:31 1995 Keith Vetter (keithv@fusion.com) Added cursor keys (in two modes) and ctrl-space: the arrow |