===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/nc/netcat.c,v
retrieving revision 1.212
retrieving revision 1.213
diff -c -r1.212 -r1.213
*** src/usr.bin/nc/netcat.c	2019/11/17 17:38:33	1.212
--- src/usr.bin/nc/netcat.c	2020/01/06 15:19:12	1.213
***************
*** 1,4 ****
! /* $OpenBSD: netcat.c,v 1.212 2019/11/17 17:38:33 deraadt Exp $ */
  /*
   * Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
   * Copyright (c) 2015 Bob Beck.  All rights reserved.
--- 1,4 ----
! /* $OpenBSD: netcat.c,v 1.213 2020/01/06 15:19:12 bluhm Exp $ */
  /*
   * Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
   * Copyright (c) 2015 Bob Beck.  All rights reserved.
***************
*** 597,603 ****
  
  				if (vflag)
  					report_sock("Connection received",
! 					    (struct sockaddr *)&z, len, NULL);
  
  				readwrite(s, NULL);
  			} else {
--- 597,604 ----
  
  				if (vflag)
  					report_sock("Connection received",
! 					    (struct sockaddr *)&z, len,
! 					    family == AF_UNIX ? host : NULL);
  
  				readwrite(s, NULL);
  			} else {
***************
*** 1784,1794 ****
  	if (nflag)
  		flags |= NI_NUMERICHOST;
  
! 	if ((herr = getnameinfo(sa, salen, host, sizeof(host),
! 	    port, sizeof(port), flags)) != 0) {
! 		if (herr == EAI_SYSTEM)
  			err(1, "getnameinfo");
! 		else
  			errx(1, "getnameinfo: %s", gai_strerror(herr));
  	}
  
--- 1785,1798 ----
  	if (nflag)
  		flags |= NI_NUMERICHOST;
  
! 	herr = getnameinfo(sa, salen, host, sizeof(host), port, sizeof(port),
! 	    flags);
! 	switch (herr) {
! 		case 0:
! 			break;
! 		case EAI_SYSTEM:
  			err(1, "getnameinfo");
! 		default:
  			errx(1, "getnameinfo: %s", gai_strerror(herr));
  	}