===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/nc/netcat.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -c -r1.114 -r1.115
*** src/usr.bin/nc/netcat.c	2013/08/20 21:04:40	1.114
--- src/usr.bin/nc/netcat.c	2013/10/21 08:59:49	1.115
***************
*** 1,4 ****
! /* $OpenBSD: netcat.c,v 1.114 2013/08/20 21:04:40 jmc Exp $ */
  /*
   * Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
   *
--- 1,4 ----
! /* $OpenBSD: netcat.c,v 1.115 2013/10/21 08:59:49 phessler Exp $ */
  /*
   * Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
   *
***************
*** 588,598 ****
  		    res0->ai_protocol)) < 0)
  			continue;
  
! 		if (rtableid) {
! 			if (setsockopt(s, SOL_SOCKET, SO_RTABLE, &rtableid,
! 			    sizeof(rtableid)) == -1)
! 				err(1, "setsockopt SO_RTABLE");
! 		}
  
  		/* Bind to a local port or source address if specified. */
  		if (sflag || pflag) {
--- 588,596 ----
  		    res0->ai_protocol)) < 0)
  			continue;
  
! 		if (setsockopt(s, SOL_SOCKET, SO_RTABLE, &rtableid,
! 		    sizeof(rtableid)) == -1)
! 			err(1, "setsockopt SO_RTABLE");
  
  		/* Bind to a local port or source address if specified. */
  		if (sflag || pflag) {
***************
*** 699,709 ****
  		    res0->ai_protocol)) < 0)
  			continue;
  
! 		if (rtableid) {
! 			if (setsockopt(s, IPPROTO_IP, SO_RTABLE, &rtableid,
! 			    sizeof(rtableid)) == -1)
! 				err(1, "setsockopt SO_RTABLE");
! 		}
  
  		ret = setsockopt(s, SOL_SOCKET, SO_REUSEPORT, &x, sizeof(x));
  		if (ret == -1)
--- 697,705 ----
  		    res0->ai_protocol)) < 0)
  			continue;
  
! 		if (setsockopt(s, SOL_SOCKET, SO_RTABLE, &rtableid,
! 		    sizeof(rtableid)) == -1)
! 			err(1, "setsockopt SO_RTABLE");
  
  		ret = setsockopt(s, SOL_SOCKET, SO_REUSEPORT, &x, sizeof(x));
  		if (ret == -1)