From owner-svn-src-stable@freebsd.org  Wed Oct  4 12:02:06 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 ABBD5E37F00;
 Wed,  4 Oct 2017 12:02:06 +0000 (UTC)
 (envelope-from trasz@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 7557C842AE;
 Wed,  4 Oct 2017 12:02:06 +0000 (UTC)
 (envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v94C256V016448;
 Wed, 4 Oct 2017 12:02:05 GMT (envelope-from trasz@FreeBSD.org)
Received: (from trasz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v94C25db016323;
 Wed, 4 Oct 2017 12:02:05 GMT (envelope-from trasz@FreeBSD.org)
Message-Id: <201710041202.v94C25db016323@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: trasz set sender to
 trasz@FreeBSD.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Wed, 4 Oct 2017 12:02:05 +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: r324271 - stable/11/bin/ps
X-SVN-Group: stable-11
X-SVN-Commit-Author: trasz
X-SVN-Commit-Paths: stable/11/bin/ps
X-SVN-Commit-Revision: 324271
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@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Oct 2017 12:02:06 -0000

Author: trasz
Date: Wed Oct  4 12:02:05 2017
New Revision: 324271
URL: https://svnweb.freebsd.org/changeset/base/324271

Log:
  MFC r323228:
  
  Make ps(1) flag processes in capsicum(4) capability mode with "C".

Modified:
  stable/11/bin/ps/print.c
  stable/11/bin/ps/ps.1
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/bin/ps/print.c
==============================================================================
--- stable/11/bin/ps/print.c	Wed Oct  4 12:01:02 2017	(r324270)
+++ stable/11/bin/ps/print.c	Wed Oct  4 12:02:05 2017	(r324271)
@@ -274,6 +274,8 @@ state(KINFO *k, VARENT *ve __unused)
 		*cp++ = 'V';
 	if ((flag & P_SYSTEM) || k->ki_p->ki_lock > 0)
 		*cp++ = 'L';
+	if ((k->ki_p->ki_cr_flags & CRED_FLAG_CAPMODE) != 0)
+		*cp++ = 'C';
 	if (k->ki_p->ki_kiflag & KI_SLEADER)
 		*cp++ = 's';
 	if ((flag & P_CONTROLT) && k->ki_p->ki_pgid == k->ki_p->ki_tpgid)

Modified: stable/11/bin/ps/ps.1
==============================================================================
--- stable/11/bin/ps/ps.1	Wed Oct  4 12:01:02 2017	(r324270)
+++ stable/11/bin/ps/ps.1	Wed Oct  4 12:02:05 2017	(r324271)
@@ -29,7 +29,7 @@
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
 .\" $FreeBSD$
 .\"
-.Dd July 25, 2017
+.Dd September 6, 2017
 .Dt PS 1
 .Os
 .Sh NAME
@@ -436,6 +436,10 @@ information:
 The process is in the foreground process group of its control terminal.
 .It Li <
 The process has raised CPU scheduling priority.
+.It Li C
+The process is in
+.Xr capsicum 4
+capability mode.
 .It Li E
 The process is trying to exit.
 .It Li J