diff options
| author | Xin LI <delphij@FreeBSD.org> | 2013-11-15 22:45:14 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2013-11-15 22:45:14 +0000 |
| commit | 5abd6fdcfa8cd6bdce99672b3a421d9313870472 (patch) | |
| tree | 5abd63c8289fa15ccb860600f57d059ac5b5bc36 /contrib/netcat | |
| parent | 5e33beca59d462fbbfe38c85064d8b1115e025e6 (diff) | |
| parent | a113ffae60e323fae1068c0f4d3b033d5c4db116 (diff) | |
| download | src-test-5abd6fdcfa8cd6bdce99672b3a421d9313870472.tar.gz src-test-5abd6fdcfa8cd6bdce99672b3a421d9313870472.zip | |
MFV: netcat from OpenBSD 5.4.
No functional change.
Notes
Notes:
svn path=/head/; revision=258195
Diffstat (limited to 'contrib/netcat')
| -rw-r--r-- | contrib/netcat/nc.1 | 8 | ||||
| -rw-r--r-- | contrib/netcat/netcat.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/contrib/netcat/nc.1 b/contrib/netcat/nc.1 index e62cdeae51e9e..1702f372d4f71 100644 --- a/contrib/netcat/nc.1 +++ b/contrib/netcat/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. @@ -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@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/contrib/netcat/netcat.c b/contrib/netcat/netcat.c index 71454af361522..0037efa039941 100644 --- a/contrib/netcat/netcat.c +++ b/contrib/netcat/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> * @@ -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; |