1 files changed, 6 insertions, 5 deletions

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: