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 @@
      [auth2.c auth2-chall.c auth.h]
      add auth2_challenge_stop(), simplifies cleanup of kbd-int sessions,
      fixes memleak.
+   - stevesk@cvs.openbsd.org 2001/12/10 16:45:04
+     [sshd.c]
+     possible fd leak on error; ok markus@
 
 20011219
  - (stevesk) OpenBSD CVS sync X11 localhost display
@@ -7040,4 +7043,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1695 2001/12/21 01:42:34 djm Exp $
+$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 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.215 2001/12/06 13:30:06 markus Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.216 2001/12/10 16:45:04 stevesk Exp $");
 
 #include <openssl/dh.h>
 #include <openssl/bn.h>
@@ -1030,6 +1030,7 @@ main(int ac, char **av)
                                 }
                                 if (fcntl(newsock, F_SETFL, 0) < 0) {
                                         error("newsock del O_NONBLOCK: %s", strerror(errno));
+                                        close(newsock);
                                         continue;
                                 }
                                 if (drop_connection(startups) == 1) {