summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sshd.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d57142d34..e29fb6c88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
12 [auth2.c auth2-chall.c auth.h] 12 [auth2.c auth2-chall.c auth.h]
13 add auth2_challenge_stop(), simplifies cleanup of kbd-int sessions, 13 add auth2_challenge_stop(), simplifies cleanup of kbd-int sessions,
14 fixes memleak. 14 fixes memleak.
15 - stevesk@cvs.openbsd.org 2001/12/10 16:45:04
16 [sshd.c]
17 possible fd leak on error; ok markus@
15 18
1620011219 1920011219
17 - (stevesk) OpenBSD CVS sync X11 localhost display 20 - (stevesk) OpenBSD CVS sync X11 localhost display
@@ -7040,4 +7043,4 @@
7040 - Wrote replacements for strlcpy and mkdtemp 7043 - Wrote replacements for strlcpy and mkdtemp
7041 - Released 1.0pre1 7044 - Released 1.0pre1
7042 7045
7043$Id: ChangeLog,v 1.1695 2001/12/21 01:42:34 djm Exp $ 7046$Id: ChangeLog,v 1.1696 2001/12/21 01:44:28 djm Exp $
diff --git a/sshd.c b/sshd.c
index f105b8b06..91376de2e 100644
--- a/sshd.c
+++ b/sshd.c
@@ -40,7 +40,7 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: sshd.c,v 1.215 2001/12/06 13:30:06 markus Exp $"); 43RCSID("$OpenBSD: sshd.c,v 1.216 2001/12/10 16:45:04 stevesk Exp $");
44 44
45#include <openssl/dh.h> 45#include <openssl/dh.h>
46#include <openssl/bn.h> 46#include <openssl/bn.h>
@@ -1030,6 +1030,7 @@ main(int ac, char **av)
1030 } 1030 }
1031 if (fcntl(newsock, F_SETFL, 0) < 0) { 1031 if (fcntl(newsock, F_SETFL, 0) < 0) {
1032 error("newsock del O_NONBLOCK: %s", strerror(errno)); 1032 error("newsock del O_NONBLOCK: %s", strerror(errno));
1033 close(newsock);
1033 continue; 1034 continue;
1034 } 1035 }
1035 if (drop_connection(startups) == 1) { 1036 if (drop_connection(startups) == 1) {