Start to phase out krb5_xfree macro, which just casts its argument to

char* and calls free.

Replace most uses, outside of the LDAP KDB plugin, which doesn't build
on my test system of the moment because of version dependencies.  Add
one explicit cast to make the change warning-neutral (under gcc 4.0.1
on Mac OS X 10.5.6).

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

6 files changed, 12 insertions, 12 deletions

diff --git a/src/lib/kdb/decrypt_key.c b/src/lib/kdb/decrypt_key.c
index 9ab66dfbf5..a564c37b01 100644
--- a/src/lib/kdb/decrypt_key.c
+++ b/src/lib/kdb/decrypt_key.c
@@ -90,7 +90,7 @@ krb5_dbekd_def_decrypt_key_data( krb5_context 	  context,
 
 	if ((retval = krb5_c_decrypt(context, mkey, 0 /* XXX */, 0,
 				     &cipher, &plain))) {
-	    krb5_xfree(plain.data);
+	    free(plain.data);
 	    return retval;
 	}
 
@@ -101,7 +101,7 @@ krb5_dbekd_def_decrypt_key_data( krb5_context 	  context,
 	   any better than that. */
 
 	if (tmplen > plain.length) {
-	    krb5_xfree(plain.data);
+	    free(plain.data);
 	    return(KRB5_CRYPTO_INTERNAL);
 	}
 
@@ -118,7 +118,7 @@ krb5_dbekd_def_decrypt_key_data( krb5_context 	  context,
 	    if ((keysalt->data.length = key_data->key_data_length[1])) {
 		if (!(keysalt->data.data=(char *)malloc(keysalt->data.length))){
 		    if (key_data->key_data_contents[0]) {
-			krb5_xfree(dbkey->contents);
+			free(dbkey->contents);
 			dbkey->contents = 0;
 			dbkey->length = 0;
 		    }
diff --git a/src/lib/kdb/encrypt_key.c b/src/lib/kdb/encrypt_key.c
index bf778ea858..0db1a029a4 100644
--- a/src/lib/kdb/encrypt_key.c
+++ b/src/lib/kdb/encrypt_key.c
@@ -79,7 +79,7 @@ krb5_dbekd_def_encrypt_key_data( krb5_context 		  context,
 
     for (i = 0; i < key_data->key_data_ver; i++)
 	if (key_data->key_data_contents[i])
-	    krb5_xfree(key_data->key_data_contents[i]);
+	    free(key_data->key_data_contents[i]);
 
     key_data->key_data_ver = 1;
     key_data->key_data_kvno = keyver;
@@ -110,7 +110,7 @@ krb5_dbekd_def_encrypt_key_data( krb5_context 		  context,
 
     if ((retval = krb5_c_encrypt(context, mkey, /* XXX */ 0, 0,
 				 &plain, &cipher))) {
-	krb5_xfree(key_data->key_data_contents[0]);
+	free(key_data->key_data_contents[0]);
 	return retval;
     }
 
@@ -123,7 +123,7 @@ krb5_dbekd_def_encrypt_key_data( krb5_context 		  context,
 		key_data->key_data_contents[1] =
 		    (krb5_octet *)malloc(keysalt->data.length);
 		if (key_data->key_data_contents[1] == NULL) {
-		    krb5_xfree(key_data->key_data_contents[0]);
+		    free(key_data->key_data_contents[0]);
 		    return ENOMEM;
 		}
 		memcpy(key_data->key_data_contents[1], keysalt->data.data,
diff --git a/src/lib/kdb/kdb5.c b/src/lib/kdb/kdb5.c
index 5cc67f9b37..88df6bcc61 100644
--- a/src/lib/kdb/kdb5.c
+++ b/src/lib/kdb/kdb5.c
@@ -1533,7 +1533,7 @@ krb5_db_fetch_mkey(krb5_context    context,
         }
 
 	if (!salt)
-	    krb5_xfree(scratch.data);
+	    free(scratch.data);
 	memset(password, 0, sizeof(password));	/* erase it */
 
     } else {
diff --git a/src/lib/kdb/kdb_cpw.c b/src/lib/kdb/kdb_cpw.c
index 86bec7a43f..a59d98e737 100644
--- a/src/lib/kdb/kdb_cpw.c
+++ b/src/lib/kdb/kdb_cpw.c
@@ -412,7 +412,7 @@ add_key_pwd(context, master_key, ks_tuple, ks_tuple_count, passwd,
 	 	return(retval);
 
 	    key_salt.data = *saltdata;
-	    krb5_xfree(saltdata);
+	    free(saltdata);
 	}
 		break;
     	case KRB5_KDB_SALTTYPE_NOREALM:
@@ -438,7 +438,7 @@ add_key_pwd(context, master_key, ks_tuple, ks_tuple_count, passwd,
 
 	    key_salt.data = *saltdata;
 	    key_salt.data.length = SALT_TYPE_AFS_LENGTH; /*length actually used below...*/
-	    krb5_xfree(saltdata);
+	    free(saltdata);
 #else
 	    /* Why do we do this? Well, the afs_mit_string_to_key needs to
 	       use strlen, and the realm is not NULL terminated.... */
@@ -481,7 +481,7 @@ add_key_pwd(context, master_key, ks_tuple, ks_tuple_count, passwd,
 					     kvno, &tmp_key_data);
 	if (key_salt.data.data)
 	    free(key_salt.data.data);
-	krb5_xfree(key.contents);
+	free(key.contents);
 
 	if( retval )
 	    return retval;
diff --git a/src/lib/kdb/kdb_default.c b/src/lib/kdb/kdb_default.c
index e1e54e3070..f173e127df 100644
--- a/src/lib/kdb/kdb_default.c
+++ b/src/lib/kdb/kdb_default.c
@@ -469,7 +469,7 @@ krb5_def_verify_master_key(krb5_context    context,
     }
 
     memset((char *)tempkey.contents, 0, tempkey.length);
-    krb5_xfree(tempkey.contents);
+    free(tempkey.contents);
     krb5_db_free_principal(context, &master_entry, nprinc);
     
     return retval;
diff --git a/src/lib/kdb/keytab.c b/src/lib/kdb/keytab.c
index 395b56d61e..632c9270dd 100644
--- a/src/lib/kdb/keytab.c
+++ b/src/lib/kdb/keytab.c
@@ -92,7 +92,7 @@ krb5_ktkdb_close(context, kt)
    */
 
   kt->ops = NULL;
-  krb5_xfree(kt);
+  free(kt);
 
   return 0;
 }