aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2013-11-15 22:28:48 +0000
committerXin LI <delphij@FreeBSD.org>2013-11-15 22:28:48 +0000
commita113ffae60e323fae1068c0f4d3b033d5c4db116 (patch)
tree1c87ef466f13db1bfb571c516d1f81aeb53eac50
parent791bbda65d1e5e5968dd1c698ecbce06cb971d9a (diff)
downloadsrc-a113ffae60e323fae1068c0f4d3b033d5c4db116.tar.gz
src-a113ffae60e323fae1068c0f4d3b033d5c4db116.zip
Vendor import from OpenBSD 5.4.vendor/netcat/5.4
Notes
Notes: svn path=/vendor/netcat/dist/; revision=258193 svn path=/vendor/netcat/5.4/; revision=258194; tag=vendor/netcat/5.4
-rw-r--r--nc.18
-rw-r--r--netcat.c4
2 files changed, 6 insertions, 6 deletions
diff --git a/nc.1 b/nc.1
index 4f68a321b6d7..1e0ef0753422 100644
--- a/nc.1
+++ b/nc.1
@@ -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.
@@ -25,7 +25,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: July 7 2012 $
+.Dd $Mdocdate: March 20 2013 $
.Dt NC 1
.Os
.Sh NAME
@@ -452,10 +452,10 @@ if the proxy requires it:
.Xr ssh 1
.Sh AUTHORS
Original implementation by *Hobbit*
-.Aq hobbit@avian.org .
+.Aq Mt hobbit@avian.org .
.br
Rewritten with IPv6 support by
-.An Eric Jackson Aq ericj@monkey.org .
+.An Eric Jackson Aq Mt ericj@monkey.org .
.Sh CAVEATS
UDP port scans using the
.Fl uz
diff --git a/netcat.c b/netcat.c
index 33246d7a747a..571de9a76663 100644
--- a/netcat.c
+++ b/netcat.c
@@ -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@monkey.org>
*
@@ -523,7 +523,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;