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

diff --git a/src/appl/simple/server/sim_server.c b/src/appl/simple/server/sim_server.c
index f4c67bffc92c45595b17a613f007d1f5e380d972..b4efdd850c761ed2fd6f4ab2d2911a726224f8e4 100644 (file)
--- 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 7a609085ee95f6508f02eef422ddec7e0b50e9d8..e3a8a905138b20a8bbd1017a3d77bef8a2cbb83f 100644 (file)
--- 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 973a9b6678114836f572f35e26817b5bd6431e31..6b0bfbd22fe49ffb6f2f2ef7b7a28981c8b81b91 100644 (file)
--- 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 ddfea2acc09b028dec07771ea32ad59daa96fe5f..394ae982b11717ce6b93d6a88f7fde9c6547fa6b 100644 (file)
--- 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 07bb68d6b2a3d67376c2f3d9ecda307ca0b1c7cf..32f35016c592f5889d3aefa85c7d192259ed8848 100644 (file)
--- 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 23cb9fc4d8194137fe8f2197196134522e0f7d66..699067193859c80944dc6bff02b53be2a94cf1a8 100644 (file)
--- 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 2b91e8efff8b448c1bdb787bb64e6f0f38c36847..9091af83437144aba614dc2b2f25bdc6d193ca4c 100644 (file)
--- 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 b6e6d3281c27003c1c7a765294c1c7e5fc3168c2..eb5c0b9011880b85ef2ebd99976b7eecf06e8ff3 100644 (file)
--- 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 293c6cf245c95af8c07238bb78d1f156244bd505..58f097f075aa7cc15ba19b0ebf9590c3a66737a8 100644 (file)
--- 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 8cb2bfc6530a9a7bf5e0d4aea5415aaf0e128288..1d24ee25d9739f6f9ff86d3554b060bd69444ff0 100644 (file)
--- 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/copyright.h>.
  *
- * krb5_free_addr()
+ * krb5_free_address()
  */
 
 #if !defined(lint) && !defined(SABER)
@@ -20,7 +20,7 @@ static char rcsid_f_addr_c [] =
 #include <krb5/ext-proto.h>
 
 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 5f32322bfb2d1b70b9ffd28a7f0314cd0e09a760..6f368442d17a2fa561dc4d3da98a02fd7a2bf4d8 100644 (file)
--- 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/copyright.h>.
  *
- * krb5_free_address()
+ * krb5_free_addresses()
  */
 
 #if !defined(lint) && !defined(SABER)
@@ -20,7 +20,7 @@ static char rcsid_f_address_c [] =
 #include <krb5/ext-proto.h>
 
 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 02b4c34bdef7deef79604f45f632e4b8637ac42a..7cd93461976a305f0ccd59a3cf5f1370d19ef471 100644 (file)
--- 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 1229a499c1da164ece0ba050ffd8cfb2075bf26f..a328a882326a4d839d5983d42b77931db3952def 100644 (file)
--- 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 8aa2c2b56594c75b2331ee735475a8cdc1de6879..4efb6b32a1644cfa84271fbca7ee2f94de1143a0 100644 (file)
--- 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 dea84bb7a37f4a591212c36ce0058256ea743e97..5ba22e873cd0a1e54933c47493c5c89e24d2a69f 100644 (file)
--- 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 cdc237a1484afa57de206757016fa8bd37a4cd84..aba9b822d02193b93157cae9fc44975a3ffa49e9 100644 (file)
--- 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 13e8d6a98764c101d11d84ddfd20475800cf1256..652916fa75be1eec7ebd48bebaccb74b98f1b06b 100644 (file)
--- 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 6c6a40062417ac87e1414786a819963f3ebc65c9..b82300f70dbe85384e7269bab11b692de9b73813 100644 (file)
--- 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 18fe776821da00bae368f733e5333a2ebbb7b9ea..8c13c2b1e6423b3dfd6431e02c05763edb84953a 100644 (file)
--- 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 3e3be958125e5726f0197d094e02e8c6e5f60cbd..22fd191deced921ce55e958f9fe35d038d87574c 100644 (file)
--- 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 badb45a8eaed226c6188e6cba58037a966b4050a..2e82f8fe8982dc882be8fcfb19207fb2ba034928 100644 (file)
--- 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 5ae888a9a80b648ea54311ba25040a5f933b4b1f..0259118765168dcf1695747051faa2b20e694163 100644 (file)
--- 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 5a7e08a22ac116856c8e60bf98a30acb9ee1f321..64c342879d3b4a1946954b1582d06df0b459b203 100644 (file)
--- 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 5588010bc7069ee19b28e0be58eef2d7c07558de..50fd5ea38db7e34a42ee35b53ea31a397a18d1ee 100644 (file)
--- 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 2d7f2768d258f2eee27386163ebc186dca593fbe..75e47bd83efb2c6f7988c299f451e5665cee4ecc 100644 (file)
--- 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");