diff options
Diffstat (limited to 'auth2-gss.c')
-rw-r--r-- | auth2-gss.c | 9 |
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 @@ | |||
1 | /* $OpenBSD: auth2-gss.c,v 1.20 2013/05/17 00:13:13 djm Exp $ */ | 1 | /* $OpenBSD: auth2-gss.c,v 1.21 2014/02/26 20:28:44 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved. | 4 | * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved. |
@@ -96,7 +96,6 @@ userauth_gssapi(Authctxt *authctxt) | |||
96 | gss_OID_desc goid = {0, NULL}; | 96 | gss_OID_desc goid = {0, NULL}; |
97 | Gssctxt *ctxt = NULL; | 97 | Gssctxt *ctxt = NULL; |
98 | int mechs; | 98 | int mechs; |
99 | gss_OID_set supported; | ||
100 | int present; | 99 | int present; |
101 | OM_uint32 ms; | 100 | OM_uint32 ms; |
102 | u_int len; | 101 | u_int len; |
@@ -111,7 +110,6 @@ userauth_gssapi(Authctxt *authctxt) | |||
111 | return (0); | 110 | return (0); |
112 | } | 111 | } |
113 | 112 | ||
114 | ssh_gssapi_supported_oids(&supported); | ||
115 | do { | 113 | do { |
116 | mechs--; | 114 | mechs--; |
117 | 115 | ||
@@ -124,15 +122,12 @@ userauth_gssapi(Authctxt *authctxt) | |||
124 | doid[1] == len - 2) { | 122 | doid[1] == len - 2) { |
125 | goid.elements = doid + 2; | 123 | goid.elements = doid + 2; |
126 | goid.length = len - 2; | 124 | goid.length = len - 2; |
127 | gss_test_oid_set_member(&ms, &goid, supported, | 125 | ssh_gssapi_test_oid_supported(&ms, &goid, &present); |
128 | &present); | ||
129 | } else { | 126 | } else { |
130 | logit("Badly formed OID received"); | 127 | logit("Badly formed OID received"); |
131 | } | 128 | } |
132 | } while (mechs > 0 && !present); | 129 | } while (mechs > 0 && !present); |
133 | 130 | ||
134 | gss_release_oid_set(&ms, &supported); | ||
135 | |||
136 | if (!present) { | 131 | if (!present) { |
137 | free(doid); | 132 | free(doid); |
138 | authctxt->server_caused_failure = 1; | 133 | authctxt->server_caused_failure = 1; |