From owner-svn-src-projects@FreeBSD.ORG  Sat Jan 30 19:32:11 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B4D6210656D8;
	Sat, 30 Jan 2010 19:32:11 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A57AA8FC18;
	Sat, 30 Jan 2010 19:32:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0UJWBql086599;
	Sat, 30 Jan 2010 19:32:11 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0UJWBU1086597;
	Sat, 30 Jan 2010 19:32:11 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201001301932.o0UJWBU1086597@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 30 Jan 2010 19:32:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r203227 - projects/capabilities8/contrib/tcpdump
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Jan 2010 19:32:11 -0000

Author: rwatson
Date: Sat Jan 30 19:32:11 2010
New Revision: 203227
URL: http://svn.freebsd.org/changeset/base/203227

Log:
  Merge c172967 from the p4 TrustedBSD Capabilities branch to capabilities8:
  
    Prefer tcpdump's own error() routine to err().
  
  Sponsored by:	Google, Inc.

Modified:
  projects/capabilities8/contrib/tcpdump/tcpdump.c

Modified: projects/capabilities8/contrib/tcpdump/tcpdump.c
==============================================================================
--- projects/capabilities8/contrib/tcpdump/tcpdump.c	Sat Jan 30 19:32:01 2010	(r203226)
+++ projects/capabilities8/contrib/tcpdump/tcpdump.c	Sat Jan 30 19:32:11 2010	(r203227)
@@ -1199,7 +1199,7 @@ main(int argc, char **argv)
 	}
 #endif /* WIN32 */
 	if (cap_enter() < 0)
-		err(-1, "cap_enter");
+		error("cap_enter: %s", pcap_strerror(errno));
 	status = pcap_loop(pd, cnt, callback, pcap_userdata);
 	if (WFileName == NULL) {
 		/*