From owner-svn-src-head@freebsd.org  Sun Sep 18 19:16:50 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 36E2FBE05CF;
 Sun, 18 Sep 2016 19:16:50 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 06482D15;
 Sun, 18 Sep 2016 19:16:49 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8IJGn9S062424;
 Sun, 18 Sep 2016 19:16:49 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8IJGnG2062423;
 Sun, 18 Sep 2016 19:16:49 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201609181916.u8IJGnG2062423@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 18 Sep 2016 19:16:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r305949 - head/usr.bin/soelim
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.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Sep 2016 19:16:50 -0000

Author: bapt
Date: Sun Sep 18 19:16:48 2016
New Revision: 305949
URL: https://svnweb.freebsd.org/changeset/base/305949

Log:
  Simplify the fix for bootstrap tools
  
  building head is not supported from prior to stable/10 where sys/capsicum.h was
  named sys/capabilities.h
  
  Reported by:	kib

Modified:
  head/usr.bin/soelim/soelim.c

Modified: head/usr.bin/soelim/soelim.c
==============================================================================
--- head/usr.bin/soelim/soelim.c	Sun Sep 18 18:49:18 2016	(r305948)
+++ head/usr.bin/soelim/soelim.c	Sun Sep 18 19:16:48 2016	(r305949)
@@ -30,6 +30,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #if __FreeBSD_version > 1001510
 #include <sys/capsicum.h>
+#else
+#include <sys/capabilities.h>
 #endif
 #include <sys/types.h>
 
@@ -163,10 +165,8 @@ main(int argc, char **argv)
 	int ret = 0;
 	int flags = 0;
 	char cwd[MAXPATHLEN];
-#if __FreeBSD_version > 1001510
 	unsigned long cmd;
 	cap_rights_t rights;
-#endif
 
 	includes = sl_init();
 	if (getcwd(cwd, sizeof(cwd)) != NULL)
@@ -200,7 +200,6 @@ main(int argc, char **argv)
 	rootfd = open("/", O_DIRECTORY | O_RDONLY);
 	if (rootfd == -1)
 		err(EXIT_FAILURE, "unable to open '/'");
-#if __FreeBSD_version > 1001510
 	cap_rights_init(&rights, CAP_READ, CAP_FSTAT, CAP_IOCTL);
 	/*
 	 * EBADF in case stdin is closed by the caller
@@ -227,7 +226,6 @@ main(int argc, char **argv)
 
 	if (cap_enter() < 0 && errno != ENOSYS)
 		err(EXIT_FAILURE, "unable to enter capability mode");
-#endif
 
 	if (argc == 0)
 		ret = soelim_file(rootfd, stdin, flags);