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

3 files changed, 18 insertions, 14 deletions

diff --git a/src/slave/ChangeLog b/src/slave/ChangeLog
index f152ec2..6d203e5 100644
--- a/src/slave/ChangeLog
+++ b/src/slave/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 18 18:18:44 1997  Richard Basch  <basch@lehman.com>
+
+	* kprop.c kpropd.c: Use krb5_free_data_contents, where appropriate.
+
 Fri Jan 31 19:22:37 1997  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in:
diff --git a/src/slave/kprop.c b/src/slave/kprop.c
index 0ddcc2f..d804ea0 100644
--- a/src/slave/kprop.c
+++ b/src/slave/kprop.c
@@ -546,11 +546,11 @@ xmit_database(context, auth_context, my_creds, fd, database_fd, database_size)
 		exit(1);
 	}
 	if (retval = krb5_write_message(context, (void *) &fd, &outbuf)) {
-		krb5_xfree(outbuf.data);
+		krb5_free_data_contents(context, &outbuf);
 		com_err(progname, retval, "while sending database size");
 		exit(1);
 	}
-	krb5_xfree(outbuf.data);
+	krb5_free_data_contents(context, &outbuf);
     /*
      * Initialize the initial vector.
      */
@@ -577,13 +577,13 @@ xmit_database(context, auth_context, my_creds, fd, database_fd, database_size)
 			exit(1);
 		}
 		if (retval = krb5_write_message(context, (void *)&fd,&outbuf)) {
-			krb5_xfree(outbuf.data);
+			krb5_free_data_contents(context, &outbuf);
 			com_err(progname, retval,
 				"while sending database block starting at %d",
 				sent_size);
 			exit(1);
 		}
-		krb5_xfree(outbuf.data);
+		krb5_free_data_contents(context, &outbuf);
 		sent_size += n;
 		if (debug)
 			printf("%d bytes sent.\n", sent_size);
@@ -674,7 +674,7 @@ send_error(context, my_creds, fd, err_text, err_code)
 		strcpy(error.text.data, text);
 		if (!krb5_mk_error(context, &error, &outbuf)) {
 			(void) krb5_write_message(context, (void *)&fd,&outbuf);
-			krb5_xfree(outbuf.data);
+			krb5_free_data_contents(context, &outbuf);
 		}
 		free(error.text.data);
 	}
diff --git a/src/slave/kpropd.c b/src/slave/kpropd.c
index 7139a25..4081b77 100644
--- a/src/slave/kpropd.c
+++ b/src/slave/kpropd.c
@@ -324,12 +324,12 @@ void doit(fd)
 	 */
 	if (retval = krb5_write_message(kpropd_context, (void *) &fd,
 					&confmsg)) { 
-		krb5_xfree(confmsg.data);
+		krb5_free_data_contents(context, &confmsg);
 		com_err(progname, retval,
 			"while sending # of received bytes");
 		exit(1);
 	}
-	krb5_xfree(confmsg.data);
+	krb5_free_data_contents(context, &confmsg);
 	if (close(fd) < 0) {
 		com_err(progname, errno,
 			"while trying to close database file");
@@ -652,14 +652,14 @@ recv_database(context, fd, database_fd, confmsg)
 		recv_error(context, &inbuf);
 	if (retval = krb5_rd_safe(context,auth_context,&inbuf,&outbuf,NULL)) {
 		send_error(context, fd, retval, "while decoding database size");
-		krb5_xfree(inbuf.data);
+		krb5_free_data_contents(context, &inbuf);
 		com_err(progname, retval,
 			"while decoding database size from client");
 		exit(1);
 	}
 	memcpy((char *) &database_size, outbuf.data, sizeof(database_size));
-	krb5_xfree(inbuf.data);
-	krb5_xfree(outbuf.data);
+	krb5_free_data_contents(context, &inbuf);
+	krb5_free_data_contents(context, &outbuf);
 	database_size = ntohl(database_size);
 
     /*
@@ -693,12 +693,12 @@ recv_database(context, fd, database_fd, confmsg)
 				received_size);
 			com_err(progname, retval, buf);
 			send_error(context, fd, retval, buf);
-			krb5_xfree(inbuf.data);
+			krb5_free_data_contents(context, &inbuf);
 			exit(1);
 		}
 		n = write(database_fd, outbuf.data, outbuf.length);
-		krb5_xfree(inbuf.data);
-		krb5_xfree(outbuf.data);
+		krb5_free_data_contents(context, &inbuf);
+		krb5_free_data_contents(context, &outbuf);
 		if (n < 0) {
 			sprintf(buf,
 				"while writing database block starting at offset %d",
@@ -774,7 +774,7 @@ send_error(context, fd, err_code, err_text)
 		strcpy(error.text.data, text);
 		if (!krb5_mk_error(context, &error, &outbuf)) {
 			(void) krb5_write_message(context, (void *)&fd,&outbuf);
-			krb5_xfree(outbuf.data);
+			krb5_free_data_contents(context, &outbuf);
 		}
 		free(error.text.data);
 	}