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

4 files changed, 71 insertions, 15 deletions

diff --git a/src/lib/krb5/free/ChangeLog b/src/lib/krb5/free/ChangeLog
index 8a81e898c..0a4e09847 100644
--- a/src/lib/krb5/free/ChangeLog
+++ b/src/lib/krb5/free/ChangeLog
@@ -1,3 +1,9 @@
+Tue Feb 18 17:42:52 1997  Richard Basch  <basch@lehman.com>
+
+	* Makefile.in f_data.c:
+		f_data.c now implements the functions
+		krb5_free_data, krb5_free_data_contents
+
 Thu Nov 21 11:55:16 EST 1996    Richard Basch   <basch@lehman.com>
 
         * Makefile.in: win32 build
diff --git a/src/lib/krb5/free/Makefile.in b/src/lib/krb5/free/Makefile.in
index 593aacf32..68617bd13 100644
--- a/src/lib/krb5/free/Makefile.in
+++ b/src/lib/krb5/free/Makefile.in
@@ -15,8 +15,11 @@ STLIBOBJS= \
 	f_authent.o	\
 	f_auth_cnt.o	\
 	f_chksum.o	\
-	f_creds.o	\
+	f_cred.o	\
 	f_cred_cnt.o	\
+	f_cred_enc.o	\
+	f_creds.o	\
+	f_data.o	\
 	f_enc_kdc.o	\
 	f_enc_tkt.o	\
 	f_einfo.o	\
@@ -35,9 +38,7 @@ STLIBOBJS= \
 	f_tgt_cred.o	\
 	f_tkt_auth.o	\
 	f_pwd_data.o	\
-	f_pwd_seq.o	\
-	f_cred.o	\
-	f_cred_enc.o
+	f_pwd_seq.o
 
 OBJS=	\
 	f_addr.$(OBJEXT)	\
@@ -49,8 +50,11 @@ OBJS=	\
 	f_authent.$(OBJEXT)	\
 	f_auth_cnt.$(OBJEXT)	\
 	f_chksum.$(OBJEXT)	\
-	f_creds.$(OBJEXT)	\
+	f_cred.$(OBJEXT)	\
 	f_cred_cnt.$(OBJEXT)	\
+	f_cred_enc.$(OBJEXT)	\
+	f_creds.$(OBJEXT)	\
+	f_data.$(OBJEXT)	\
 	f_enc_kdc.$(OBJEXT)	\
 	f_enc_tkt.$(OBJEXT)	\
 	f_einfo.$(OBJEXT)	\
@@ -69,9 +73,7 @@ OBJS=	\
 	f_tgt_cred.$(OBJEXT)	\
 	f_tkt_auth.$(OBJEXT)	\
 	f_pwd_data.$(OBJEXT)	\
-	f_pwd_seq.$(OBJEXT)	\
-	f_cred.$(OBJEXT)	\
-	f_cred_enc.$(OBJEXT)
+	f_pwd_seq.$(OBJEXT)
 
 SRCS=	\
 	$(srcdir)/f_addr.c	\
@@ -83,8 +85,11 @@ SRCS=	\
 	$(srcdir)/f_authent.c	\
 	$(srcdir)/f_auth_cnt.c	\
 	$(srcdir)/f_chksum.c	\
-	$(srcdir)/f_creds.c	\
+	$(srcdir)/f_cred.c	\
 	$(srcdir)/f_cred_cnt.c	\
+	$(srcdir)/f_cred_enc.c	\
+	$(srcdir)/f_creds.c	\
+	$(srcdir)/f_data.c	\
 	$(srcdir)/f_enc_kdc.c	\
 	$(srcdir)/f_enc_tkt.c	\
 	$(srcdir)/f_einfo.c	\
@@ -103,9 +108,7 @@ SRCS=	\
 	$(srcdir)/f_tgt_cred.c	\
 	$(srcdir)/f_tkt_auth.c	\
 	$(srcdir)/f_pwd_data.c	\
-	$(srcdir)/f_pwd_seq.c	\
-	$(srcdir)/f_cred.c	\
-	$(srcdir)/f_cred_enc.c
+	$(srcdir)/f_pwd_seq.c
 
 all-windows:: $(OBJFILE)
 
diff --git a/src/lib/krb5/free/f_data.c b/src/lib/krb5/free/f_data.c
new file mode 100644
index 000000000..cf7970bf3
--- /dev/null
+++ b/src/lib/krb5/free/f_data.c
@@ -0,0 +1,47 @@
+/*
+ * lib/krb5/free/f_data.c
+ *
+ * Copyright 1997 by the Massachusetts Institute of Technology.
+ *
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
+ * 
+ *
+ * krb5_free_address()
+ */
+
+#include "k5-int.h"
+
+KRB5_DLLIMP void KRB5_CALLCONV
+krb5_free_data(context, val)
+    krb5_context context;
+    krb5_data FAR * val;
+{
+    if (val->data)
+	krb5_xfree(val->data);
+    krb5_xfree(val);
+    return;
+}
+
+KRB5_DLLIMP void KRB5_CALLCONV
+krb5_free_data_contents(context, val)
+    krb5_context context;
+    krb5_data FAR * val;
+{
+    if (val->data)
+	krb5_xfree(val->data);
+    return;
+}
diff --git a/src/lib/krb5/os/read_msg.c b/src/lib/krb5/os/read_msg.c
index 6a93644a8..8ece718cc 100644
--- a/src/lib/krb5/os/read_msg.c
+++ b/src/lib/krb5/os/read_msg.c
@@ -39,7 +39,7 @@ krb5_read_message(context, fdp, inbuf)
 	krb5_data	*inbuf;
 {
 	krb5_int32	len;
-   int      len2, ilen;
+	int		len2, ilen;
 	char		*buf = NULL;
 	int		fd = *( (int *) fdp);
 	
@@ -47,8 +47,8 @@ krb5_read_message(context, fdp, inbuf)
 		return((len2 < 0) ? errno : ECONNABORTED);
 	len = ntohl(len);
 
-   if ((len & VALID_UINT_BITS) != len)  /* Overflow size_t??? */
-      return ENOMEM;
+	if ((len & VALID_UINT_BITS) != len)  /* Overflow size_t??? */
+		return ENOMEM;
 
 	inbuf->length = ilen = (int) len;
 	if (ilen) {