summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--ssh-keyscan.c1
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6ab66d1cb..69762fb0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,7 @@
25 - stevesk@cvs.openbsd.org 2002/07/06 17:47:58 25 - stevesk@cvs.openbsd.org 2002/07/06 17:47:58
26 [ssh-keyscan.c] 26 [ssh-keyscan.c]
27 unused variable 27 unused variable
28 - (bal) Minor KNF on ssh-keyscan.c
28 29
2920020705 3020020705
30 - (tim) [configure.ac] AIX 4.2.1 has authenticate() in libs. 31 - (tim) [configure.ac] AIX 4.2.1 has authenticate() in libs.
@@ -1308,4 +1309,4 @@
1308 - (stevesk) entropy.c: typo in debug message 1309 - (stevesk) entropy.c: typo in debug message
1309 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1310 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1310 1311
1311$Id: ChangeLog,v 1.2347 2002/07/07 22:19:13 mouring Exp $ 1312$Id: ChangeLog,v 1.2348 2002/07/07 22:25:29 mouring Exp $
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index b913614db..ae7cd86fc 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -234,6 +234,7 @@ fdlim_set(int lim)
234#if defined(HAVE_SETRLIMIT) && defined(RLIMIT_NOFILE) 234#if defined(HAVE_SETRLIMIT) && defined(RLIMIT_NOFILE)
235 struct rlimit rlfd; 235 struct rlimit rlfd;
236#endif 236#endif
237
237 if (lim <= 0) 238 if (lim <= 0)
238 return (-1); 239 return (-1);
239#if defined(HAVE_SETRLIMIT) && defined(RLIMIT_NOFILE) 240#if defined(HAVE_SETRLIMIT) && defined(RLIMIT_NOFILE)