===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/nc/netcat.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -c -r1.142 -r1.143
*** src/usr.bin/nc/netcat.c	2015/11/12 20:33:52	1.142
--- src/usr.bin/nc/netcat.c	2015/11/13 18:13:13	1.143
***************
*** 1,4 ****
! /* $OpenBSD: netcat.c,v 1.142 2015/11/12 20:33:52 benno Exp $ */
  /*
   * Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
   * Copyright (c) 2015 Bob Beck.  All rights reserved.
--- 1,4 ----
! /* $OpenBSD: netcat.c,v 1.143 2015/11/13 18:13:13 deraadt Exp $ */
  /*
   * Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
   * Copyright (c) 2015 Bob Beck.  All rights reserved.
***************
*** 310,332 ****
  	argc -= optind;
  	argv += optind;
  
! 	if (rtableid >= 0) {
  		if (setrtable(rtableid) == -1)
  			err(1, "setrtable");
! 	}
  	if (family == AF_UNIX) {
  		if (pledge("stdio rpath wpath cpath tmppath unix", NULL) == -1)
  			err(1, "pledge");
! 	}
! 	else if (Fflag) {
  		if (pledge("stdio inet dns sendfd", NULL) == -1)
  			err(1, "pledge");
! 	}
! 	else if (usetls) {
  		if (pledge("stdio rpath inet dns", NULL) == -1)
  			err(1, "pledge");
! 	}
! 	else if (pledge("stdio inet dns", NULL) == -1)
  		err(1, "pledge");
  
  	/* Cruft to make sure options are clean, and used properly. */
--- 310,329 ----
  	argc -= optind;
  	argv += optind;
  
! 	if (rtableid >= 0)
  		if (setrtable(rtableid) == -1)
  			err(1, "setrtable");
! 
  	if (family == AF_UNIX) {
  		if (pledge("stdio rpath wpath cpath tmppath unix", NULL) == -1)
  			err(1, "pledge");
! 	} else if (Fflag) {
  		if (pledge("stdio inet dns sendfd", NULL) == -1)
  			err(1, "pledge");
! 	} else if (usetls) {
  		if (pledge("stdio rpath inet dns", NULL) == -1)
  			err(1, "pledge");
! 	} else if (pledge("stdio inet dns", NULL) == -1)
  		err(1, "pledge");
  
  	/* Cruft to make sure options are clean, and used properly. */
***************
*** 830,836 ****
  
  		if (timeout_connect(s, res0->ai_addr, res0->ai_addrlen) == 0)
  			break;
! 		else if (vflag)
  			warn("connect to %s port %s (%s) failed", host, port,
  			    uflag ? "udp" : "tcp");
  
--- 827,833 ----
  
  		if (timeout_connect(s, res0->ai_addr, res0->ai_addrlen) == 0)
  			break;
! 		if (vflag)
  			warn("connect to %s port %s (%s) failed", host, port,
  			    uflag ? "udp" : "tcp");