svn commit: r258195 - head/contrib/netcat

[Xin LI]

Author: delphij
Date: Fri Nov 15 22:45:14 2013
New Revision: 258195
URL: http://svnweb.freebsd.org/changeset/base/258195

Log:
  MFV: netcat from OpenBSD 5.4.
  
  No functional change.

Modified:
  head/contrib/netcat/nc.1
  head/contrib/netcat/netcat.c
Directory Properties:
  head/contrib/netcat/   (props changed)

Modified: head/contrib/netcat/nc.1
==============================================================================
--- head/contrib/netcat/nc.1	Fri Nov 15 22:29:30 2013	(r258194)
+++ head/contrib/netcat/nc.1	Fri Nov 15 22:45:14 2013	(r258195)
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: nc.1,v 1.62 2013/03/20 09:27:56 sthen Exp $
+.\"     $OpenBSD: nc.1,v 1.63 2013/07/16 00:07:52 schwarze Exp $
 .\"
 .\" Copyright (c) 1996 David Sacerdote
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 7, 2012
+.Dd March 20, 2013
 .Dt NC 1
 .Os
 .Sh NAME
@@ -490,10 +490,10 @@ if the proxy requires it:
 .Xr tcp 4
 .Sh AUTHORS
 Original implementation by *Hobbit*
-.Aq hobbit at avian.org .
+.Aq Mt hobbit at avian.org .
 .br
 Rewritten with IPv6 support by
-.An Eric Jackson Aq ericj at monkey.org .
+.An Eric Jackson Aq Mt ericj at monkey.org .
 .Sh CAVEATS
 UDP port scans using the
 .Fl uz

Modified: head/contrib/netcat/netcat.c
==============================================================================
--- head/contrib/netcat/netcat.c	Fri Nov 15 22:29:30 2013	(r258194)
+++ head/contrib/netcat/netcat.c	Fri Nov 15 22:45:14 2013	(r258195)
@@ -1,4 +1,4 @@
-/* $OpenBSD: netcat.c,v 1.111 2013/03/20 09:27:56 sthen Exp $ */
+/* $OpenBSD: netcat.c,v 1.112 2013/04/29 00:28:23 okan Exp $ */
 /*
  * Copyright (c) 2001 Eric Jackson <ericj at monkey.org>
  *
@@ -568,7 +568,7 @@ unix_connect(char *path)
 		if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
 			return (-1);
 	}
-	(void)fcntl(s, F_SETFD, 1);
+	(void)fcntl(s, F_SETFD, FD_CLOEXEC);
 
 	memset(&sun, 0, sizeof(struct sockaddr_un));
 	sun.sun_family = AF_UNIX;