Merge 6.6p1.

* New upstream release (http://www.openssh.com/txt/release-6.6).

1 files changed, 2 insertions, 7 deletions

diff --git a/auth2-gss.c b/auth2-gss.c
index b8db8204f..3ff2d726b 100644
--- a/auth2-gss.c
+++ b/auth2-gss.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-gss.c,v 1.20 2013/05/17 00:13:13 djm Exp $ */
+/* $OpenBSD: auth2-gss.c,v 1.21 2014/02/26 20:28:44 djm Exp $ */
 
 /*
  * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved.
@@ -96,7 +96,6 @@ userauth_gssapi(Authctxt *authctxt)
         gss_OID_desc goid = {0, NULL};
         Gssctxt *ctxt = NULL;
         int mechs;
-        gss_OID_set supported;
         int present;
         OM_uint32 ms;
         u_int len;
@@ -111,7 +110,6 @@ userauth_gssapi(Authctxt *authctxt)
                 return (0);
         }
 
-        ssh_gssapi_supported_oids(&supported);
         do {
                 mechs--;
 
@@ -124,15 +122,12 @@ userauth_gssapi(Authctxt *authctxt)
                     doid[1] == len - 2) {
                         goid.elements = doid + 2;
                         goid.length   = len - 2;
-                        gss_test_oid_set_member(&ms, &goid, supported,
-                            &present);
+                        ssh_gssapi_test_oid_supported(&ms, &goid, &present);
                 } else {
                         logit("Badly formed OID received");
                 }
         } while (mechs > 0 && !present);
 
-        gss_release_oid_set(&ms, &supported);
-
         if (!present) {
                 free(doid);
                 authctxt->server_caused_failure = 1;