handle failure in userauth_gssapi()

diff --git a/openssh/auth1.c b/openssh/auth1.c
index 8af1991728e46c9f1000ea8feb9ff01c1f431c26..ccd43941e6fb2d477eb4848ef02251f2e1c4224a 100644 (file)
--- a/openssh/auth1.c
+++ b/openssh/auth1.c
@@ -46,7 +46,7 @@ auth1_gss_protocol_error(int type, u_int32_t plen, void *ctxt)
 {
   Authctxt *authctxt = ctxt;
   /* Other side told us to abort, dont need to tell him */ 
-  /* maybe we can us some other method. */
+  /* maybe we can use some other method. */
   if (type == SSH_MSG_AUTH_GSSAPI_ABORT) {
       log("auth1: GSSAPI aborting");
       dispatch_set(SSH_MSG_AUTH_GSSAPI_TOKEN, NULL);
@@ -324,6 +324,11 @@ do_authloop(Authctxt *authctxt)
                        }
                        dispatch_init(&auth1_gss_protocol_error);
                        method_gssapi.userauth(authctxt);
+                       if (!authctxt->postponed) { /* failed before starting dispatch */
+                               authctxt->success = 0;
+                               authctxt->postponed = 0;
+                               break;
+                       }
                        dispatch_run(DISPATCH_BLOCK, &authctxt->success, authctxt);
                        if (authctxt->postponed) { /* failed, try other methods */
                                authctxt->success = 0;