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

5 files changed, 11 insertions, 11 deletions

diff --git a/src/lib/kdb/decrypt_key.c b/src/lib/kdb/decrypt_key.c
index a16630f79..89a79ab2e 100644
--- a/src/lib/kdb/decrypt_key.c
+++ b/src/lib/kdb/decrypt_key.c
@@ -73,13 +73,13 @@ krb5_keyblock *out;
     if (retval = krb5_decrypt((krb5_pointer) ((char *) in->contents + 4),
 			      (krb5_pointer) out->contents,
 			      in->length-sizeof(in->length), eblock, 0)) {
-	xfree(out->contents);
+	krb5_xfree(out->contents);
 	out->contents = 0;
 	out->length = 0;
 	return retval;
     }
     if (out->length < 0) {
-	xfree(out->contents);
+	krb5_xfree(out->contents);
 	out->contents = 0;
 	out->length = 0;
 	return KRB5_KDB_INVALIDKEYSIZE;
diff --git a/src/lib/kdb/encrypt_key.c b/src/lib/kdb/encrypt_key.c
index 05feeb1c9..1c3606de2 100644
--- a/src/lib/kdb/encrypt_key.c
+++ b/src/lib/kdb/encrypt_key.c
@@ -70,7 +70,7 @@ register krb5_encrypted_keyblock *out;
     out->length += sizeof(out->length);
     out->contents = (krb5_octet *)malloc(out->length);
     if (!out->contents) {
-	xfree(tmpin.contents);
+	krb5_xfree(tmpin.contents);
 	out->contents = 0;
 	out->length = 0;
 	return ENOMEM;
@@ -85,9 +85,9 @@ register krb5_encrypted_keyblock *out;
     retval = krb5_encrypt((krb5_pointer) tmpin.contents,
 			  (krb5_pointer) ((char *) out->contents + 4),
 			  tmpin.length, eblock, 0);
-    xfree(tmpin.contents);
+    krb5_xfree(tmpin.contents);
     if (retval) {
-	xfree(out->contents);
+	krb5_xfree(out->contents);
 	out->contents = 0;
 	out->length = 0;
     }
diff --git a/src/lib/kdb/fetch_mkey.c b/src/lib/kdb/fetch_mkey.c
index 38f79f9e1..98dcac7a4 100644
--- a/src/lib/kdb/fetch_mkey.c
+++ b/src/lib/kdb/fetch_mkey.c
@@ -101,7 +101,7 @@ OLDDECLARG(krb5_keyblock *,key)
 	retval = krb5_string_to_key(eblock, key->keytype, key, &pwd,
 				    salt ? salt : &scratch);
 	if (!salt)
-		xfree(scratch.data);
+		krb5_xfree(scratch.data);
 	memset(password, 0, sizeof(password)); /* erase it */
 	return retval;
 
diff --git a/src/lib/kdb/kdb_dbm.c b/src/lib/kdb/kdb_dbm.c
index 145ed1d75..43aa3e4d7 100644
--- a/src/lib/kdb/kdb_dbm.c
+++ b/src/lib/kdb/kdb_dbm.c
@@ -752,17 +752,17 @@ krb5_db_entry *entry;
     /* erase the key */
     if (entry->key.contents) {
 	memset((char *)entry->key.contents, 0, entry->key.length);
-	xfree(entry->key.contents);
+	krb5_xfree(entry->key.contents);
     }
     if (entry->salt)
-	xfree(entry->salt);
+	krb5_xfree(entry->salt);
     
     if (entry->alt_key.contents) {
 	memset((char *)entry->alt_key.contents, 0, entry->alt_key.length);
-	xfree(entry->alt_key.contents);
+	krb5_xfree(entry->alt_key.contents);
     }
     if (entry->alt_salt)
-	xfree(entry->alt_salt);
+	krb5_xfree(entry->alt_salt);
     
     if (entry->principal)
 	krb5_free_principal(entry->principal);
diff --git a/src/lib/kdb/verify_mky.c b/src/lib/kdb/verify_mky.c
index 503abdae2..a5617fe7a 100644
--- a/src/lib/kdb/verify_mky.c
+++ b/src/lib/kdb/verify_mky.c
@@ -84,7 +84,7 @@ krb5_encrypt_block *eblock;
 	retval = krb5_finish_key(eblock);
 
     memset((char *)tempkey.contents, 0, tempkey.length);
-    xfree(tempkey.contents);
+    krb5_xfree(tempkey.contents);
     krb5_db_free_principal(&master_entry, nprinc);
     
     return retval;