commit 8071a6924c12bb51406a9a64a4b2892675112c87
author djm@openbsd.org <djm@openbsd.org> Fri Feb 24 03:16:34 2017 +0000
committer Damien Miller <djm@mindrot.org> Tue Feb 28 17:10:41 2017 +1100
tree 48dda1a13f95a65f727281c43954bd0aa233a649
parent d5499190559ebe374bcdfa8805408646ceffad64

upstream commit

might as well set the listener socket CLOEXEC

Upstream-ID: 9c538433d6a0ca79f5f21decc5620e46fb68ab57

sshd.c

diff --git a/sshd.c b/sshd.c
index c2c1cc8..df694fe 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.482 2017/02/06 09:22:51 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.483 2017/02/24 03:16:34 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1046,6 +1046,11 @@
 			close(listen_sock);
 			continue;
 		}
+		if (fcntl(listen_sock, F_SETFD, FD_CLOEXEC) == -1) {
+			verbose("socket: CLOEXEC: %s", strerror(errno));
+			close(listen_sock);
+			continue;
+		}
 		/*
 		 * Set socket options.
 		 * Allow local port reuse in TIME_WAIT.