From owner-svn-src-head@FreeBSD.ORG  Sat Jan 24 06:06:47 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B710475D;
 Sat, 24 Jan 2015 06:06:47 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A38CB1FA;
 Sat, 24 Jan 2015 06:06:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0O66lZE065808;
 Sat, 24 Jan 2015 06:06:47 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0O66lpm065807;
 Sat, 24 Jan 2015 06:06:47 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201501240606.t0O66lpm065807@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Sat, 24 Jan 2015 06:06:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r277638 - head/contrib/tcpdump
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Jan 2015 06:06:47 -0000

Author: delphij
Date: Sat Jan 24 06:06:46 2015
New Revision: 277638
URL: https://svnweb.freebsd.org/changeset/base/277638

Log:
  Don't include libcapsicum headers when requested.
  
  Reported by:	luigi
  MFC after:	14 days
  X-MFC-with:	r276788

Modified:
  head/contrib/tcpdump/tcpdump.c

Modified: head/contrib/tcpdump/tcpdump.c
==============================================================================
--- head/contrib/tcpdump/tcpdump.c	Sat Jan 24 04:41:14 2015	(r277637)
+++ head/contrib/tcpdump/tcpdump.c	Sat Jan 24 06:06:46 2015	(r277638)
@@ -77,12 +77,12 @@ extern int SIZE_BUF;
 #ifdef __FreeBSD__
 #include <sys/capsicum.h>
 #include <sys/sysctl.h>
+#endif /* __FreeBSD__ */
+#ifdef HAVE_CAPSICUM
 #include <libcapsicum.h>
 #include <libcapsicum_dns.h>
 #include <libcapsicum_service.h>
 #include <nv.h>
-#endif /* __FreeBSD__ */
-#ifdef HAVE_CAPSICUM
 #include <sys/capability.h>
 #include <sys/ioccom.h>
 #include <net/bpf.h>
@@ -966,8 +966,8 @@ main(int argc, char **argv)
 	FILE *VFile;
 #ifdef HAVE_CAPSICUM
 	cap_rights_t rights;
-	int cansandbox;
 #endif	/* HAVE_CAPSICUM */
+	int cansandbox;
 
 #ifdef WIN32
 	if(wsockinit() != 0) return 1;