drop support for old external-keyx and gssapi methods

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

diff --git a/openssh/auth2.c b/openssh/auth2.c
index 1cd3e10364ee7df583ae46718936e226999d6112..f4ab7f4413ec8e2d23c286856e2e961215caac14 100644 (file)
--- a/openssh/auth2.c
+++ b/openssh/auth2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2.c,v 1.120 2008/11/04 08:22:12 djm Exp $ */
+/* $OpenBSD: auth2.c,v 1.121 2009/06/22 05:39:28 dtucker Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -35,8 +35,8 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "xmalloc.h"
 #include "atomicio.h"
+#include "xmalloc.h"
 #include "ssh2.h"
 #include "packet.h"
 #include "log.h"
@@ -70,10 +70,8 @@ extern Authmethod method_passwd;
 extern Authmethod method_kbdint;
 extern Authmethod method_hostbased;
 #ifdef GSSAPI
-extern Authmethod method_external;
 extern Authmethod method_gsskeyex;
 extern Authmethod method_gssapi;
-extern Authmethod method_gssapi_compat;
 #endif
 #ifdef JPAKE
 extern Authmethod method_jpake;
@@ -87,9 +85,7 @@ Authmethod *authmethods[] = {
        &method_pubkey,
 #ifdef GSSAPI
        &method_gsskeyex,
-       &method_external,
        &method_gssapi,
-       &method_gssapi_compat,
 #endif
 #ifdef JPAKE
        &method_jpake,
@@ -238,8 +234,7 @@ input_userauth_request(int type, u_int32_t seq, void *ctxt)
 #ifdef GSSAPI
        if (user[0] == '\0') {
            debug("received empty username for %s", method);
-           if (strcmp(method, "external-keyx") == 0 ||
-               strcmp(method, "gssapi-keyex") == 0) {
+           if (strcmp(method, "gssapi-keyex") == 0) {
                char *lname = NULL;
                PRIVSEP(ssh_gssapi_localname(&lname));
                if (lname && lname[0] != '\0') {