diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | ssh-keyscan.c | 6 |
3 files changed, 7 insertions, 3 deletions
@@ -4,6 +4,9 @@ - (bal) Checks for getrlimit(), sysconf(), and setdtablesize(). Patch by Corinna Vinschen <vinschen@redhat.com> - (djm) Fix catman-do target for non-bash + - (bal) Fixed NeXT's lack of CPPFLAGS honoring. + - (bal) ssh-keyscan.c: NeXT (and older BSDs) don't support getrlimit() w/ + 'RLIMIT_NOFILE' 20001223 - (bal) Fixed Makefile.in to support recompile of all ssh and sshd objects diff --git a/configure.in b/configure.in index fa93d5e1..37a2a5a5 100644 --- a/configure.in +++ b/configure.in @@ -145,6 +145,7 @@ mips-sony-bsd|mips-sony-newsos4) AC_DEFINE(BROKEN_REALPATH) AC_DEFINE(USE_PIPES) CPPFLAGS="$CPPFLAGS -I/usr/local/include" + CFLAGS="$CFLAGS \${CPPFLAGS}" ;; *-*-solaris*) CPPFLAGS="$CPPFLAGS -I/usr/local/include" diff --git a/ssh-keyscan.c b/ssh-keyscan.c index 41bd733c..f630e8c7 100644 --- a/ssh-keyscan.c +++ b/ssh-keyscan.c @@ -183,7 +183,7 @@ getline(Linebuf * lb) static int fdlim_get(int hard) { -#if defined(HAVE_GETRLIMIT) +#if defined(HAVE_GETRLIMIT) && defined(RLIMIT_NOFILE) struct rlimit rlfd; if (getrlimit(RLIMIT_NOFILE, &rlfd) < 0) return (-1); @@ -201,12 +201,12 @@ fdlim_get(int hard) static int fdlim_set(int lim) { -#if defined(HAVE_SETRLIMIT) +#if defined(HAVE_SETRLIMIT) && defined(RLIMIT_NOFILE) struct rlimit rlfd; #endif if (lim <= 0) return (-1); -#if defined(HAVE_SETRLIMIT) +#if defined(HAVE_SETRLIMIT) && defined(RLIMIT_NOFILE) if (getrlimit(RLIMIT_NOFILE, &rlfd) < 0) return (-1); rlfd.rlim_cur = lim; |