[openssh-commits] [openssh] 08/08: upstream: set num_listen_socks to 0 on close-all instead of -1,

git+noreply at mindrot.org git+noreply at mindrot.org
Thu Nov 18 09:14:38 AEDT 2021


This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit fd7e7de4ddb4399c7e929b44f2bbfc118eddfcf8
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Wed Nov 17 21:06:39 2021 +0000

    upstream: set num_listen_socks to 0 on close-all instead of -1,
    
    which interferes with the new poll()-based listen loop; spotted and debugged
    by anton at +deraadt@
    
    OpenBSD-Commit-ID: f7ab8ab124f615a2e0c45fee14c38d2f2abbabbd
---
 sshd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sshd.c b/sshd.c
index 6953d04d..9ada0c18 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.579 2021/11/14 18:47:43 deraadt Exp $ */
+/* $OpenBSD: sshd.c,v 1.580 2021/11/17 21:06:39 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -273,7 +273,7 @@ close_listen_socks(void)
 
 	for (i = 0; i < num_listen_socks; i++)
 		close(listen_socks[i]);
-	num_listen_socks = -1;
+	num_listen_socks = 0;
 }
 
 static void

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.


More information about the openssh-commits mailing list