===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh-keyscan.c,v
retrieving revision 1.41.2.2
retrieving revision 1.42
diff -u -r1.41.2.2 -r1.42
--- src/usr.bin/ssh/ssh-keyscan.c	2004/03/04 18:18:16	1.41.2.2
+++ src/usr.bin/ssh/ssh-keyscan.c	2003/04/14 14:17:50	1.42
@@ -7,7 +7,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-keyscan.c,v 1.41.2.2 2004/03/04 18:18:16 brad Exp $");
+RCSID("$OpenBSD: ssh-keyscan.c,v 1.42 2003/04/14 14:17:50 markus Exp $");
 
 #include <sys/queue.h>
 #include <errno.h>
@@ -210,7 +210,7 @@
 	if (getrlimit(RLIMIT_NOFILE, &rlfd) < 0)
 		return (-1);
 	if ((hard ? rlfd.rlim_max : rlfd.rlim_cur) == RLIM_INFINITY)
-		return sysconf(_SC_OPEN_MAX);
+		return 10000;
 	else
 		return hard ? rlfd.rlim_max : rlfd.rlim_cur;
 }
@@ -526,7 +526,7 @@
 	n = snprintf(buf, sizeof buf, "SSH-%d.%d-OpenSSH-keyscan\r\n",
 	    c->c_keytype == KT_RSA1? PROTOCOL_MAJOR_1 : PROTOCOL_MAJOR_2,
 	    c->c_keytype == KT_RSA1? PROTOCOL_MINOR_1 : PROTOCOL_MINOR_2);
-	if (atomicio(vwrite, s, buf, n) != n) {
+	if (atomicio(write, s, buf, n) != n) {
 		error("write (%s): %s", c->c_name, strerror(errno));
 		confree(s);
 		return;
@@ -660,13 +660,13 @@
 	if (nonfatal_fatal)
 		longjmp(kexjmp, -1);
 	else
-		exit(255);
+		fatal_cleanup();
 }
 
 static void
 usage(void)
 {
-	fprintf(stderr, "usage: %s [-v46] [-p port] [-T timeout] [-t type] [-f file]\n"
+	fprintf(stderr, "usage: %s [-v46] [-p port] [-T timeout] [-f file]\n"
 	    "\t\t   [host | addrlist namelist] [...]\n",
 	    __progname);
 	exit(1);