merge of OPENSSH_3_6_1P1_SIMON_20030411

[gssapi-openssh.git] / openssh / ssh-keyscan.c

diff --git a/openssh/ssh-keyscan.c b/openssh/ssh-keyscan.c
index 415304b36e918bfa299a1bd2970f42c229bfbea2..5b4eb82d1fc058011731af658be12ec504d832e1 100644 (file)
--- a/openssh/ssh-keyscan.c
+++ b/openssh/ssh-keyscan.c
@@ -356,9 +356,6 @@ keygrab_ssh2(con *c)
        c->c_kex = kex_setup(myproposal);
        c->c_kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client;
        c->c_kex->kex[KEX_DH_GEX_SHA1] = kexgex_client;
-#ifdef GSSAPI
-       c->c_kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_client;
-#endif
        c->c_kex->verify_host_key = hostjump;
 
        if (!(j = setjmp(kexjmp))) {