summaryrefslogtreecommitdiff
path: root/auth2-gss.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2006-05-12 09:46:51 +0000
committerColin Watson <cjwatson@debian.org>2006-05-12 09:46:51 +0000
commit2a3e00306c9b3b4db71a777a7c3ccb70e470c675 (patch)
treef00af0128b0ac750d739384f111000c1c97007e4 /auth2-gss.c
parent2ee73b36b9a35daeaa4b065046882dc1f5f551b6 (diff)
* Update to current GSSAPI patch from
http://www.sxw.org.uk/computing/patches/openssh-4.3p2-gsskex-20060223.patch (closes: #352042).
Diffstat (limited to 'auth2-gss.c')
-rw-r--r--auth2-gss.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/auth2-gss.c b/auth2-gss.c
index a6a9c05cd..539654ee0 100644
--- a/auth2-gss.c
+++ b/auth2-gss.c
@@ -129,11 +129,13 @@ userauth_gssapi(Authctxt *authctxt)
129 129
130 if (!present) { 130 if (!present) {
131 xfree(doid); 131 xfree(doid);
132 authctxt->server_caused_failure = 1;
132 return (0); 133 return (0);
133 } 134 }
134 135
135 if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, &goid)))) { 136 if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, &goid)))) {
136 xfree(doid); 137 xfree(doid);
138 authctxt->server_caused_failure = 1;
137 return (0); 139 return (0);
138 } 140 }
139 141
@@ -318,7 +320,7 @@ input_gssapi_mic(int type, u_int32_t plen, void *ctxt)
318} 320}
319 321
320Authmethod method_gsskeyex = { 322Authmethod method_gsskeyex = {
321 "gssapi-keyx", 323 "gssapi-keyex",
322 userauth_gsskeyex, 324 userauth_gsskeyex,
323 &options.gss_authentication 325 &options.gss_authentication
324}; 326};