add check for GssapiAuthentication option on client side

diff --git a/openssh/sshconnect2.c b/openssh/sshconnect2.c
index cc6563f68a8e0f34bf1efb1a36918d773f251116..17c44e6235788e6f1beab7631a6a525ad2b91754 100644 (file)
--- a/openssh/sshconnect2.c
+++ b/openssh/sshconnect2.c
@@ -510,6 +510,11 @@ userauth_gssapi(Authctxt *authctxt)
        OM_uint32 min;
        int ok=0;
 
+       if (!options.gss_authentication) {
+               verbose("GSSAPI authentication disabled.");
+               return 0;
+       }
+
        /* Things work better if we send one mechanism at a time, rather
         * than them all at once. This means that if we fail at some point
         * in the middle of a negotiation, we can come back and try something