===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/s_client.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -c -r1.37 -r1.38
*** src/usr.bin/openssl/s_client.c	2018/11/14 06:24:21	1.37
--- src/usr.bin/openssl/s_client.c	2019/06/28 13:35:02	1.38
***************
*** 1,4 ****
! /* $OpenBSD: s_client.c,v 1.37 2018/11/14 06:24:21 tb Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
--- 1,4 ----
! /* $OpenBSD: s_client.c,v 1.38 2019/06/28 13:35:02 deraadt Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
***************
*** 759,765 ****
  	if (SSL_version(con) == DTLS1_VERSION) {
  
  		sbio = BIO_new_dgram(s, BIO_NOCLOSE);
! 		if (getsockname(s, &peer, (void *) &peerlen) < 0) {
  			BIO_printf(bio_err, "getsockname:errno=%d\n",
  			    errno);
  			shutdown(s, SHUT_RD);
--- 759,765 ----
  	if (SSL_version(con) == DTLS1_VERSION) {
  
  		sbio = BIO_new_dgram(s, BIO_NOCLOSE);
! 		if (getsockname(s, &peer, (void *) &peerlen) == -1) {
  			BIO_printf(bio_err, "getsockname:errno=%d\n",
  			    errno);
  			shutdown(s, SHUT_RD);
***************
*** 1013,1019 ****
  				tty_on,read_tty,write_tty,read_ssl,write_ssl);*/
  
  			i = poll(pfd, 3, ptimeout);
! 			if (i < 0) {
  				BIO_printf(bio_err, "bad select %d\n",
  				    errno);
  				goto shut;
--- 1013,1019 ----
  				tty_on,read_tty,write_tty,read_ssl,write_ssl);*/
  
  			i = poll(pfd, 3, ptimeout);
! 			if (i == -1) {
  				BIO_printf(bio_err, "bad select %d\n",
  				    errno);
  				goto shut;