From 74e339b8f8936bc0d985e053a076d0c9b5e9ea51 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Sat, 14 Sep 2013 15:56:58 +0100
Subject: Replace GSSAPI-specific instances of xfree with the equivalent calls
 to free.

---
 auth2-gss.c   |  2 +-
 gss-genr.c    |  6 +++---
 kexgssc.c     |  9 ++++-----
 kexgsss.c     | 11 ++++++-----
 monitor.c     |  8 ++++----
 sshconnect2.c |  2 +-
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/auth2-gss.c b/auth2-gss.c
index 3c3cbb966..b8db8204f 100644
--- a/auth2-gss.c
+++ b/auth2-gss.c
@@ -81,7 +81,7 @@ userauth_gsskeyex(Authctxt *authctxt)
 		    authctxt->pw));
 	
 	buffer_free(&b);
-	xfree(mic.value);
+	free(mic.value);
 
 	return (authenticated);
 }
diff --git a/gss-genr.c b/gss-genr.c
index 630c263da..3069347c2 100644
--- a/gss-genr.c
+++ b/gss-genr.c
@@ -101,8 +101,8 @@ ssh_gssapi_kex_mechs(gss_OID_set gss_supported, ssh_gssapi_check_fn *check,
 
 	if (gss_enc2oid != NULL) {
 		for (i = 0; gss_enc2oid[i].encoded != NULL; i++)
-			xfree(gss_enc2oid[i].encoded);
-		xfree(gss_enc2oid);
+			free(gss_enc2oid[i].encoded);
+		free(gss_enc2oid);
 	}
 
 	gss_enc2oid = xmalloc(sizeof(ssh_gss_kex_mapping) *
@@ -159,7 +159,7 @@ ssh_gssapi_kex_mechs(gss_OID_set gss_supported, ssh_gssapi_check_fn *check,
 	buffer_free(&buf);
 
 	if (strlen(mechs) == 0) {
-		xfree(mechs);
+		free(mechs);
 		mechs = NULL;
 	}
 	
diff --git a/kexgssc.c b/kexgssc.c
index 39be40531..616893c7e 100644
--- a/kexgssc.c
+++ b/kexgssc.c
@@ -144,7 +144,7 @@ kexgss_client(Kex *kex) {
 
 		/* If we've got an old receive buffer get rid of it */
 		if (token_ptr != GSS_C_NO_BUFFER)
-			xfree(recv_tok.value);
+			free(recv_tok.value);
 
 		if (maj_status == GSS_S_COMPLETE) {
 			/* If mutual state flag is not true, kex fails */
@@ -261,7 +261,7 @@ kexgss_client(Kex *kex) {
 		fatal("kexdh_client: BN_bin2bn failed");
 
 	memset(kbuf, 0, klen);
-	xfree(kbuf);
+	free(kbuf);
 
 	switch (kex->kex_type) {
 	case KEX_GSS_GRP1_SHA1:
@@ -304,11 +304,10 @@ kexgss_client(Kex *kex) {
 	if (GSS_ERROR(ssh_gssapi_checkmic(ctxt, &gssbuf, &msg_tok)))
 		packet_disconnect("Hash's MIC didn't verify");
 
-	xfree(msg_tok.value);
+	free(msg_tok.value);
 
 	DH_free(dh);
-	if (serverhostkey)
-		xfree(serverhostkey);
+	free(serverhostkey);
 	BN_clear_free(dh_server_pub);
 
 	/* save session id */
diff --git a/kexgsss.c b/kexgsss.c
index 0c3eeaa63..18b065b10 100644
--- a/kexgsss.c
+++ b/kexgsss.c
@@ -78,9 +78,10 @@ kexgss_server(Kex *kex)
 	 * in the GSSAPI code are no longer available. This kludges them back
 	 * into life
 	 */
-	if (!ssh_gssapi_oid_table_ok()) 
-		if ((mechs = ssh_gssapi_server_mechanisms()))
-			xfree(mechs);
+	if (!ssh_gssapi_oid_table_ok()) {
+		mechs = ssh_gssapi_server_mechanisms();
+		free(mechs);
+	}
 
 	debug2("%s: Identifying %s", __func__, kex->name);
 	oid = ssh_gssapi_id_kex(NULL, kex->name, kex->kex_type);
@@ -158,7 +159,7 @@ kexgss_server(Kex *kex)
 		maj_status = PRIVSEP(ssh_gssapi_accept_ctx(ctxt, &recv_tok, 
 		    &send_tok, &ret_flags));
 
-		xfree(recv_tok.value);
+		free(recv_tok.value);
 
 		if (maj_status != GSS_S_COMPLETE && send_tok.length == 0)
 			fatal("Zero length token output when incomplete");
@@ -207,7 +208,7 @@ kexgss_server(Kex *kex)
 		fatal("kexgss_server: BN_bin2bn failed");
 
 	memset(kbuf, 0, klen);
-	xfree(kbuf);
+	free(kbuf);
 
 	switch (kex->kex_type) {
 	case KEX_GSS_GRP1_SHA1:
diff --git a/monitor.c b/monitor.c
index bd9303bdb..9079c9762 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2220,7 +2220,7 @@ mm_answer_gss_sign(int socket, Buffer *m)
 	}
 	major = ssh_gssapi_sign(gsscontext, &data, &hash);
 
-	xfree(data.value);
+	free(data.value);
 
 	buffer_clear(m);
 	buffer_put_int(m, major);
@@ -2250,9 +2250,9 @@ mm_answer_gss_updatecreds(int socket, Buffer *m) {
 
 	ok = ssh_gssapi_update_creds(&store);
 
-	xfree(store.filename);
-	xfree(store.envvar);
-	xfree(store.envval);
+	free(store.filename);
+	free(store.envvar);
+	free(store.envval);
 
 	buffer_clear(m);
 	buffer_put_int(m, ok);
diff --git a/sshconnect2.c b/sshconnect2.c
index 8c20eed93..0b13530ce 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -229,7 +229,7 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port)
 		orig = myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS];
 		xasprintf(&myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS], 
 		    "%s,null", orig);
-		xfree(gss);
+		free(gss);
 	}
 #endif
 
-- 
cgit v1.2.3