From e25d0fd41cd6811616a50a1b8a675c86f873bda0 Mon Sep 17 00:00:00 2001 From: John Kohl Date: Fri, 19 Oct 1990 10:17:21 +0000 Subject: [PATCH] change 'const krb5_principal' to krb5_const_principal git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@1285 dc483132-0cff-0310-8789-dd5450dbe970 --- src/include/krb5/asn.1/asn1defs.h | 2 +- src/include/krb5/func-proto.h | 20 ++++++++++---------- src/include/krb5/los-proto.h | 2 +- src/lib/krb5/asn.1/kprin2prin.c | 2 +- src/lib/krb5/krb/copy_princ.c | 2 +- src/lib/krb5/krb/int-proto.h | 4 ++-- src/lib/krb5/krb/mk_req.c | 2 +- src/lib/krb5/krb/princ_comp.c | 4 ++-- src/lib/krb5/krb/rd_req.c | 2 +- src/lib/krb5/krb/rd_req_dec.c | 2 +- src/lib/krb5/krb/rd_req_sim.c | 2 +- src/lib/krb5/krb/send_tgs.c | 4 ++-- src/lib/krb5/krb/walk_rtree.c | 2 +- src/lib/krb5/os/an_to_ln.c | 4 ++-- 14 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/include/krb5/asn.1/asn1defs.h b/src/include/krb5/asn.1/asn1defs.h index e43fdd2de..b4a0e5cd2 100644 --- a/src/include/krb5/asn.1/asn1defs.h +++ b/src/include/krb5/asn.1/asn1defs.h @@ -158,7 +158,7 @@ struct type_KRB5_EncKrbPrivPart *krb5_priv_enc_part2KRB5_EncKrbPrivPart /* kprin2prin.c */ struct type_KRB5_PrincipalName *krb5_principal2KRB5_PrincipalName - PROTOTYPE((const krb5_principal , int *)); + PROTOTYPE((krb5_const_principal , int *)); /* kpriv2priv.c */ struct type_KRB5_KRB__PRIV *krb5_priv2KRB5_KRB__PRIV diff --git a/src/include/krb5/func-proto.h b/src/include/krb5/func-proto.h index e07ec9e4d..0c63875fc 100644 --- a/src/include/krb5/func-proto.h +++ b/src/include/krb5/func-proto.h @@ -47,7 +47,7 @@ krb5_error_code krb5_send_tgs const krb5_ticket_times *, const krb5_enctype, const krb5_cksumtype, - const krb5_principal, + krb5_const_principal, krb5_address * const *, krb5_authdata * const *, const krb5_data *, @@ -95,7 +95,7 @@ krb5_error_code krb5_get_in_tkt_with_skey krb5_ccache, krb5_creds * )); krb5_error_code krb5_mk_req - PROTOTYPE((const krb5_principal, + PROTOTYPE((krb5_const_principal, const krb5_flags, const krb5_checksum *, krb5_ccache, @@ -111,12 +111,12 @@ krb5_error_code krb5_mk_req_extended krb5_data * )); krb5_error_code krb5_rd_req_simple PROTOTYPE((const krb5_data *, - const krb5_principal, + krb5_const_principal, const krb5_address *, krb5_tkt_authent * )); krb5_error_code krb5_rd_req PROTOTYPE((const krb5_data *, - const krb5_principal, + krb5_const_principal, const krb5_address *, krb5_const_pointer, krb5_error_code (* )(krb5_pointer, @@ -128,7 +128,7 @@ krb5_error_code krb5_rd_req krb5_tkt_authent * )); krb5_error_code krb5_rd_req_decoded PROTOTYPE((const krb5_ap_req *, - const krb5_principal, + krb5_const_principal, const krb5_address *, krb5_const_pointer, krb5_error_code (* )(krb5_pointer, @@ -184,10 +184,10 @@ krb5_error_code krb5_parse_name PROTOTYPE((const char *, krb5_principal * )); krb5_error_code krb5_unparse_name - PROTOTYPE((const krb5_principal, + PROTOTYPE((krb5_const_principal, char ** )); krb5_error_code krb5_unparse_name_ext - PROTOTYPE((const krb5_principal, + PROTOTYPE((krb5_const_principal, char **, int *)); krb5_boolean krb5_address_search @@ -200,8 +200,8 @@ int krb5_address_order PROTOTYPE((const krb5_address *, const krb5_address *)); krb5_boolean krb5_principal_compare - PROTOTYPE((const krb5_principal, - const krb5_principal)); + PROTOTYPE((krb5_const_principal, + krb5_const_principal)); int krb5_fulladdr_order PROTOTYPE((const krb5_fulladdr *, const krb5_fulladdr *)); @@ -215,7 +215,7 @@ krb5_error_code krb5_copy_data PROTOTYPE((const krb5_data *, krb5_data **)); krb5_error_code krb5_copy_principal - PROTOTYPE((const krb5_principal, + PROTOTYPE((krb5_const_principal, krb5_principal *)); krb5_error_code krb5_copy_addresses PROTOTYPE((krb5_address * const *, diff --git a/src/include/krb5/los-proto.h b/src/include/krb5/los-proto.h index cf747aca7..80f300cce 100644 --- a/src/include/krb5/los-proto.h +++ b/src/include/krb5/los-proto.h @@ -57,7 +57,7 @@ krb5_error_code krb5_get_krbhst krb5_error_code krb5_free_krbhst PROTOTYPE((char * const * )); krb5_error_code krb5_aname_to_localname - PROTOTYPE((const krb5_principal, + PROTOTYPE((krb5_const_principal, const int, char * )); krb5_error_code krb5_get_default_realm diff --git a/src/lib/krb5/asn.1/kprin2prin.c b/src/lib/krb5/asn.1/kprin2prin.c index d0e47f424..33500c672 100644 --- a/src/lib/krb5/asn.1/kprin2prin.c +++ b/src/lib/krb5/asn.1/kprin2prin.c @@ -30,7 +30,7 @@ static char rcsid_kprin2prin_c[] = struct type_KRB5_PrincipalName * krb5_principal2KRB5_PrincipalName(val, error) -const krb5_principal val; +krb5_const_principal val; register int *error; { register int i; diff --git a/src/lib/krb5/krb/copy_princ.c b/src/lib/krb5/krb/copy_princ.c index cdbdfab78..ad13beb66 100644 --- a/src/lib/krb5/krb/copy_princ.c +++ b/src/lib/krb5/krb/copy_princ.c @@ -25,7 +25,7 @@ static char rcsid_copy_princ_c[] = */ krb5_error_code krb5_copy_principal(inprinc, outprinc) -const krb5_principal inprinc; +krb5_const_principal inprinc; krb5_principal *outprinc; { krb5_error_code retval; diff --git a/src/lib/krb5/krb/int-proto.h b/src/lib/krb5/krb/int-proto.h index 7a9dc7b6e..fb032280b 100644 --- a/src/lib/krb5/krb/int-proto.h +++ b/src/lib/krb5/krb/int-proto.h @@ -26,8 +26,8 @@ krb5_error_code krb5_get_cred_via_tgt const krb5_cksumtype, krb5_creds * )); krb5_error_code krb5_walk_realm_tree - PROTOTYPE((const krb5_principal, - const krb5_principal, + PROTOTYPE((krb5_const_principal, + krb5_const_principal, krb5_principal **)); void krb5_free_realm_tree PROTOTYPE((const krb5_principal *)); diff --git a/src/lib/krb5/krb/mk_req.c b/src/lib/krb5/krb/mk_req.c index b3cbcc3a5..ecd2d0283 100644 --- a/src/lib/krb5/krb/mk_req.c +++ b/src/lib/krb5/krb/mk_req.c @@ -43,7 +43,7 @@ extern krb5_flags krb5_kdc_default_options; krb5_error_code krb5_mk_req(server, ap_req_options, checksum, ccache, outbuf) -const krb5_principal server; +krb5_const_principal server; const krb5_flags ap_req_options; const krb5_checksum *checksum; krb5_ccache ccache; diff --git a/src/lib/krb5/krb/princ_comp.c b/src/lib/krb5/krb/princ_comp.c index e2543c6d8..8d28d7e84 100644 --- a/src/lib/krb5/krb/princ_comp.c +++ b/src/lib/krb5/krb/princ_comp.c @@ -27,8 +27,8 @@ static char rcsid_princ_comp_c[] = krb5_boolean krb5_principal_compare(princ1, princ2) -const krb5_principal princ1; -const krb5_principal princ2; +krb5_const_principal princ1; +krb5_const_principal princ2; { register krb5_data **p1, **p2; diff --git a/src/lib/krb5/krb/rd_req.c b/src/lib/krb5/krb/rd_req.c index 1a4486cc9..06d22e982 100644 --- a/src/lib/krb5/krb/rd_req.c +++ b/src/lib/krb5/krb/rd_req.c @@ -49,7 +49,7 @@ krb5_error_code krb5_rd_req(inbuf, server, sender_addr, fetchfrom, keyproc, keyprocarg, rcache, authdat) const krb5_data *inbuf; -const krb5_principal server; +krb5_const_principal server; const krb5_address *sender_addr; krb5_const_pointer fetchfrom; krb5_error_code (*keyproc) PROTOTYPE((krb5_pointer, diff --git a/src/lib/krb5/krb/rd_req_dec.c b/src/lib/krb5/krb/rd_req_dec.c index bf1193973..48052d875 100644 --- a/src/lib/krb5/krb/rd_req_dec.c +++ b/src/lib/krb5/krb/rd_req_dec.c @@ -58,7 +58,7 @@ krb5_error_code krb5_rd_req_decoded(req, server, sender_addr, fetchfrom, keyproc, keyprocarg, rcache, tktauthent) const krb5_ap_req *req; -const krb5_principal server; +krb5_const_principal server; const krb5_address *sender_addr; krb5_const_pointer fetchfrom; krb5_error_code (*keyproc) PROTOTYPE((krb5_pointer, diff --git a/src/lib/krb5/krb/rd_req_sim.c b/src/lib/krb5/krb/rd_req_sim.c index 12200f33f..657309b9e 100644 --- a/src/lib/krb5/krb/rd_req_sim.c +++ b/src/lib/krb5/krb/rd_req_sim.c @@ -42,7 +42,7 @@ static char rcsid_rd_req_sim_c[] = krb5_error_code krb5_rd_req_simple(inbuf, server, sender_addr, authdat) const krb5_data *inbuf; -const krb5_principal server; +krb5_const_principal server; const krb5_address *sender_addr; krb5_tkt_authent *authdat; { diff --git a/src/lib/krb5/krb/send_tgs.c b/src/lib/krb5/krb/send_tgs.c index ddebd213d..1e73897b0 100644 --- a/src/lib/krb5/krb/send_tgs.c +++ b/src/lib/krb5/krb/send_tgs.c @@ -44,7 +44,7 @@ krb5_send_tgs(DECLARG(const krb5_flags, kdcoptions), DECLARG(const krb5_ticket_times *,timestruct), DECLARG(const krb5_enctype, etype), DECLARG(const krb5_cksumtype, sumtype), - DECLARG(const krb5_principal, sname), + DECLARG(krb5_const_principal, sname), DECLARG(krb5_address * const *, addrs), DECLARG(krb5_authdata * const *,authorization_data), DECLARG(const krb5_data *,second_ticket), @@ -54,7 +54,7 @@ OLDDECLARG(const krb5_flags, kdcoptions) OLDDECLARG(const krb5_ticket_times *,timestruct) OLDDECLARG(const krb5_enctype, etype) OLDDECLARG(const krb5_cksumtype, sumtype) -OLDDECLARG(const krb5_principal, sname) +OLDDECLARG(krb5_const_principal, sname) OLDDECLARG(krb5_address * const *, addrs) OLDDECLARG(krb5_authdata * const *,authorization_data) OLDDECLARG(const krb5_data *,second_ticket) diff --git a/src/lib/krb5/krb/walk_rtree.c b/src/lib/krb5/krb/walk_rtree.c index f4b4fa563..25979174a 100644 --- a/src/lib/krb5/krb/walk_rtree.c +++ b/src/lib/krb5/krb/walk_rtree.c @@ -31,7 +31,7 @@ static char rcsid_walk_rtree_c[] = krb5_error_code krb5_walk_realm_tree(client, server, tree) -const krb5_principal client, server; +krb5_const_principal client, server; krb5_principal **tree; { krb5_error_code retval; diff --git a/src/lib/krb5/os/an_to_ln.c b/src/lib/krb5/os/an_to_ln.c index 2e42f0627..7e33a0365 100644 --- a/src/lib/krb5/os/an_to_ln.c +++ b/src/lib/krb5/os/an_to_ln.c @@ -56,7 +56,7 @@ extern char *krb5_lname_file; */ krb5_error_code krb5_aname_to_localname(aname, lnsize, lname) -const krb5_principal aname; +krb5_const_principal aname; const int lnsize; char *lname; { @@ -104,7 +104,7 @@ char *lname; */ krb5_error_code krb5_aname_to_localname(aname, lnsize, lname) -const krb5_principal aname; +krb5_const_principal aname; const int lnsize; char *lname; { -- 2.26.2