drop support for old external-keyx and gssapi methods

[gssapi-openssh.git] / openssh / auth2-gss.c

diff --git a/openssh/auth2-gss.c b/openssh/auth2-gss.c
index 1db62c438bad6e035735e5522ccb8ae31ce9ed82..08fcf72cca7e95f4adee1b1d20048ff8928c41ec 100644 (file)
--- a/openssh/auth2-gss.c
+++ b/openssh/auth2-gss.c
@@ -53,20 +53,6 @@ static void input_gssapi_mic(int type, u_int32_t plen, void *ctxt);
 static void input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt);
 static void input_gssapi_errtok(int, u_int32_t, void *);
 
-static int gssapi_with_mic = 1;        /* flag to toggle "gssapi-with-mic" vs.
-                                  "gssapi" */
-
-static int
-userauth_external(Authctxt *authctxt)
-{
-        packet_check_eom();
-
-       if (authctxt->valid && authctxt->user && authctxt->user[0]) {
-               return(PRIVSEP(ssh_gssapi_userok(authctxt->user, authctxt->pw)));
-       }
-       return 0;
-}
-
 /* 
  * The 'gssapi_keyex' userauth mechanism.
  */
@@ -229,9 +215,7 @@ input_gssapi_token(int type, u_int32_t plen, void *ctxt)
                }
                authctxt->postponed = 0;
                dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_TOKEN, NULL);
-               userauth_finish(authctxt, 0,
-                               gssapi_with_mic ? "gssapi-with-mic" :
-                                                 "gssapi");
+               userauth_finish(authctxt, 0, "gssapi-with-mic");
        } else {
                if (send_tok.length != 0) {
                        packet_start(SSH2_MSG_USERAUTH_GSSAPI_TOKEN);
@@ -240,7 +224,7 @@ input_gssapi_token(int type, u_int32_t plen, void *ctxt)
                }
                if (maj_status == GSS_S_COMPLETE) {
                        dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_TOKEN, NULL);
-                       if (flags & GSS_C_INTEG_FLAG && gssapi_with_mic)
+                       if (flags & GSS_C_INTEG_FLAG)
                                dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_MIC,
                                    &input_gssapi_mic);
                        else
@@ -353,22 +337,7 @@ input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt)
        dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_ERRTOK, NULL);
        dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_MIC, NULL);
        dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_EXCHANGE_COMPLETE, NULL);
-       userauth_finish(authctxt, authenticated,
-                       gssapi_with_mic ? "gssapi-with-mic" : "gssapi");
-}
-
-static int
-userauth_gssapi_with_mic(Authctxt *authctxt)
-{
-    gssapi_with_mic = 1;
-    return userauth_gssapi(authctxt);
-}
-
-static int
-userauth_gssapi_without_mic(Authctxt *authctxt)
-{
-    gssapi_with_mic = 0;
-    return userauth_gssapi(authctxt);
+       userauth_finish(authctxt, authenticated, "gssapi-with-mic");
 }
 
 static void
@@ -435,12 +404,6 @@ static void ssh_gssapi_userauth_error(Gssctxt *ctxt) {
        }
 }
 
-Authmethod method_external = {
-       "external-keyx",
-       userauth_external,
-       &options.gss_authentication
-};
-       
 Authmethod method_gsskeyex = {
        "gssapi-keyex",
        userauth_gsskeyex,
@@ -449,13 +412,7 @@ Authmethod method_gsskeyex = {
 
 Authmethod method_gssapi = {
        "gssapi-with-mic",
-       userauth_gssapi_with_mic,
-       &options.gss_authentication
-};
-
-Authmethod method_gssapi_compat = {
-       "gssapi",
-       userauth_gssapi_without_mic,
+       userauth_gssapi,
        &options.gss_authentication
 };