Change use of xfree to krb5_xfree to prevent namespace pollution

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

8 files changed, 56 insertions, 56 deletions

diff --git a/src/appl/bsd/forward.c b/src/appl/bsd/forward.c
index cef8ec6fa..c8f9c505a 100644
--- a/src/appl/bsd/forward.c
+++ b/src/appl/bsd/forward.c
@@ -87,7 +87,7 @@ get_for_creds(etype, sumtype, rhost, client, enc_key, forwardable, outbuf)
     }
     if (!hrealms[0]) {
 	free(remote_host);
-	xfree(hrealms);
+	krb5_xfree(hrealms);
 	return KRB5_ERR_HOST_REALM_UNKNOWN;
     }
 
@@ -313,7 +313,7 @@ krb5_data *outbuf;
     if (!(scratch->data = realloc(scratch->data,
 				  ret_cred.enc_part.ciphertext.length))) {
 	/* may destroy scratch->data */
-	xfree(scratch);
+	krb5_xfree(scratch);
 	return ENOMEM;
     }
     memset(scratch->data + scratch->length, 0,
@@ -363,7 +363,7 @@ krb5_data *outbuf;
     cleanup_encpart();
 
     *outbuf = *scratch;
-    xfree(scratch);
+    krb5_xfree(scratch);
     return 0;
 
  clean_prockey:
@@ -455,14 +455,14 @@ const krb5_address *recv_addr;    /* optional */
 	return retval;
     }
     
-#define cleanup_credmsg() {(void)xfree(credmsg->enc_part.ciphertext.data); (void)xfree(credmsg);}
+#define cleanup_credmsg() {(void)krb5_xfree(credmsg->enc_part.ciphertext.data); (void)krb5_xfree(credmsg);}
 
     if (!(scratch = (krb5_data *) malloc(sizeof(*scratch)))) {
 	cleanup_credmsg();
 	return ENOMEM;
     }
 
-#define cleanup_scratch() {(void)memset(scratch->data, 0, scratch->length); (void)xfree(scratch->data);}
+#define cleanup_scratch() {(void)memset(scratch->data, 0, scratch->length); (void)krb5_xfree(scratch->data);}
 
     if (retval = encode_krb5_ticket(credmsg->tickets[0], &scratch)) {
 	cleanup_credmsg();
@@ -472,7 +472,7 @@ const krb5_address *recv_addr;    /* optional */
 
     creds->ticket = *scratch;
     if (!(creds->ticket.data = malloc(scratch->length))) {
-	xfree(creds->ticket.data);
+	krb5_xfree(creds->ticket.data);
 	return ENOMEM;
     }
     memcpy((char *)creds->ticket.data, (char *) scratch->data, scratch->length);
@@ -530,7 +530,7 @@ const krb5_address *recv_addr;    /* optional */
     }
     cleanup_scratch();
 
-#define cleanup_mesg() {(void)xfree(credmsg_enc_part);}
+#define cleanup_mesg() {(void)krb5_xfree(credmsg_enc_part);}
 
     if (retval = krb5_timeofday(&currenttime)) {
 	cleanup_mesg();
diff --git a/src/appl/bsd/kcmd.c b/src/appl/bsd/kcmd.c
index 4dab0f259..5e27f5cc0 100644
--- a/src/appl/bsd/kcmd.c
+++ b/src/appl/bsd/kcmd.c
@@ -163,8 +163,8 @@ kcmd(sock, ahost, rport, locuser, remuser, cmd, fd2p, service, realm,
 #ifndef sgi
 	    sigsetmask(oldmask);
 #endif
-	    if (tmpstr) xfree(tmpstr);
-	    if (host_save) xfree(host_save);
+	    if (tmpstr) krb5_xfree(tmpstr);
+	    if (host_save) krb5_xfree(host_save);
 	    krb5_free_creds(ret_cred);
 	    return (-1);
     	}
@@ -211,8 +211,8 @@ kcmd(sock, ahost, rport, locuser, remuser, cmd, fd2p, service, realm,
 #ifndef sgi
     	sigsetmask(oldmask);
 #endif
-	if (tmpstr) xfree(tmpstr);
-	if (host_save) xfree(host_save);
+	if (tmpstr) krb5_xfree(tmpstr);
+	if (host_save) krb5_xfree(host_save);
 	krb5_free_creds(ret_cred);
     	return (-1);
     }
@@ -373,8 +373,8 @@ kcmd(sock, ahost, rport, locuser, remuser, cmd, fd2p, service, realm,
     sigsetmask(oldmask);
 #endif
     *sock = s;
-    if (tmpstr) xfree(tmpstr);
-    if (host_save) xfree(host_save);
+    if (tmpstr) krb5_xfree(tmpstr);
+    if (host_save) krb5_xfree(host_save);
     
     /* pass back credentials if wanted */
     if (cred) krb5_copy_creds(ret_cred,cred);
@@ -391,8 +391,8 @@ kcmd(sock, ahost, rport, locuser, remuser, cmd, fd2p, service, realm,
 #ifndef sgi
     sigsetmask(oldmask);
 #endif
-    if (tmpstr) xfree(tmpstr);
-    if (host_save) xfree(host_save);
+    if (tmpstr) krb5_xfree(tmpstr);
+    if (host_save) krb5_xfree(host_save);
     if (ret_cred)
       krb5_free_creds(ret_cred);
     return (status);
diff --git a/src/appl/bsd/krcp.c b/src/appl/bsd/krcp.c
index e92549e80..ec0807a39 100644
--- a/src/appl/bsd/krcp.c
+++ b/src/appl/bsd/krcp.c
@@ -1157,7 +1157,7 @@ void send_auth()
 		error_message(status));
 	exit(1);
     }
-    xfree(princ);
+    krb5_xfree(princ);
     status = krb5_write_message((krb5_pointer) &rem, &creds.ticket);
     if (status){
 	fprintf(stderr,
@@ -1189,7 +1189,7 @@ void send_auth()
 						  keyproc */
 			 0,               /* no rcache for the moment XXX */
 			 &authdat);
-    xfree(reply.data);
+    krb5_xfree(reply.data);
     if (status) {
 	fprintf(stderr, "rcp: send_auth failed krb5_rd_req: %s\n",
 		error_message(status));
@@ -1248,7 +1248,7 @@ void
 	krb5_cc_close(cc);
 	exit(1);
     }
-    xfree(pname_data.data);
+    krb5_xfree(pname_data.data);
     
     if (status = krb5_get_credentials(KRB5_GC_USER_USER, cc, &creds)){
 	krb5_cc_destroy(cc);
@@ -1272,7 +1272,7 @@ void
     krb5_cc_destroy(cc);
     krb5_cc_close(cc);
     status = krb5_write_message((krb5_pointer) &rem, &msg);
-    xfree(msg.data);
+    krb5_xfree(msg.data);
     if (status){
 	exit(1);
     }
diff --git a/src/appl/bsd/krlogind.c b/src/appl/bsd/krlogind.c
index 49a3793b8..76a344ab2 100644
--- a/src/appl/bsd/krlogind.c
+++ b/src/appl/bsd/krlogind.c
@@ -1456,16 +1456,16 @@ recvauth()
 	
 	if ((len = krb5_net_read(netf, inbuf.data, inbuf.length)) !=
 	    inbuf.length) {
-	    xfree(inbuf.data);
+	    krb5_xfree(inbuf.data);
 	    return((len < 0) ? errno : ECONNABORTED);
 	}
 
 	if (strcmp(inbuf.data, "KRB5_SENDAUTH_V1.0")) {
-	    xfree(inbuf.data);
+	    krb5_xfree(inbuf.data);
 	    status = KRB5_SENDAUTH_BADAUTHVERS;
 	    return status;
 	}
-	xfree(inbuf.data);
+	krb5_xfree(inbuf.data);
 
 #ifdef unicos61
 #define SIZEOF_INADDR  SIZEOF_in_addr
@@ -1714,11 +1714,11 @@ v5_recvauth(/* IN */
     if (retval = krb5_read_message(fd, &inbuf))
       return(retval);
     if (strcmp(inbuf.data, appl_version)) {
-	xfree(inbuf.data);
+	krb5_xfree(inbuf.data);
 	if (!problem)
 	  problem = KRB5_SENDAUTH_BADAPPLVERS;
     }
-    xfree(inbuf.data);
+    krb5_xfree(inbuf.data);
     /*
      * OK, now check the problem variable.  If it's zero, we're
      * fine and we can continue.  Otherwise, we have to signal an
@@ -1806,7 +1806,7 @@ v5_recvauth(/* IN */
     if (!problem)
       problem = krb5_rd_req(&inbuf, server, sender_addr, fetch_from,
 			    keyproc, keyprocarg, rcache, &authdat);
-    xfree(inbuf.data);
+    krb5_xfree(inbuf.data);
 #ifdef WORKING_RCACHE
     if (rcache)
       retval = krb5_rc_close(rcache);
@@ -1849,7 +1849,7 @@ v5_recvauth(/* IN */
     }
     if (retval = krb5_write_message(fd, &outbuf)) {
 	if (outbuf.data)
-	  xfree(outbuf.data);
+	  krb5_xfree(outbuf.data);
 	if (!problem)
 	  krb5_free_tkt_authent(authdat);
 	return(retval);
@@ -1894,11 +1894,11 @@ v5_recvauth(/* IN */
 	    return(retval);
 	}
 	if (retval = krb5_write_message(fd, &outbuf)) {
-	    xfree(outbuf.data);
+	    krb5_xfree(outbuf.data);
 	    krb5_free_tkt_authent(authdat);
 	    return(retval);
 	}
-	xfree(outbuf.data);
+	krb5_xfree(outbuf.data);
     }
     /*
      * At this point, we've won.  We just need to copy whatever
@@ -1928,7 +1928,7 @@ v5_recvauth(/* IN */
       *authent = authdat->authenticator;
     else
       krb5_free_authenticator(authdat->authenticator);
-    xfree(authdat);
+    krb5_xfree(authdat);
     return 0;
 }
 
diff --git a/src/appl/bsd/krshd.c b/src/appl/bsd/krshd.c
index 98f44a57c..8ea384019 100644
--- a/src/appl/bsd/krshd.c
+++ b/src/appl/bsd/krshd.c
@@ -1468,16 +1468,16 @@ recvauth(netf, peersin, peeraddr)
 	
 	if ((len = krb5_net_read(netf, inbuf.data, inbuf.length)) !=
 	    inbuf.length) {
-	    xfree(inbuf.data);
+	    krb5_xfree(inbuf.data);
 	    return((len < 0) ? errno : ECONNABORTED);
 	}
 
 	if (strcmp(inbuf.data, "KRB5_SENDAUTH_V1.0")) {
-	    xfree(inbuf.data);
+	    krb5_xfree(inbuf.data);
 	    status = KRB5_SENDAUTH_BADAUTHVERS;
 	    return status;
 	}
-	xfree(inbuf.data);
+	krb5_xfree(inbuf.data);
 
 #ifdef unicos61
 #define SIZEOF_INADDR  SIZEOF_in_addr
@@ -1708,11 +1708,11 @@ v5_recvauth(/* IN */
     if (retval = krb5_read_message(fd, &inbuf))
       return(retval);
     if (strcmp(inbuf.data, appl_version)) {
-	xfree(inbuf.data);
+	krb5_xfree(inbuf.data);
 	if (!problem)
 	  problem = KRB5_SENDAUTH_BADAPPLVERS;
     }
-    xfree(inbuf.data);
+    krb5_xfree(inbuf.data);
     /*
      * OK, now check the problem variable.  If it's zero, we're
      * fine and we can continue.  Otherwise, we have to signal an
@@ -1800,7 +1800,7 @@ v5_recvauth(/* IN */
     if (!problem)
       problem = krb5_rd_req(&inbuf, server, sender_addr, fetch_from,
 			    keyproc, keyprocarg, rcache, &authdat);
-    xfree(inbuf.data);
+    krb5_xfree(inbuf.data);
 #ifdef WORKING_RCACHE
     if (rcache)
       retval = krb5_rc_close(rcache);
@@ -1843,7 +1843,7 @@ v5_recvauth(/* IN */
     }
     if (retval = krb5_write_message(fd, &outbuf)) {
 	if (outbuf.data)
-	  xfree(outbuf.data);
+	  krb5_xfree(outbuf.data);
 	if (!problem)
 	  krb5_free_tkt_authent(authdat);
 	return(retval);
@@ -1889,11 +1889,11 @@ v5_recvauth(/* IN */
 	    return(retval);
 	}
 	if (retval = krb5_write_message(fd, &outbuf)) {
-	    xfree(outbuf.data);
+	    krb5_xfree(outbuf.data);
 	    krb5_free_tkt_authent(authdat);
 	    return(retval);
 	}
-	xfree(outbuf.data);
+	krb5_xfree(outbuf.data);
     }
     
     /*
@@ -1924,7 +1924,7 @@ v5_recvauth(/* IN */
       *authent = authdat->authenticator;
     else
       krb5_free_authenticator(authdat->authenticator);
-    xfree(authdat);
+    krb5_xfree(authdat);
     return 0;
 }
 
diff --git a/src/appl/simple/client/sim_client.c b/src/appl/simple/client/sim_client.c
index 6fbfac25a..a9a713ed3 100644
--- a/src/appl/simple/client/sim_client.c
+++ b/src/appl/simple/client/sim_client.c
@@ -221,7 +221,7 @@ char *argv[];
 	com_err(PROGNAME, errno, "while sending KRB_AP_REQ message");
     printf("Sent authentication data: %d bytes\n", i);
 
-    xfree(packet.data);
+    krb5_xfree(packet.data);
     /* PREPARE KRB_SAFE MESSAGE */
 
     /* Get my address */
@@ -252,12 +252,12 @@ char *argv[];
 	exit(1);
     }
     if (retval = krb5_rc_resolve_type(&rcache, krb5_rc_default_type())) {
-	xfree(rcache);
+	krb5_xfree(rcache);
 	com_err(PROGNAME, retval, "while resolving replay cache type");
 	exit(1);
     }
     if (retval = krb5_rc_resolve(rcache, cp)) {
-	xfree(rcache);
+	krb5_xfree(rcache);
 	com_err(PROGNAME, retval, "while resolving replay cache type");
 	exit(1);
     }
@@ -308,7 +308,7 @@ char *argv[];
 	com_err(PROGNAME, errno, "while sending SAFE message");
     printf("Sent checksummed message: %d bytes\n", i);
 
-    xfree(packet.data);
+    krb5_xfree(packet.data);
     /* PREPARE KRB_PRIV MESSAGE */
 
 
diff --git a/src/appl/simple/server/sim_server.c b/src/appl/simple/server/sim_server.c
index 611cde84e..8e821255a 100644
--- a/src/appl/simple/server/sim_server.c
+++ b/src/appl/simple/server/sim_server.c
@@ -204,12 +204,12 @@ char *argv[];
 			      &message)) {
 	com_err(PROGNAME, retval, "while verifying SAFE message");
 	(void) krb5_rc_close(rcache);
-	xfree(rcache);
+	krb5_xfree(rcache);
 	exit(1);
     }
     printf("Safe message is: '%.*s'\n", message.length, message.data);
 
-    xfree(message.data);
+    krb5_xfree(message.data);
     krb5_free_address(portforeign_addr);
 
     /* NOW GET ENCRYPTED MESSAGE */
@@ -221,7 +221,7 @@ char *argv[];
     if (i < 0) {
 	perror("receiving datagram");
 	(void) krb5_rc_close(rcache);
-	xfree(rcache);
+	krb5_xfree(rcache);
 	exit(1);
     }
     printf("Received %d bytes\n", i);
@@ -231,7 +231,7 @@ char *argv[];
 				   &portforeign_addr)) {
 	com_err(PROGNAME, retval, "while generating port address");
 	(void) krb5_rc_close(rcache);
-	xfree(rcache);
+	krb5_xfree(rcache);
 	exit(1);
     }
 
@@ -241,13 +241,13 @@ char *argv[];
 			      &message)) {
 	com_err(PROGNAME, retval, "while verifying PRIV message");
 	(void) krb5_rc_close(rcache);
-	xfree(rcache);
+	krb5_xfree(rcache);
 	exit(1);
     }
     printf("Decrypted message is: '%.*s'\n", message.length, message.data);
 
     (void) krb5_rc_close(rcache);
-    xfree(rcache);
+    krb5_xfree(rcache);
 
     exit(0);
 }
diff --git a/src/appl/telnet/libtelnet/forward.c b/src/appl/telnet/libtelnet/forward.c
index dcc892774..89af513a3 100644
--- a/src/appl/telnet/libtelnet/forward.c
+++ b/src/appl/telnet/libtelnet/forward.c
@@ -84,7 +84,7 @@ get_for_creds(etype, sumtype, rhost, client, enc_key, forwardable, outbuf)
     }
     if (!hrealms[0]) {
 	free(remote_host);
-	xfree(hrealms);
+	krb5_xfree(hrealms);
 	return KRB5_ERR_HOST_REALM_UNKNOWN;
     }
 
@@ -309,7 +309,7 @@ krb5_data *outbuf;
     if (!(scratch->data = realloc(scratch->data,
 				  ret_cred.enc_part.ciphertext.length))) {
 	/* may destroy scratch->data */
-	xfree(scratch);
+	krb5_xfree(scratch);
 	return ENOMEM;
     }
     memset(scratch->data + scratch->length, 0,
@@ -359,7 +359,7 @@ krb5_data *outbuf;
     cleanup_encpart();
 
     *outbuf = *scratch;
-    xfree(scratch);
+    krb5_xfree(scratch);
     return 0;
 
  clean_prockey:
@@ -451,14 +451,14 @@ const krb5_address *recv_addr;    /* optional */
 	return retval;
     }
     
-#define cleanup_credmsg() {(void)xfree(credmsg->enc_part.ciphertext.data); (void)xfree(credmsg);}
+#define cleanup_credmsg() {(void)krb5_xfree(credmsg->enc_part.ciphertext.data); (void)krb5_xfree(credmsg);}
 
     if (!(scratch = (krb5_data *) malloc(sizeof(*scratch)))) {
 	cleanup_credmsg();
 	return ENOMEM;
     }
 
-#define cleanup_scratch() {(void)memset(scratch->data, 0, scratch->length); (void)xfree(scratch->data);}
+#define cleanup_scratch() {(void)memset(scratch->data, 0, scratch->length); (void)krb5_xfree(scratch->data);}
 
     if (retval = encode_krb5_ticket(credmsg->tickets[0], &scratch)) {
 	cleanup_credmsg();
@@ -468,7 +468,7 @@ const krb5_address *recv_addr;    /* optional */
 
     creds->ticket = *scratch;
     if (!(creds->ticket.data = malloc(scratch->length))) {
-	xfree(creds->ticket.data);
+	krb5_xfree(creds->ticket.data);
 	return ENOMEM;
     }
     memcpy((char *)creds->ticket.data, (char *) scratch->data, scratch->length);
@@ -526,7 +526,7 @@ const krb5_address *recv_addr;    /* optional */
     }
     cleanup_scratch();
 
-#define cleanup_mesg() {(void)xfree(credmsg_enc_part);}
+#define cleanup_mesg() {(void)krb5_xfree(credmsg_enc_part);}
 
     if (retval = krb5_timeofday(&currenttime)) {
 	cleanup_mesg();