From owner-p4-projects@FreeBSD.ORG Tue Mar 1 10:11:29 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D3F6106566B; Tue, 1 Mar 2011 10:11:29 +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 5F66C1065670 for ; Tue, 1 Mar 2011 10:11:29 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 31ED08FC1B for ; Tue, 1 Mar 2011 10:11:29 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p21ABTwF004120 for ; Tue, 1 Mar 2011 10:11:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p21ABT9N004117 for perforce@freebsd.org; Tue, 1 Mar 2011 10:11:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 1 Mar 2011 10:11:29 GMT Message-Id: <201103011011.p21ABT9N004117@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 189325 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Mar 2011 10:11:29 -0000 http://p4web.freebsd.org/@@189325?ac=10 Change 189325 by rwatson@rwatson_cinnamon on 2011/03/01 10:10:32 Add ECAPMODE errno value to BSM. Submitted by: jonathan Affected files ... .. //depot/projects/trustedbsd/openbsm/CREDITS#7 edit .. //depot/projects/trustedbsd/openbsm/NEWS#47 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#22 edit .. //depot/projects/trustedbsd/openbsm/sys/bsm/audit_errno.h#7 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/CREDITS#7 (text+ko) ==== @@ -29,6 +29,7 @@ Stacey Son Todd Heberlein Gary Hoo + Jonathan Anderson In addition, Coverity, Inc.'s Prevent(tm) static analysis tool and Gimpel Software's FlexeLint tool were used to identify a number of bugs in the ==== //depot/projects/trustedbsd/openbsm/NEWS#47 (text+ko) ==== @@ -2,8 +2,7 @@ OpenBSM 1.2 alpha 1 -- Add audit events for FreeBSD process descriptor system calls, ENOTCAPABLE - BSM errno constant. +- Add Capsicum-related error numbers for FreeBSD: ENOTCAPABLE, ECAPMODE. OpenBSM 1.1p2 @@ -469,4 +468,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/NEWS#46 $ +$P4: //depot/projects/trustedbsd/openbsm/NEWS#47 $ ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#22 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#21 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_errno.c#22 $ */ #include @@ -691,6 +691,13 @@ ERRNO_NO_LOCAL_MAPPING, #endif ES("Capabilities insufficient") }, + { BSM_ERRNO_ECAPMODE, +#ifdef ECAPMODE + ECAPMODE, +#else + ERRNO_NO_LOCAL_MAPPING, +#endif + ES("Not permitted in capability mode") }, }; static const int bsm_errnos_count = sizeof(bsm_errnos) / sizeof(bsm_errnos[0]); ==== //depot/projects/trustedbsd/openbsm/sys/bsm/audit_errno.h#7 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_errno.h#6 $ + * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_errno.h#7 $ */ #ifndef _BSM_AUDIT_ERRNO_H_ @@ -205,6 +205,7 @@ #define BSM_ERRNO_EKEYREVOKED 221 /* Linux-specific. */ #define BSM_ERRNO_EKEYREJECTED 222 /* Linux-specific. */ #define BSM_ERRNO_ENOTCAPABLE 223 /* FreeBSD-specific. */ +#define BSM_ERRNO_ECAPMODE 224 /* FreeBSD-specific. */ /* * In the event that OpenBSM doesn't have a file representation of a local