===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sshconnect2.c,v
retrieving revision 1.135.2.1
retrieving revision 1.136
diff -u -r1.135.2.1 -r1.136
--- src/usr.bin/ssh/sshconnect2.c	2004/08/19 04:13:27	1.135.2.1
+++ src/usr.bin/ssh/sshconnect2.c	2004/04/08 16:08:21	1.136
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect2.c,v 1.135.2.1 2004/08/19 04:13:27 brad Exp $");
+RCSID("$OpenBSD: sshconnect2.c,v 1.136 2004/04/08 16:08:21 henning Exp $");
 
 #include "ssh.h"
 #include "ssh2.h"
@@ -41,7 +41,7 @@
 #include "authfd.h"
 #include "log.h"
 #include "readconf.h"
-#include "misc.h"
+#include "readpass.h"
 #include "match.h"
 #include "dispatch.h"
 #include "canohost.h"
@@ -118,7 +118,6 @@
 	/* start key exchange */
 	kex = kex_setup(myproposal);
 	kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client;
-	kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client;
 	kex->kex[KEX_DH_GEX_SHA1] = kexgex_client;
 	kex->client_version_string=client_version_string;
 	kex->server_version_string=server_version_string;
@@ -457,7 +456,7 @@
 	 * moved to the end of the queue.  this also avoids confusion by
 	 * duplicate keys
 	 */
-	TAILQ_FOREACH_REVERSE(id, &authctxt->keys, next, idlist) {
+	TAILQ_FOREACH_REVERSE(id, &authctxt->keys, idlist, next) {
 		if (key_equal(key, id->key)) {
 			sent = sign_and_send_pubkey(authctxt, id);
 			break;