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

6 files changed, 39 insertions, 39 deletions

diff --git a/src/lib/gssapi/acc_sec.c b/src/lib/gssapi/acc_sec.c
index 135d17e2d..d0cc43c19 100644
--- a/src/lib/gssapi/acc_sec.c
+++ b/src/lib/gssapi/acc_sec.c
@@ -149,7 +149,7 @@ OM_uint32 gss_accept_sec_context(minor_status, context_handle,
 		context->my_address.length = channel->initiator_address.length;
 		if (!(context->my_address.contents = (krb5_octet *)
 		      malloc(context->my_address.length))) {
-			xfree(context);
+			krb5_xfree(context);
 			return(GSS_S_FAILURE);
 		}
 		memcpy((char *) context->my_address.contents,
@@ -159,8 +159,8 @@ OM_uint32 gss_accept_sec_context(minor_status, context_handle,
 		context->his_address.length = channel->acceptor_address.length;
 		if (!(context->his_address.contents = (krb5_octet *)
 		      malloc(context->my_address.length))) {
-			xfree(context->my_address.contents);
-			xfree(context);
+			krb5_xfree(context->my_address.contents);
+			krb5_xfree(context);
 			return(GSS_S_FAILURE);
 		}
 		memcpy((char *) context->his_address.contents,
@@ -179,9 +179,9 @@ OM_uint32 gss_accept_sec_context(minor_status, context_handle,
 			if (*minor_status =
 			    krb5_generate_seq_number(authdat->ticket->enc_part2->session,
 						     &context->my_seq_num)) {
-				xfree(context->his_address.contents);
-				xfree(context->my_address.contents);
-				xfree(context);
+				krb5_xfree(context->his_address.contents);
+				krb5_xfree(context->my_address.contents);
+				krb5_xfree(context);
 				krb5_free_tkt_authent(authdat);
 				return(GSS_S_FAILURE);
 			}
@@ -195,9 +195,9 @@ OM_uint32 gss_accept_sec_context(minor_status, context_handle,
 			    krb5_mk_rep(&repl,
 					authdat->ticket->enc_part2->session,
 					&outbuf)) {
-				xfree(context->his_address.contents);
-				xfree(context->my_address.contents);
-				xfree(context);
+				krb5_xfree(context->his_address.contents);
+				krb5_xfree(context->my_address.contents);
+				krb5_xfree(context);
 				krb5_free_tkt_authent(authdat);
 				return(GSS_S_FAILURE);
 			}
@@ -207,10 +207,10 @@ OM_uint32 gss_accept_sec_context(minor_status, context_handle,
 							   outbuf.length,
 							   outbuf.data,
 							   output_token)) {
-				xfree(context->his_address.contents);
-				xfree(context->my_address.contents);
-				xfree(context);
-				xfree(outbuf.data);
+				krb5_xfree(context->his_address.contents);
+				krb5_xfree(context->my_address.contents);
+				krb5_xfree(context);
+				krb5_xfree(outbuf.data);
 				krb5_free_tkt_authent(authdat);
 				return(GSS_S_FAILURE);
 			}
@@ -222,18 +222,18 @@ OM_uint32 gss_accept_sec_context(minor_status, context_handle,
 		if (*minor_status =
 		    krb5_copy_principal(verifier_cred_handle.principal,
 					&context->me)) {
-			xfree(context->his_address.contents);
-			xfree(context->my_address.contents);
-			xfree(context);
+			krb5_xfree(context->his_address.contents);
+			krb5_xfree(context->my_address.contents);
+			krb5_xfree(context);
 			return(GSS_S_FAILURE);
 		}
 		if (*minor_status =
 		    krb5_copy_principal(authdat->authenticator->client,
 					&context->him)) {
 			krb5_free_principal(context->me);
-			xfree(context->his_address.contents);
-			xfree(context->my_address.contents);
-			xfree(context);
+			krb5_xfree(context->his_address.contents);
+			krb5_xfree(context->my_address.contents);
+			krb5_xfree(context);
 			return(GSS_S_FAILURE);
 		}
 		if (*minor_status =
@@ -241,9 +241,9 @@ OM_uint32 gss_accept_sec_context(minor_status, context_handle,
 				       &context->session_key)) {
 			krb5_free_principal(context->me);
 			krb5_free_principal(context->him);
-			xfree(context->his_address.contents);
-			xfree(context->my_address.contents);
-			xfree(context);
+			krb5_xfree(context->his_address.contents);
+			krb5_xfree(context->my_address.contents);
+			krb5_xfree(context);
 			return(GSS_S_FAILURE);
 		}
 		context->his_seq_num = authdat->authenticator->seq_number;
@@ -260,12 +260,12 @@ OM_uint32 gss_accept_sec_context(minor_status, context_handle,
 		if (src_name) {
 			if (*minor_status = krb5_copy_principal(context->him,
 								src_name)) {
-				xfree(context->session_key->contents);
+				krb5_xfree(context->session_key->contents);
 				krb5_free_principal(context->me);
 				krb5_free_principal(context->him);
-				xfree(context->his_address.contents);
-				xfree(context->my_address.contents);
-				xfree(context);
+				krb5_xfree(context->his_address.contents);
+				krb5_xfree(context->my_address.contents);
+				krb5_xfree(context);
 				return(GSS_S_FAILURE);
 			}
 		}
diff --git a/src/lib/gssapi/init_sec.c b/src/lib/gssapi/init_sec.c
index 8078ae1d3..87f48d832 100644
--- a/src/lib/gssapi/init_sec.c
+++ b/src/lib/gssapi/init_sec.c
@@ -149,7 +149,7 @@ OM_uint32 gss_init_sec_context(minor_status, claimant_cred_handle,
 		context->my_address.length = channel->initiator_address.length;
 		if (!(context->my_address.contents = (krb5_octet *)
 		      malloc(context->my_address.length))) {
-			xfree(context);
+			krb5_xfree(context);
 			return(GSS_S_FAILURE);
 		}
 		memcpy((char *) context->my_address.contents,
@@ -159,8 +159,8 @@ OM_uint32 gss_init_sec_context(minor_status, claimant_cred_handle,
 		context->his_address.length = channel->acceptor_address.length;
 		if (!(context->his_address.contents = (krb5_octet *)
 		      malloc(context->my_address.length))) {
-			xfree(context->my_address.contents);
-			xfree(context);
+			krb5_xfree(context->my_address.contents);
+			krb5_xfree(context);
 			return(GSS_S_FAILURE);
 		}
 		memcpy((char *) context->his_address.contents,
@@ -172,8 +172,8 @@ OM_uint32 gss_init_sec_context(minor_status, claimant_cred_handle,
 		if (*minor_status =
 		    krb5_generate_seq_number(&creds.keyblock,
 					     &context->my_seq_num)) {
-			xfree(context->his_address.contents);
-			xfree(context->my_address.contents);
+			krb5_xfree(context->his_address.contents);
+			krb5_xfree(context->my_address.contents);
 			free((char *)context);
 			return(GSS_S_FAILURE);
 		}
@@ -222,7 +222,7 @@ OM_uint32 gss_init_sec_context(minor_status, claimant_cred_handle,
 		if (*minor_status =
 		    krb5_copy_keyblock(&creds.keyblock,
 				       &context->session_key)) {
-			xfree(outbuf.data);
+			krb5_xfree(outbuf.data);
 			krb5_free_cred_contents(&creds);
 			free((char *)context);
 			return(GSS_S_FAILURE);
@@ -234,7 +234,7 @@ OM_uint32 gss_init_sec_context(minor_status, claimant_cred_handle,
 						   outbuf.length,
 						   outbuf.data,
 						   output_token)) {
-			xfree(outbuf.data);
+			krb5_xfree(outbuf.data);
 			krb5_free_cred_contents(&creds);
 			free((char *) context);
 			return(GSS_S_FAILURE);
@@ -243,7 +243,7 @@ OM_uint32 gss_init_sec_context(minor_status, claimant_cred_handle,
 		 * Send over the requested flags information
 		 */
 		((char *) output_token->value)[4] = context->flags;
-		xfree(outbuf.data);
+		krb5_xfree(outbuf.data);
 		*context_handle = context;
  		context->state = GSS_KRB_STATE_DOWN;
 		*ret_flags = context->flags;
diff --git a/src/lib/gssapi/rel_cred.c b/src/lib/gssapi/rel_cred.c
index 54a3761ee..af9a758e4 100644
--- a/src/lib/gssapi/rel_cred.c
+++ b/src/lib/gssapi/rel_cred.c
@@ -36,7 +36,7 @@ OM_uint32 gss_release_cred(minor_status, cred_handle)
 	krb5_free_principal(cred_handle->principal);
 	if (*minor_status = krb5_cc_close(cred_handle->ccache))
 		return(GSS_S_FAILURE);
-	xfree(cred_handle->srvtab.contents);
+	krb5_xfree(cred_handle->srvtab.contents);
 	return(GSS_S_COMPLETE);
 }
 	
diff --git a/src/lib/gssapi/seal.c b/src/lib/gssapi/seal.c
index 24fd65c4f..4d9065671 100644
--- a/src/lib/gssapi/seal.c
+++ b/src/lib/gssapi/seal.c
@@ -78,7 +78,7 @@ OM_uint32 gss_seal(minor_status, context, conf_req_flag, qop_req,
 						   outbuf.length,
 						   outbuf.data,
 						   output_message_buffer)) {
-			xfree(outbuf.data);
+			krb5_xfree(outbuf.data);
 			return(GSS_S_FAILURE);
 		}
 		if (conf_state)
@@ -107,7 +107,7 @@ OM_uint32 gss_seal(minor_status, context, conf_req_flag, qop_req,
 						   outbuf.length,
 						   outbuf.data,
 						   output_message_buffer)) {
-			xfree(outbuf.data);
+			krb5_xfree(outbuf.data);
 			return(GSS_S_FAILURE);
 		}
 		if (conf_state)
diff --git a/src/lib/gssapi/sign.c b/src/lib/gssapi/sign.c
index 39bd19388..62c264276 100644
--- a/src/lib/gssapi/sign.c
+++ b/src/lib/gssapi/sign.c
@@ -63,7 +63,7 @@ OM_uint32 gss_sign(minor_status, context, qop_req,
 	if (*minor_status = decode_krb5_safe(&outbuf, &message))
 		return(GSS_S_FAILURE);
 	message->user_data.length = 1;
-	xfree(outbuf.data);
+	krb5_xfree(outbuf.data);
 	if (*minor_status = encode_krb5_safe(&message, &scratch)) {
 		krb5_free_safe(message);
 		return(GSS_S_FAILURE);
diff --git a/src/lib/gssapi/verify.c b/src/lib/gssapi/verify.c
index b93b2b0be..25cc14f5b 100644
--- a/src/lib/gssapi/verify.c
+++ b/src/lib/gssapi/verify.c
@@ -53,7 +53,7 @@ OM_uint32 gss_verify(minor_status, context, message_buffer,
 	if (*minor_status = decode_krb5_safe(&inbuf, &message))
 		return(GSS_S_FAILURE);
 	if (message->user_data.data)
-		xfree(message->user_data.data);
+		krb5_xfree(message->user_data.data);
 	message->user_data.length = message_buffer->length;
 	message->user_data.data = message_buffer->value;
 	if (*minor_status = encode_krb5_safe(&message,  &scratch)) {