From ac0ba1f390586dd0300f0a036ce30952b1dd5def Mon Sep 17 00:00:00 2001 From: Luke Howard Date: Sun, 15 May 2011 15:52:19 +0200 Subject: [PATCH] fix keyex merge regression --- gss-serv.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/gss-serv.c b/gss-serv.c index bb7743d..af2538a 100644 --- a/gss-serv.c +++ b/gss-serv.c @@ -335,19 +335,18 @@ ssh_gssapi_userok(char *user, struct passwd *pw) debug("No suitable client data"); return 0; } - if (!gss_userok(gssapi_client.name, user)) { + + userok = gss_userok(gssapi_client.name, user); + if (userok) { + gssapi_client.used = 1; + gssapi_client.store.owner = pw; + } else { /* Destroy delegated credentials if userok fails */ gss_release_buffer(&lmin, &gssapi_client.displayname); gss_release_buffer(&lmin, &gssapi_client.exportedname); gss_release_name(&lmin, &gssapi_client.name); gss_release_cred(&lmin, &gssapi_client.creds); memset(&gssapi_client, 0, sizeof(ssh_gssapi_client)); - return 0; - } - - if (userok) { - gssapi_client.used = 1; - gssapi_client.store.owner = pw; } return (userok); -- 2.1.4