Index: sshconnect2.c
===================================================================
RCS file: /openssh/openssh_cvs/sshconnect2.c,v
retrieving revision 1.145
diff -u -r1.145 sshconnect2.c
--- sshconnect2.c	13 Jun 2006 03:10:01 -0000	1.145
+++ sshconnect2.c	23 Jun 2006 14:33:22 -0000
@@ -1116,10 +1116,6 @@
 		 * encrypted keys we cannot do this and have to load the
 		 * private key instead
 		 */
-		if (id->key && id->key->type != KEY_RSA1) {
-			debug("Offering public key: %s", id->filename);
-			sent = send_pubkey_test(authctxt, id);
-		} else if (id->key == NULL) {
 			debug("Trying private key: %s", id->filename);
 			id->key = load_identity_file(id->filename);
 			if (id->key != NULL) {
@@ -1128,7 +1124,6 @@
 				key_free(id->key);
 				id->key = NULL;
 			}
-		}
 		if (sent)
 			return (sent);
 	}