Remove krb5_xfree from the public interface

Implement krb5_free_data & krb5_free_data_contents to cleanup krb5_data
	structures and data contents allocated by the krb5 library.

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

9 files changed, 24 insertions, 10 deletions

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 5cb08d5ef..32082f028 100644
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 18 18:03:55 1997  Richard Basch  <basch@lehman.com>
+
+	* krcp.c: Replace krb5_xfree with krb5_free_data_contents
+	* kcmd.c krlogind.c krshd.c: Use free instead of internal krb5_xfree
+
 Sat Dec 28 21:06:43 1996  Sam Hartman  <hartmans@luminous.MIT.EDU>
 
 	* login.c: Force environment variables like HOME to be set even if
diff --git a/src/appl/bsd/kcmd.c b/src/appl/bsd/kcmd.c
index 6f4583596..e25da17d8 100644
--- a/src/appl/bsd/kcmd.c
+++ b/src/appl/bsd/kcmd.c
@@ -303,7 +303,7 @@ kcmd(sock, ahost, rport, locuser, remuser, cmd, fd2p, service, realm,
     status = krb5_sendauth(bsd_context, &auth_context, (krb5_pointer) &s,
                            "KCMDV0.1", ret_cred->client, ret_cred->server,
 			   authopts, &cksumdat, ret_cred, 0,	&error, &rep_ret, NULL);
-	krb5_xfree(cksumdat.data);
+    free(cksumbuf);
     if (status) {
 	printf("Couldn't authenticate to server: %s\n", error_message(status));
 	if (error) {
diff --git a/src/appl/bsd/krcp.c b/src/appl/bsd/krcp.c
index 6f76bd272..10819afb6 100644
--- a/src/appl/bsd/krcp.c
+++ b/src/appl/bsd/krcp.c
@@ -1306,7 +1306,8 @@ void
 				  &creds.server)) )
 	exit(1);
 
-    krb5_xfree(pname_data.data);
+    krb5_free_data_contents(bsd_context, &pname_data);
+
     if ((status = krb5_get_credentials(bsd_context, KRB5_GC_USER_USER, cc, 
 				       &creds, &new_creds)))
 	exit(1);
@@ -1318,7 +1319,7 @@ void
     
     if ((status = krb5_write_message(bsd_context, (krb5_pointer) &rem,
 				     &msg))) {
-    	krb5_xfree(msg.data);
+    	krb5_free_data_contents(bsd_context, &msg);
 	exit(1);
     }
     
@@ -1328,7 +1329,7 @@ void
     /* cleanup */
     krb5_free_cred_contents(bsd_context, &creds);
     krb5_free_creds(bsd_context, new_creds);
-    krb5_xfree(msg.data);
+    krb5_free_data_contents(bsd_context, &msg);
     
     /* OK process key */
     krb5_use_enctype(bsd_context, &eblock, session_key->enctype);
diff --git a/src/appl/bsd/krlogind.c b/src/appl/bsd/krlogind.c
index 7773de517..29bd8a418 100644
--- a/src/appl/bsd/krlogind.c
+++ b/src/appl/bsd/krlogind.c
@@ -1495,7 +1495,7 @@ recvauth(valid_checksum)
 				      ticket->enc_part2->session->length);
     error_cleanup:
 	if (chksumbuf)
-	    krb5_xfree(chksumbuf);
+	    free(chksumbuf);
 	if (status) {
 	  krb5_free_authenticator(bsd_context, authenticator);
 	  return status;
diff --git a/src/appl/bsd/krshd.c b/src/appl/bsd/krshd.c
index 8859e3a9f..43727a7d4 100644
--- a/src/appl/bsd/krshd.c
+++ b/src/appl/bsd/krshd.c
@@ -1850,7 +1850,7 @@ recvauth(netf, peersin, valid_checksum)
 
     error_cleanup:
 	if (chksumbuf)
-	    krb5_xfree(chksumbuf);
+	    free(chksumbuf);
 	if (status) {
 	    krb5_free_authenticator(bsd_context, authenticator);
 	    return status;
diff --git a/src/appl/simple/client/ChangeLog b/src/appl/simple/client/ChangeLog
index 9deae0cc6..72017595a 100644
--- a/src/appl/simple/client/ChangeLog
+++ b/src/appl/simple/client/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 18 18:11:03 1997  Richard Basch  <basch@lehman.com>
+
+	* sim_client.c: Replace krb5_xfree with krb5_free_data_contents
+
 Tue Feb  4 20:38:44 1997  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in:
diff --git a/src/appl/simple/client/sim_client.c b/src/appl/simple/client/sim_client.c
index a573dfa54..ec88a76b8 100644
--- a/src/appl/simple/client/sim_client.c
+++ b/src/appl/simple/client/sim_client.c
@@ -237,7 +237,7 @@ main(argc, argv)
     if ((i = send(sock, (char *)packet.data, packet.length, flags)) < 0) 
 	com_err(progname, errno, "while sending KRB_AP_REQ message");
     printf("Sent authentication data: %d bytes\n", i);
-    krb5_xfree(packet.data);
+    krb5_free_data_contents(context, &packet);
 
     /* PREPARE KRB_SAFE MESSAGE */
 
@@ -305,7 +305,7 @@ main(argc, argv)
     if ((i = send(sock, (char *)packet.data, packet.length, flags)) < 0)
 	com_err(progname, errno, "while sending SAFE message");
     printf("Sent checksummed message: %d bytes\n", i);
-    krb5_xfree(packet.data);
+    krb5_free_data_contents(context, &packet);
 
     /* PREPARE KRB_PRIV MESSAGE */
 
@@ -320,7 +320,7 @@ main(argc, argv)
     if ((i = send(sock, (char *)packet.data, packet.length, flags)) < 0)
 	com_err(progname, errno, "while sending PRIV message");
     printf("Sent encrypted message: %d bytes\n", i);
-    krb5_xfree(packet.data);
+    krb5_free_data_contents(context, &packet);
 
     krb5_auth_con_free(context, auth_context);
     krb5_free_context(context);
diff --git a/src/appl/simple/server/ChangeLog b/src/appl/simple/server/ChangeLog
index dd7e1e146..e6fd132f4 100644
--- a/src/appl/simple/server/ChangeLog
+++ b/src/appl/simple/server/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 18 18:12:16 1997  Richard Basch  <basch@lehman.com>
+
+	* sim_server.c: Use krb5_free_data_contents instead of krb5_xfree
+
 Tue Feb  4 20:41:49 1997  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in:
diff --git a/src/appl/simple/server/sim_server.c b/src/appl/simple/server/sim_server.c
index 255d786f2..f57ec8911 100644
--- a/src/appl/simple/server/sim_server.c
+++ b/src/appl/simple/server/sim_server.c
@@ -244,7 +244,7 @@ char *argv[];
     }
     printf("Safe message is: '%.*s'\n", message.length, message.data);
 
-    krb5_xfree(message.data);
+    krb5_free_data_contents(context, &message);
 
     /* NOW GET ENCRYPTED MESSAGE */