===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/nc/netcat.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -c -r1.138 -r1.139
*** src/usr.bin/nc/netcat.c	2015/09/13 11:12:09	1.138
--- src/usr.bin/nc/netcat.c	2015/10/11 00:26:23	1.139
***************
*** 1,4 ****
! /* $OpenBSD: netcat.c,v 1.138 2015/09/13 11:12:09 beck Exp $ */
  /*
   * Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
   * Copyright (c) 2015 Bob Beck.  All rights reserved.
--- 1,4 ----
! /* $OpenBSD: netcat.c,v 1.139 2015/10/11 00:26:23 guenther Exp $ */
  /*
   * Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
   * Copyright (c) 2015 Bob Beck.  All rights reserved.
***************
*** 57,67 ****
  #include <tls.h>
  #include "atomicio.h"
  
- #ifndef SUN_LEN
- #define SUN_LEN(su) \
- 	(sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path))
- #endif
- 
  #define PORT_MAX	65535
  #define PORT_MAX_LEN	6
  #define UNIX_DG_TMP_SOCKET_SIZE	19
--- 57,62 ----
***************
*** 646,652 ****
  		return (-1);
  	}
  
! 	if (bind(s, (struct sockaddr *)&sun, SUN_LEN(&sun)) < 0) {
  		close(s);
  		return (-1);
  	}
--- 641,647 ----
  		return (-1);
  	}
  
! 	if (bind(s, (struct sockaddr *)&sun, sizeof(sun)) < 0) {
  		close(s);
  		return (-1);
  	}
***************
*** 741,747 ****
  		errno = ENAMETOOLONG;
  		return (-1);
  	}
! 	if (connect(s, (struct sockaddr *)&sun, SUN_LEN(&sun)) < 0) {
  		close(s);
  		return (-1);
  	}
--- 736,742 ----
  		errno = ENAMETOOLONG;
  		return (-1);
  	}
! 	if (connect(s, (struct sockaddr *)&sun, sizeof(sun)) < 0) {
  		close(s);
  		return (-1);
  	}