From owner-svn-src-stable-11@freebsd.org  Mon Mar  5 08:27:29 2018
Return-Path: <owner-svn-src-stable-11@freebsd.org>
Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C8A60F3D52F;
 Mon,  5 Mar 2018 08:27:29 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 77E496B641;
 Mon,  5 Mar 2018 08:27:29 +0000 (UTC)
 (envelope-from eadler@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 72E5E21719;
 Mon,  5 Mar 2018 08:27:29 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w258RTwi017588;
 Mon, 5 Mar 2018 08:27:29 GMT (envelope-from eadler@FreeBSD.org)
Received: (from eadler@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w258RTPj017587;
 Mon, 5 Mar 2018 08:27:29 GMT (envelope-from eadler@FreeBSD.org)
Message-Id: <201803050827.w258RTPj017587@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: eadler set sender to
 eadler@FreeBSD.org using -f
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 5 Mar 2018 08:27:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r330464 - stable/11/usr.bin/users
X-SVN-Group: stable-11
X-SVN-Commit-Author: eadler
X-SVN-Commit-Paths: stable/11/usr.bin/users
X-SVN-Commit-Revision: 330464
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-11@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for only the 11-stable src tree
 <svn-src-stable-11.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-11/>
List-Post: <mailto:svn-src-stable-11@freebsd.org>
List-Help: <mailto:svn-src-stable-11-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Mar 2018 08:27:30 -0000

Author: eadler
Date: Mon Mar  5 08:27:29 2018
New Revision: 330464
URL: https://svnweb.freebsd.org/changeset/base/330464

Log:
  MFC r311581:
  
  Capsicum: add capability mode to users binary
  
  Submitted by:	Tyler Littlefield <tyler@tysdomain.com>
  Reviewed by:	cem, oshogbo
  Differential Revision:	https://reviews.freebsd.org/D9046

Modified:
  stable/11/usr.bin/users/users.cc
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.bin/users/users.cc
==============================================================================
--- stable/11/usr.bin/users/users.cc	Mon Mar  5 08:25:23 2018	(r330463)
+++ stable/11/usr.bin/users/users.cc	Mon Mar  5 08:27:29 2018	(r330464)
@@ -27,9 +27,12 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/capsicum.h>
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <err.h>
+#include <errno.h>
 #include <utmpx.h>
 
 #include <algorithm>
@@ -51,6 +54,10 @@ main(int argc, char **)
 	}
 
 	setutxent();
+
+	if (cap_enter() < 0 && errno != ENOSYS)
+		err(1, "Failed to enter capability mode.");
+
 	while ((ut = getutxent()) != NULL)
 		if (ut->ut_type == USER_PROCESS)
 			names.insert(ut->ut_user);