1 files changed, 9 insertions, 13 deletions

diff --git a/auth2-gss.c b/auth2-gss.c
index 17d4a3a84..b8db8204f 100644
--- a/auth2-gss.c
+++ b/auth2-gss.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-gss.c,v 1.18 2012/12/02 20:34:09 djm Exp $ */
+/* $OpenBSD: auth2-gss.c,v 1.20 2013/05/17 00:13:13 djm Exp $ */
 
 /*
  * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved.
@@ -81,7 +81,7 @@ userauth_gsskeyex(Authctxt *authctxt)
                     authctxt->pw));
         
         buffer_free(&b);
-        xfree(mic.value);
+        free(mic.value);
 
         return (authenticated);
 }
@@ -115,8 +115,7 @@ userauth_gssapi(Authctxt *authctxt)
         do {
                 mechs--;
 
-                if (doid)
-                        xfree(doid);
+                free(doid);
 
                 present = 0;
                 doid = packet_get_string(&len);
@@ -135,7 +134,7 @@ userauth_gssapi(Authctxt *authctxt)
         gss_release_oid_set(&ms, &supported);
 
         if (!present) {
-                xfree(doid);
+                free(doid);
                 authctxt->server_caused_failure = 1;
                 return (0);
         }
@@ -143,7 +142,7 @@ userauth_gssapi(Authctxt *authctxt)
         if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, &goid)))) {
                 if (ctxt != NULL)
                         ssh_gssapi_delete_ctx(&ctxt);
-                xfree(doid);
+                free(doid);
                 authctxt->server_caused_failure = 1;
                 return (0);
         }
@@ -156,7 +155,7 @@ userauth_gssapi(Authctxt *authctxt)
         packet_put_string(doid, len);
 
         packet_send();
-        xfree(doid);
+        free(doid);
 
         dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_TOKEN, &input_gssapi_token);
         dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_ERRTOK, &input_gssapi_errtok);
@@ -187,7 +186,7 @@ input_gssapi_token(int type, u_int32_t plen, void *ctxt)
         maj_status = PRIVSEP(ssh_gssapi_accept_ctx(gssctxt, &recv_tok,
             &send_tok, &flags));
 
-        xfree(recv_tok.value);
+        free(recv_tok.value);
 
         if (GSS_ERROR(maj_status)) {
                 if (send_tok.length != 0) {
@@ -242,7 +241,7 @@ input_gssapi_errtok(int type, u_int32_t plen, void *ctxt)
         maj_status = PRIVSEP(ssh_gssapi_accept_ctx(gssctxt, &recv_tok,
             &send_tok, NULL));
 
-        xfree(recv_tok.value);
+        free(recv_tok.value);
 
         /* We can't return anything to the client, even if we wanted to */
         dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_TOKEN, NULL);
@@ -263,14 +262,11 @@ static void
 input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt)
 {
         Authctxt *authctxt = ctxt;
-        Gssctxt *gssctxt;
         int authenticated;
 
         if (authctxt == NULL || (authctxt->methoddata == NULL && !use_privsep))
                 fatal("No authentication or GSSAPI context");
 
-        gssctxt = authctxt->methoddata;
-
         /*
          * We don't need to check the status, because we're only enabled in
          * the dispatcher once the exchange is complete
@@ -320,7 +316,7 @@ input_gssapi_mic(int type, u_int32_t plen, void *ctxt)
                 logit("GSSAPI MIC check failed");
 
         buffer_free(&b);
-        xfree(mic.value);
+        free(mic.value);
 
         authctxt->postponed = 0;
         dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_TOKEN, NULL);