From 3958737f5fc329b07f544deb10827ed41270c9e0 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Sun, 29 Aug 2021 12:33:15 +0000
Subject: Implement -naccept in the s_server.

doc fixes/ok jmc
ok beck
---
 src/usr.bin/openssl/s_socket.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/usr.bin/openssl/s_socket.c')

diff --git a/src/usr.bin/openssl/s_socket.c b/src/usr.bin/openssl/s_socket.c
index 5d90fad8bb..f22c88d228 100644
--- a/src/usr.bin/openssl/s_socket.c
+++ b/src/usr.bin/openssl/s_socket.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_socket.c,v 1.11 2019/06/28 13:35:02 deraadt Exp $ */
+/* $OpenBSD: s_socket.c,v 1.12 2021/08/29 12:33:15 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -132,7 +132,7 @@ init_client(int *sock, char *host, char *port, int type, int af)
 int
 do_server(int port, int type, int *ret,
     int (*cb) (char *hostname, int s, unsigned char *context),
-    unsigned char *context)
+    unsigned char *context, int naccept)
 {
 	int sock;
 	char *name = NULL;
@@ -161,7 +161,9 @@ do_server(int port, int type, int *ret,
 			shutdown(sock, SHUT_RDWR);
 			close(sock);
 		}
-		if (i < 0) {
+		if (naccept != -1)
+			naccept--;
+		if (i < 0 || naccept == 0) {
 			shutdown(accept_socket, SHUT_RDWR);
 			close(accept_socket);
 			return (i);
-- 
cgit v1.2.3-55-g6feb