===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh-keyscan.c,v
retrieving revision 1.41.2.1
retrieving revision 1.41.2.2
diff -u -r1.41.2.1 -r1.41.2.2
--- src/usr.bin/ssh/ssh-keyscan.c	2003/09/16 20:50:44	1.41.2.1
+++ src/usr.bin/ssh/ssh-keyscan.c	2004/03/04 18:18:16	1.41.2.2
@@ -7,7 +7,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-keyscan.c,v 1.41.2.1 2003/09/16 20:50:44 brad Exp $");
+RCSID("$OpenBSD: ssh-keyscan.c,v 1.41.2.2 2004/03/04 18:18:16 brad 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 10000;
+		return sysconf(_SC_OPEN_MAX);
 	else
 		return hard ? rlfd.rlim_max : rlfd.rlim_cur;
 }
@@ -660,7 +660,7 @@
 	if (nonfatal_fatal)
 		longjmp(kexjmp, -1);
 	else
-		fatal_cleanup();
+		exit(255);
 }
 
 static void