From b7b7955b7587c95c158cfc9254e2e005a2d367dd Mon Sep 17 00:00:00 2001 From: John Kohl Date: Fri, 19 Apr 1991 16:58:58 +0000 Subject: [PATCH] krb5_free_addr -> krb5_free_address krb5_free_address -> krb5_free_addresses git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@2020 dc483132-0cff-0310-8789-dd5450dbe970 --- src/appl/simple/server/sim_server.c | 2 +- src/lib/crypto/des/new_rn_key.c | 2 +- src/lib/krb425/mk_priv.c | 4 ++-- src/lib/krb425/mk_safe.c | 4 ++-- src/lib/krb425/rd_priv.c | 4 ++-- src/lib/krb425/rd_safe.c | 4 ++-- src/lib/krb5/asn.1/addr2kaddr.c | 8 ++++---- src/lib/krb5/ccache/file/fcc_read.c | 4 ++-- src/lib/krb5/ccache/stdio/scc_read.c | 4 ++-- src/lib/krb5/free/f_addr.c | 4 ++-- src/lib/krb5/free/f_address.c | 4 ++-- src/lib/krb5/free/f_cred_cnt.c | 2 +- src/lib/krb5/free/f_enc_kdc.c | 2 +- src/lib/krb5/free/f_enc_tkt.c | 2 +- src/lib/krb5/free/f_kdc_req.c | 2 +- src/lib/krb5/free/f_priv_enc.c | 4 ++-- src/lib/krb5/free/f_safe.c | 4 ++-- src/lib/krb5/krb/copy_addrs.c | 2 +- src/lib/krb5/krb/copy_creds.c | 2 +- src/lib/krb5/krb/copy_tick.c | 2 +- src/lib/krb5/krb/gc_via_tgt.c | 2 +- src/lib/krb5/krb/get_in_tkt.c | 4 ++-- src/lib/krb5/krb/rd_priv.c | 4 ++-- src/lib/krb5/krb/rd_safe.c | 8 ++++---- src/tests/hammer/kdc5_hammer.c | 2 +- 25 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/appl/simple/server/sim_server.c b/src/appl/simple/server/sim_server.c index f4c67bffc..b4efdd850 100644 --- a/src/appl/simple/server/sim_server.c +++ b/src/appl/simple/server/sim_server.c @@ -195,7 +195,7 @@ char *argv[]; printf("Safe message is: '%.*s'\n", message.length, message.data); xfree(message.data); - krb5_free_addr(portforeign_addr); + krb5_free_address(portforeign_addr); /* NOW GET ENCRYPTED MESSAGE */ diff --git a/src/lib/crypto/des/new_rn_key.c b/src/lib/crypto/des/new_rn_key.c index 7a609085e..e3a8a9051 100644 --- a/src/lib/crypto/des/new_rn_key.c +++ b/src/lib/crypto/des/new_rn_key.c @@ -93,7 +93,7 @@ void mit_des_init_random_number_generator(key,p_seed) /* XXX may not do all of the seed. */ } if (addrs) { - /* can't use krb5_free_address due to circular dependencies in + /* can't use krb5_free_addresses due to circular dependencies in libraries */ register krb5_address **addr2; for (addr2 = addrs; *addr2; addr2++) { diff --git a/src/lib/krb425/mk_priv.c b/src/lib/krb425/mk_priv.c index 973a9b667..6b0bfbd22 100644 --- a/src/lib/krb425/mk_priv.c +++ b/src/lib/krb425/mk_priv.c @@ -67,7 +67,7 @@ struct sockaddr_in *receiver; if (r = krb5_get_server_rcache(inet_ntoa(sender->sin_addr), &rcache)) { - krb5_free_addr(saddr2); + krb5_free_address(saddr2); #ifdef EBUG ERROR(r); #endif @@ -84,7 +84,7 @@ struct sockaddr_in *receiver; &out5); krb5_rc_close(rcache); xfree(rcache); - krb5_free_addr(saddr2); + krb5_free_address(saddr2); if (r) { #ifdef EBUG diff --git a/src/lib/krb425/mk_safe.c b/src/lib/krb425/mk_safe.c index ddfea2acc..394ae982b 100644 --- a/src/lib/krb425/mk_safe.c +++ b/src/lib/krb425/mk_safe.c @@ -65,7 +65,7 @@ struct sockaddr_in *receiver; if (r = krb5_get_server_rcache(inet_ntoa(sender->sin_addr), &rcache)) { - krb5_free_addr(saddr2); + krb5_free_address(saddr2); #ifdef EBUG ERROR(r); #endif @@ -81,7 +81,7 @@ struct sockaddr_in *receiver; &out5); krb5_rc_close(rcache); xfree(rcache); - krb5_free_addr(saddr2); + krb5_free_address(saddr2); if (r) { #ifdef EBUG diff --git a/src/lib/krb425/rd_priv.c b/src/lib/krb425/rd_priv.c index 07bb68d6b..32f35016c 100644 --- a/src/lib/krb425/rd_priv.c +++ b/src/lib/krb425/rd_priv.c @@ -78,7 +78,7 @@ MSG_DAT *msg; if (r = krb5_get_server_rcache(cachename, &rcache)) { - krb5_free_addr(saddr2); + krb5_free_address(saddr2); #ifdef EBUG ERROR(r); #endif @@ -90,7 +90,7 @@ MSG_DAT *msg; krb5_rc_close(rcache); xfree(rcache); - krb5_free_addr(saddr2); + krb5_free_address(saddr2); if (r) { #ifdef EBUG diff --git a/src/lib/krb425/rd_safe.c b/src/lib/krb425/rd_safe.c index 23cb9fc4d..699067193 100644 --- a/src/lib/krb425/rd_safe.c +++ b/src/lib/krb425/rd_safe.c @@ -77,7 +77,7 @@ MSG_DAT *msg; if (r = krb5_get_server_rcache(cachename, &rcache)) { - krb5_free_addr(saddr2); + krb5_free_address(saddr2); #ifdef EBUG ERROR(r); #endif @@ -89,7 +89,7 @@ MSG_DAT *msg; krb5_rc_close(rcache); xfree(rcache); - krb5_free_addr(saddr2); + krb5_free_address(saddr2); if (r) { #ifdef EBUG diff --git a/src/lib/krb5/asn.1/addr2kaddr.c b/src/lib/krb5/asn.1/addr2kaddr.c index 2b91e8eff..9091af834 100644 --- a/src/lib/krb5/asn.1/addr2kaddr.c +++ b/src/lib/krb5/asn.1/addr2kaddr.c @@ -55,14 +55,14 @@ register int *error; } retval[i] = (krb5_address *) xmalloc(sizeof(*retval[i])); if (!retval[i]) { - krb5_free_address(retval); + krb5_free_addresses(retval); goto nomem; } retval[i]->contents = (unsigned char *)xmalloc(val->element_KRB5_0[i]->address->qb_forw->qb_len); if (!retval[i]->contents) { xfree(retval[i]); retval[i] = 0; - krb5_free_address(retval); + krb5_free_addresses(retval); goto nomem; } retval[i]->addrtype = val->element_KRB5_0[i]->addr__type; @@ -95,14 +95,14 @@ register int *error; } retval[i] = (krb5_address *) xmalloc(sizeof(*retval[i])); if (!retval[i]) { - krb5_free_address(retval); + krb5_free_addresses(retval); goto nomem; } retval[i]->contents = (unsigned char *)xmalloc(rv->element_KRB5_0->address->qb_forw->qb_len); if (!retval[i]->contents) { xfree(retval[i]); retval[i] = 0; - krb5_free_address(retval); + krb5_free_addresses(retval); goto nomem; } retval[i]->addrtype = rv->element_KRB5_0->addr__type; diff --git a/src/lib/krb5/ccache/file/fcc_read.c b/src/lib/krb5/ccache/file/fcc_read.c index b6e6d3281..eb5c0b901 100644 --- a/src/lib/krb5/ccache/file/fcc_read.c +++ b/src/lib/krb5/ccache/file/fcc_read.c @@ -134,7 +134,7 @@ krb5_fcc_read_addrs(id, addrs) for (i=0; i < length; i++) { (*addrs)[i] = (krb5_address *) malloc(sizeof(krb5_address)); if ((*addrs)[i] == NULL) { - krb5_free_address(*addrs); + krb5_free_addresses(*addrs); return KRB5_CC_NOMEM; } kret = krb5_fcc_read_addr(id, (*addrs)[i]); @@ -144,7 +144,7 @@ krb5_fcc_read_addrs(id, addrs) return KRB5_OK; errout: if (*addrs) - krb5_free_address(*addrs); + krb5_free_addresses(*addrs); return kret; } diff --git a/src/lib/krb5/ccache/stdio/scc_read.c b/src/lib/krb5/ccache/stdio/scc_read.c index 293c6cf24..58f097f07 100644 --- a/src/lib/krb5/ccache/stdio/scc_read.c +++ b/src/lib/krb5/ccache/stdio/scc_read.c @@ -135,7 +135,7 @@ krb5_scc_read_addrs(id, addrs) for (i=0; i < length; i++) { (*addrs)[i] = (krb5_address *) malloc(sizeof(krb5_address)); if ((*addrs)[i] == NULL) { - krb5_free_address(*addrs); + krb5_free_addresses(*addrs); return KRB5_CC_NOMEM; } kret = krb5_scc_read_addr(id, (*addrs)[i]); @@ -145,7 +145,7 @@ krb5_scc_read_addrs(id, addrs) return KRB5_OK; errout: if (*addrs) - krb5_free_address(*addrs); + krb5_free_addresses(*addrs); return kret; } diff --git a/src/lib/krb5/free/f_addr.c b/src/lib/krb5/free/f_addr.c index 8cb2bfc65..1d24ee25d 100644 --- a/src/lib/krb5/free/f_addr.c +++ b/src/lib/krb5/free/f_addr.c @@ -7,7 +7,7 @@ * For copying and distribution information, please see the file * . * - * krb5_free_addr() + * krb5_free_address() */ #if !defined(lint) && !defined(SABER) @@ -20,7 +20,7 @@ static char rcsid_f_addr_c [] = #include void -krb5_free_addr(val) +krb5_free_address(val) krb5_address *val; { if (val->contents) diff --git a/src/lib/krb5/free/f_address.c b/src/lib/krb5/free/f_address.c index 5f32322bf..6f368442d 100644 --- a/src/lib/krb5/free/f_address.c +++ b/src/lib/krb5/free/f_address.c @@ -8,7 +8,7 @@ * For copying and distribution information, please see the file * . * - * krb5_free_address() + * krb5_free_addresses() */ #if !defined(lint) && !defined(SABER) @@ -20,7 +20,7 @@ static char rcsid_f_address_c [] = #include void -krb5_free_address(val) +krb5_free_addresses(val) krb5_address **val; { register krb5_address **temp; diff --git a/src/lib/krb5/free/f_cred_cnt.c b/src/lib/krb5/free/f_cred_cnt.c index 02b4c34bd..7cd934619 100644 --- a/src/lib/krb5/free/f_cred_cnt.c +++ b/src/lib/krb5/free/f_cred_cnt.c @@ -41,7 +41,7 @@ krb5_creds *val; if (val->second_ticket.data) xfree(val->second_ticket.data); if (val->addresses) - krb5_free_address(val->addresses); + krb5_free_addresses(val->addresses); if (val->authdata) krb5_free_authdata(val->authdata); return; diff --git a/src/lib/krb5/free/f_enc_kdc.c b/src/lib/krb5/free/f_enc_kdc.c index 1229a499c..a328a8823 100644 --- a/src/lib/krb5/free/f_enc_kdc.c +++ b/src/lib/krb5/free/f_enc_kdc.c @@ -30,7 +30,7 @@ register krb5_enc_kdc_rep_part *val; if (val->server) krb5_free_principal(val->server); if (val->caddrs) - krb5_free_address(val->caddrs); + krb5_free_addresses(val->caddrs); xfree(val); return; } diff --git a/src/lib/krb5/free/f_enc_tkt.c b/src/lib/krb5/free/f_enc_tkt.c index 8aa2c2b56..4efb6b32a 100644 --- a/src/lib/krb5/free/f_enc_tkt.c +++ b/src/lib/krb5/free/f_enc_tkt.c @@ -30,7 +30,7 @@ krb5_enc_tkt_part *val; if (val->transited.tr_contents.data) xfree(val->transited.tr_contents.data); if (val->caddrs) - krb5_free_address(val->caddrs); + krb5_free_addresses(val->caddrs); if (val->authorization_data) krb5_free_authdata(val->authorization_data); xfree(val); diff --git a/src/lib/krb5/free/f_kdc_req.c b/src/lib/krb5/free/f_kdc_req.c index dea84bb7a..5ba22e873 100644 --- a/src/lib/krb5/free/f_kdc_req.c +++ b/src/lib/krb5/free/f_kdc_req.c @@ -32,7 +32,7 @@ krb5_kdc_req *val; if (val->etype) xfree(val->etype); if (val->addresses) - krb5_free_address(val->addresses); + krb5_free_addresses(val->addresses); if (val->authorization_data.ciphertext.data) xfree(val->authorization_data.ciphertext.data); if (val->unenc_authdata) diff --git a/src/lib/krb5/free/f_priv_enc.c b/src/lib/krb5/free/f_priv_enc.c index cdc237a14..aba9b822d 100644 --- a/src/lib/krb5/free/f_priv_enc.c +++ b/src/lib/krb5/free/f_priv_enc.c @@ -26,9 +26,9 @@ register krb5_priv_enc_part *val; if (val->user_data.data) xfree(val->user_data.data); if (val->r_address) - krb5_free_addr(val->r_address); + krb5_free_address(val->r_address); if (val->s_address) - krb5_free_addr(val->s_address); + krb5_free_address(val->s_address); xfree(val); return; } diff --git a/src/lib/krb5/free/f_safe.c b/src/lib/krb5/free/f_safe.c index 13e8d6a98..652916fa7 100644 --- a/src/lib/krb5/free/f_safe.c +++ b/src/lib/krb5/free/f_safe.c @@ -26,9 +26,9 @@ register krb5_safe *val; if (val->user_data.data) xfree(val->user_data.data); if (val->r_address) - krb5_free_addr(val->r_address); + krb5_free_address(val->r_address); if (val->s_address) - krb5_free_addr(val->s_address); + krb5_free_address(val->s_address); if (val->checksum) krb5_free_checksum(val->checksum); xfree(val); diff --git a/src/lib/krb5/krb/copy_addrs.c b/src/lib/krb5/krb/copy_addrs.c index 6c6a40062..b82300f70 100644 --- a/src/lib/krb5/krb/copy_addrs.c +++ b/src/lib/krb5/krb/copy_addrs.c @@ -59,7 +59,7 @@ krb5_address ***outaddr; for (nelems = 0; inaddr[nelems]; nelems++) if (retval = krb5_copy_addr(inaddr[nelems], &tempaddr[nelems])) { - krb5_free_address(tempaddr); + krb5_free_addresses(tempaddr); return retval; } diff --git a/src/lib/krb5/krb/copy_creds.c b/src/lib/krb5/krb/copy_creds.c index 18fe77682..8c13c2b1e 100644 --- a/src/lib/krb5/krb/copy_creds.c +++ b/src/lib/krb5/krb/copy_creds.c @@ -63,7 +63,7 @@ krb5_creds **outcred; cleanticket: free(tempcred->ticket.data); cleanaddrs: - krb5_free_address(tempcred->addresses); + krb5_free_addresses(tempcred->addresses); cleanblock: xfree(tempcred->keyblock.contents); cleanserver: diff --git a/src/lib/krb5/krb/copy_tick.c b/src/lib/krb5/krb/copy_tick.c index 3e3be9581..22fd191de 100644 --- a/src/lib/krb5/krb/copy_tick.c +++ b/src/lib/krb5/krb/copy_tick.c @@ -64,7 +64,7 @@ krb5_enc_tkt_part **partto; if (partfrom->authorization_data) { if (retval = krb5_copy_authdata(partfrom->authorization_data, &tempto->authorization_data)) { - krb5_free_address(tempto->caddrs); + krb5_free_addresses(tempto->caddrs); xfree(tempto->transited.tr_contents.data); krb5_free_principal(tempto->client); krb5_free_keyblock(tempto->session); diff --git a/src/lib/krb5/krb/gc_via_tgt.c b/src/lib/krb5/krb/gc_via_tgt.c index badb45a8e..2e82f8fe8 100644 --- a/src/lib/krb5/krb/gc_via_tgt.c +++ b/src/lib/krb5/krb/gc_via_tgt.c @@ -197,7 +197,7 @@ OLDDECLARG(krb5_creds *, cred) if (retval = encode_krb5_ticket(dec_rep->ticket, &scratch)) { cleanup(); - krb5_free_address(cred->addresses); + krb5_free_addresses(cred->addresses); return retval; } diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c index 5ae888a9a..025911876 100644 --- a/src/lib/krb5/krb/get_in_tkt.c +++ b/src/lib/krb5/krb/get_in_tkt.c @@ -248,7 +248,7 @@ OLDDECLARG(krb5_ccache, ccache) retval = encode_krb5_ticket(as_reply->ticket, &packet); krb5_free_kdc_rep(as_reply); if (retval) { - krb5_free_address(creds->addresses); + krb5_free_addresses(creds->addresses); cleanup_key(); return retval; } @@ -259,7 +259,7 @@ OLDDECLARG(krb5_ccache, ccache) if (retval = krb5_cc_store_cred(ccache, creds)) { /* clean up the pieces */ xfree(creds->ticket.data); - krb5_free_address(creds->addresses); + krb5_free_addresses(creds->addresses); cleanup_key(); return retval; } diff --git a/src/lib/krb5/krb/rd_priv.c b/src/lib/krb5/krb/rd_priv.c index 5a7e08a22..64c342879 100644 --- a/src/lib/krb5/krb/rd_priv.c +++ b/src/lib/krb5/krb/rd_priv.c @@ -205,12 +205,12 @@ OLDDECLARG(krb5_data *, outbuf) return retval; } if (!krb5_address_search(privmsg_enc_part->r_address, our_addrs)) { - krb5_free_address(our_addrs); + krb5_free_addresses(our_addrs); cleanup_data(); cleanup_mesg(); return KRB5KRB_AP_ERR_BADADDR; } - krb5_free_address(our_addrs); + krb5_free_addresses(our_addrs); } /* everything is ok - return data to the user */ diff --git a/src/lib/krb5/krb/rd_safe.c b/src/lib/krb5/krb/rd_safe.c index 5588010bc..50fd5ea38 100644 --- a/src/lib/krb5/krb/rd_safe.c +++ b/src/lib/krb5/krb/rd_safe.c @@ -121,11 +121,11 @@ krb5_data *outbuf; return retval; } if (!krb5_address_search(message->r_address, our_addrs)) { - krb5_free_address(our_addrs); + krb5_free_addresses(our_addrs); cleanup(); return KRB5KRB_AP_ERR_BADADDR; } - krb5_free_address(our_addrs); + krb5_free_addresses(our_addrs); } /* verify the checksum */ @@ -182,9 +182,9 @@ krb5_data *outbuf; xfree(our_cksum.contents); if (message->s_address) - krb5_free_addr(message->s_address); + krb5_free_address(message->s_address); if (message->r_address) - krb5_free_addr(message->r_address); + krb5_free_address(message->r_address); krb5_free_checksum(his_cksum); xfree(message); diff --git a/src/tests/hammer/kdc5_hammer.c b/src/tests/hammer/kdc5_hammer.c index 2d7f2768d..75e47bd83 100644 --- a/src/tests/hammer/kdc5_hammer.c +++ b/src/tests/hammer/kdc5_hammer.c @@ -399,7 +399,7 @@ int get_tgt (p_client_str, p_client, ccache) ccache, &my_creds); my_creds.server = my_creds.client = 0; - krb5_free_address(my_addresses); + krb5_free_addresses(my_addresses); krb5_free_cred_contents(&my_creds); if (code != 0) { com_err (prog, code, "while getting initial credentials"); -- 2.26.2