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 @@ | |||
4 | - (bal) Checks for getrlimit(), sysconf(), and setdtablesize(). Patch | 4 | - (bal) Checks for getrlimit(), sysconf(), and setdtablesize(). Patch |
5 | by Corinna Vinschen <vinschen@redhat.com> | 5 | by Corinna Vinschen <vinschen@redhat.com> |
6 | - (djm) Fix catman-do target for non-bash | 6 | - (djm) Fix catman-do target for non-bash |
7 | - (bal) Fixed NeXT's lack of CPPFLAGS honoring. | ||
8 | - (bal) ssh-keyscan.c: NeXT (and older BSDs) don't support getrlimit() w/ | ||
9 | 'RLIMIT_NOFILE' | ||
7 | 10 | ||
8 | 20001223 | 11 | 20001223 |
9 | - (bal) Fixed Makefile.in to support recompile of all ssh and sshd objects | 12 | - (bal) Fixed Makefile.in to support recompile of all ssh and sshd objects |
diff --git a/configure.in b/configure.in index fa93d5e1d..37a2a5a53 100644 --- a/configure.in +++ b/configure.in | |||
@@ -145,6 +145,7 @@ mips-sony-bsd|mips-sony-newsos4) | |||
145 | AC_DEFINE(BROKEN_REALPATH) | 145 | AC_DEFINE(BROKEN_REALPATH) |
146 | AC_DEFINE(USE_PIPES) | 146 | AC_DEFINE(USE_PIPES) |
147 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" | 147 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" |
148 | CFLAGS="$CFLAGS \${CPPFLAGS}" | ||
148 | ;; | 149 | ;; |
149 | *-*-solaris*) | 150 | *-*-solaris*) |
150 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" | 151 | CPPFLAGS="$CPPFLAGS -I/usr/local/include" |
diff --git a/ssh-keyscan.c b/ssh-keyscan.c index 41bd733ce..f630e8c75 100644 --- a/ssh-keyscan.c +++ b/ssh-keyscan.c | |||
@@ -183,7 +183,7 @@ getline(Linebuf * lb) | |||
183 | static int | 183 | static int |
184 | fdlim_get(int hard) | 184 | fdlim_get(int hard) |
185 | { | 185 | { |
186 | #if defined(HAVE_GETRLIMIT) | 186 | #if defined(HAVE_GETRLIMIT) && defined(RLIMIT_NOFILE) |
187 | struct rlimit rlfd; | 187 | struct rlimit rlfd; |
188 | if (getrlimit(RLIMIT_NOFILE, &rlfd) < 0) | 188 | if (getrlimit(RLIMIT_NOFILE, &rlfd) < 0) |
189 | return (-1); | 189 | return (-1); |
@@ -201,12 +201,12 @@ fdlim_get(int hard) | |||
201 | static int | 201 | static int |
202 | fdlim_set(int lim) | 202 | fdlim_set(int lim) |
203 | { | 203 | { |
204 | #if defined(HAVE_SETRLIMIT) | 204 | #if defined(HAVE_SETRLIMIT) && defined(RLIMIT_NOFILE) |
205 | struct rlimit rlfd; | 205 | struct rlimit rlfd; |
206 | #endif | 206 | #endif |
207 | if (lim <= 0) | 207 | if (lim <= 0) |
208 | return (-1); | 208 | return (-1); |
209 | #if defined(HAVE_SETRLIMIT) | 209 | #if defined(HAVE_SETRLIMIT) && defined(RLIMIT_NOFILE) |
210 | if (getrlimit(RLIMIT_NOFILE, &rlfd) < 0) | 210 | if (getrlimit(RLIMIT_NOFILE, &rlfd) < 0) |
211 | return (-1); | 211 | return (-1); |
212 | rlfd.rlim_cur = lim; | 212 | rlfd.rlim_cur = lim; |