From owner-svn-src-all@FreeBSD.ORG Fri Nov 15 22:45:15 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 82B00B8F; Fri, 15 Nov 2013 22:45:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 718FA29B1; Fri, 15 Nov 2013 22:45:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAFMjFl7014954; Fri, 15 Nov 2013 22:45:15 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAFMjFuT014952; Fri, 15 Nov 2013 22:45:15 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201311152245.rAFMjFuT014952@svn.freebsd.org> From: Xin LI Date: Fri, 15 Nov 2013 22:45:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r258195 - head/contrib/netcat X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Nov 2013 22:45:15 -0000 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@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 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 * @@ -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;