===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/nc/netcat.c,v
retrieving revision 1.209
retrieving revision 1.210
diff -c -r1.209 -r1.210
*** src/usr.bin/nc/netcat.c	2019/10/24 12:48:54	1.209
--- src/usr.bin/nc/netcat.c	2019/11/04 17:33:28	1.210
***************
*** 1,4 ****
! /* $OpenBSD: netcat.c,v 1.209 2019/10/24 12:48:54 job Exp $ */
  /*
   * Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
   * Copyright (c) 2015 Bob Beck.  All rights reserved.
--- 1,4 ----
! /* $OpenBSD: netcat.c,v 1.210 2019/11/04 17:33:28 millert Exp $ */
  /*
   * Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
   * Copyright (c) 2015 Bob Beck.  All rights reserved.
***************
*** 705,712 ****
  
  				fprintf(stderr, "Connection to %s", host);
  
! 				/* if there is something to report, print IP */
! 				if (!nflag && (strcmp(host, ipaddr) != 0))
  					fprintf(stderr, " (%s)", ipaddr);
  
  				fprintf(stderr, " %s port [%s/%s] succeeded!\n",
--- 705,716 ----
  
  				fprintf(stderr, "Connection to %s", host);
  
! 				/*
! 				 * if we aren't connecting thru a proxy and
! 				 * there is something to report, print IP
! 				 */
! 				if (!nflag && !xflag
! 				    && (strcmp(host, ipaddr) != 0))
  					fprintf(stderr, " (%s)", ipaddr);
  
  				fprintf(stderr, " %s port [%s/%s] succeeded!\n",
***************
*** 959,970 ****
  
  		set_common_sockopts(s, res->ai_family);
  
! 		if ((herr = getnameinfo(res->ai_addr, res->ai_addrlen, ipaddr,
! 		    NI_MAXHOST, NULL, 0, NI_NUMERICHOST)) != 0) {
! 			if (herr == EAI_SYSTEM)
  				err(1, "getnameinfo");
! 			else
  				errx(1, "getnameinfo: %s", gai_strerror(herr));
  		}
  
  		if (timeout_connect(s, res->ai_addr, res->ai_addrlen) == 0)
--- 963,979 ----
  
  		set_common_sockopts(s, res->ai_family);
  
! 		if (ipaddr != NULL) {
! 			herr = getnameinfo(res->ai_addr, res->ai_addrlen,
! 			    ipaddr, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
! 			switch (herr) {
! 			case 0:
! 				break;
! 			case EAI_SYSTEM:
  				err(1, "getnameinfo");
! 			default:
  				errx(1, "getnameinfo: %s", gai_strerror(herr));
+ 			}
  		}
  
  		if (timeout_connect(s, res->ai_addr, res->ai_addrlen) == 0)
***************
*** 972,978 ****
  
  		if (vflag) {
  			/* only print IP if there is something to report */
! 			if (nflag || (strncmp(host, ipaddr, NI_MAXHOST) == 0))
  				warn("connect to %s port %s (%s) failed", host,
  				    port, uflag ? "udp" : "tcp");
  			else
--- 981,988 ----
  
  		if (vflag) {
  			/* only print IP if there is something to report */
! 			if (nflag || ipaddr == NULL ||
! 			    (strncmp(host, ipaddr, NI_MAXHOST) == 0))
  				warn("connect to %s port %s (%s) failed", host,
  				    port, uflag ? "udp" : "tcp");
  			else