===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/s_socket.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -c -r1.11 -r1.12
*** src/usr.bin/openssl/s_socket.c	2019/06/28 13:35:02	1.11
--- src/usr.bin/openssl/s_socket.c	2021/08/29 12:33:15	1.12
***************
*** 1,4 ****
! /* $OpenBSD: s_socket.c,v 1.11 2019/06/28 13:35:02 deraadt Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
--- 1,4 ----
! /* $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,138 ****
  int
  do_server(int port, int type, int *ret,
      int (*cb) (char *hostname, int s, unsigned char *context),
!     unsigned char *context)
  {
  	int sock;
  	char *name = NULL;
--- 132,138 ----
  int
  do_server(int port, int type, int *ret,
      int (*cb) (char *hostname, int s, unsigned char *context),
!     unsigned char *context, int naccept)
  {
  	int sock;
  	char *name = NULL;
***************
*** 161,167 ****
  			shutdown(sock, SHUT_RDWR);
  			close(sock);
  		}
! 		if (i < 0) {
  			shutdown(accept_socket, SHUT_RDWR);
  			close(accept_socket);
  			return (i);
--- 161,169 ----
  			shutdown(sock, SHUT_RDWR);
  			close(sock);
  		}
! 		if (naccept != -1)
! 			naccept--;
! 		if (i < 0 || naccept == 0) {
  			shutdown(accept_socket, SHUT_RDWR);
  			close(accept_socket);
  			return (i);