- (djm) OpenBSD CVS Sync

   - djm@cvs.openbsd.org 2003/11/23 23:17:34
     [ssh-keyscan.c]
     from portable - use sysconf to detect fd limit; ok markus@
     (tidy diff by adding SSH_SSFDMAX macro to defines.h)

1 files changed, 2 insertions, 4 deletions

diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 9506ec196..04d43da35 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -214,13 +214,11 @@ fdlim_get(int hard)
         if (getrlimit(RLIMIT_NOFILE, &rlfd) < 0)
                 return (-1);
         if ((hard ? rlfd.rlim_max : rlfd.rlim_cur) == RLIM_INFINITY)
-                return 10000;
+                return SSH_SYSFDMAX;
         else
                 return hard ? rlfd.rlim_max : rlfd.rlim_cur;
-#elif defined (HAVE_SYSCONF)
-        return sysconf (_SC_OPEN_MAX);
 #else
-        return 10000;
+        return SSH_SYSFDMAX;
 #endif
 }