merged OPENSSH_4_2P1_SIMON-20050926-2 to trunk

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

diff --git a/openssh/kex.c b/openssh/kex.c
index 7d814217a9c89d9e9e927c2cc5e77d2a73797e49..8cd851d232af2873578b85334528f293fa8c711c 100644 (file)
--- a/openssh/kex.c
+++ b/openssh/kex.c
@@ -303,7 +303,11 @@ choose_kex(Kex *k, char *client, char *server)
        } else if (strcmp(k->name, KEX_DHGEX) == 0) {
                k->kex_type = KEX_DH_GEX_SHA1;
 #ifdef GSSAPI
-       } else if (strncmp(k->name, KEX_GSS_SHA1, sizeof(KEX_GSS_SHA1)-1) == 0) {
+       } else if (strncmp(k->name, KEX_GSS_GEX_SHA1_ID,
+           sizeof(KEX_GSS_GEX_SHA1_ID)-1) == 0) {
+               k->kex_type = KEX_GSS_GEX_SHA1;
+       } else if (strncmp(k->name, KEX_GSS_GRP1_SHA1_ID, 
+           sizeof(KEX_GSS_GRP1_SHA1_ID)-1) == 0) {
                k->kex_type = KEX_GSS_GRP1_SHA1;
 #endif
        } else