From owner-p4-projects@FreeBSD.ORG  Fri Feb  5 00:46:25 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0E8F910656C1; Fri,  5 Feb 2010 00:46:25 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C74911065676
	for <perforce@freebsd.org>; Fri,  5 Feb 2010 00:46:24 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9C20F8FC1D
	for <perforce@freebsd.org>; Fri,  5 Feb 2010 00:46:24 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o150kOvE035525
	for <perforce@freebsd.org>; Fri, 5 Feb 2010 00:46:24 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o150kOOU035523
	for perforce@freebsd.org; Fri, 5 Feb 2010 00:46:24 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Fri, 5 Feb 2010 00:46:24 GMT
Message-Id: <201002050046.o150kOOU035523@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 174338 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2010 00:46:25 -0000

http://p4web.freebsd.org/chv.cgi?CH=174338

Change 174338 by rwatson@rwatson_vimage_client on 2010/02/05 00:46:03

	- Do not print process descriptor pid twice
	- Handle vnode, fifo, pts and procdesc with default case for network
	    protocol
	
	Submitted by:	antoine
	
	Add new capability rights so that procstat can print them, update
	copyright.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/usr.bin/procstat/procstat_files.c#15 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/usr.bin/procstat/procstat_files.c#15 (text+ko) ====

@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2007-2009 Robert N. M. Watson
+ * Copyright (c) 2007-2010 Robert N. M. Watson
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -168,6 +168,7 @@
 	{ CAP_MAC_GET,		"mg" },
 	{ CAP_MAC_SET,		"ms" },
 	{ CAP_ACCEPT,		"at" },
+	{ CAP_CONNECT,		"co" },
 	{ CAP_BIND,		"bd" },
 	{ CAP_GETSOCKOPT,	"gs" },
 	{ CAP_SETSOCKOPT,	"ss" },
@@ -182,6 +183,17 @@
 	{ CAP_PDGETPID,		"pg" },
 	{ CAP_PDWAIT,		"pw" },
 	{ CAP_PDKILL,		"pk" },
+	{ CAP_MAPEXEC,		"me" },
+	{ CAP_TTYHOOK,		"th" },
+	{ CAP_FCHDIR,		"cd" },
+	{ CAP_FSCK,		"fk" },
+	{ CAP_ATBASE,		"ab" },
+	{ CAP_ABSOLUTEPATH,	"ap" },
+	{ CAP_CREATE,		"cr" },
+	{ CAP_DELETE,		"de" },
+	{ CAP_MKDIR,		"md" },
+	{ CAP_RMDIR,		"rm" },
+	{ CAP_MKFIFO,		"mf" },
 };
 static const u_int	cap_desc_count = sizeof(cap_desc) /
 			    sizeof(cap_desc[0]);
@@ -414,22 +426,12 @@
 		}
 
 		switch (kif->kf_type) {
-		case KF_TYPE_VNODE:
-		case KF_TYPE_FIFO:
-		case KF_TYPE_PTS:
-			printf("%-3s ", "-");
-			break;
-
 		case KF_TYPE_SOCKET:
 			printf("%-3s ",
 			    protocol_to_string(kif->kf_sock_domain,
 			    kif->kf_sock_type, kif->kf_sock_protocol));
 			break;
 
-		case KF_TYPE_PROCDESC:
-			printf("%-3s %d", "-", kif->kf_pid);
-			break;
-
 		default:
 			printf("%-3s ", "-");
 		}