From owner-p4-projects@FreeBSD.ORG Tue Jun 9 11:19:02 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 23937106567D; Tue, 9 Jun 2009 11:19:02 +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 D3A861065673 for ; Tue, 9 Jun 2009 11:19:01 +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 A5D548FC13 for ; Tue, 9 Jun 2009 11:19:01 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n59BJ191069799 for ; Tue, 9 Jun 2009 11:19:01 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 n59BJ1VI069797 for perforce@freebsd.org; Tue, 9 Jun 2009 11:19:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 9 Jun 2009 11:19:01 GMT Message-Id: <200906091119.n59BJ1VI069797@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 To: Perforce Change Reviews Cc: Subject: PERFORCE change 163887 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Jun 2009 11:19:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=163887 Change 163887 by rwatson@rwatson_freebsd_capabilities on 2009/06/09 11:18:33 Teach audit about ENOTCAPABLE. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/bsm_errno.c#4 edit .. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/sys/bsm/audit_errno.h#3 edit .. //depot/projects/trustedbsd/capabilities/src/sys/bsm/audit_errno.h#3 edit .. //depot/projects/trustedbsd/capabilities/src/sys/security/audit/audit_bsm_errno.c#4 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/libbsm/bsm_errno.c#4 (text) ==== @@ -586,6 +586,13 @@ ERRNO_NO_LOCAL_MAPPING, #endif ES("Key was rejected by service") }, + { BSM_ERRNO_ENOTCAPABLE, +#ifdef ENOTCAPABLE + ENOTCAPABLE, +#else + ERRNO_NO_LOCAL_MAPPING, +#endif + ES("Capabilities insufficient") }, }; static const int bsm_errnos_count = sizeof(bsm_errnos) / sizeof(bsm_errnos[0]); ==== //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/sys/bsm/audit_errno.h#3 (text) ==== @@ -204,6 +204,7 @@ #define BSM_ERRNO_EKEYEXPIRED 220 /* Linux-specific. */ #define BSM_ERRNO_EKEYREVOKED 221 /* Linux-specific. */ #define BSM_ERRNO_EKEYREJECTED 222 /* Linux-specific. */ +#define BSM_ERRNO_ENOTCAPABLE 223 /* FreeBSD-specific. */ /* * In the event that OpenBSM doesn't have a file representation of a local ==== //depot/projects/trustedbsd/capabilities/src/sys/bsm/audit_errno.h#3 (text) ==== @@ -205,6 +205,7 @@ #define BSM_ERRNO_EKEYEXPIRED 220 /* Linux-specific. */ #define BSM_ERRNO_EKEYREVOKED 221 /* Linux-specific. */ #define BSM_ERRNO_EKEYREJECTED 222 /* Linux-specific. */ +#define BSM_ERRNO_ENOTCAPABLE 223 /* FreeBSD-specific. */ /* * In the event that OpenBSM doesn't have a file representation of a local ==== //depot/projects/trustedbsd/capabilities/src/sys/security/audit/audit_bsm_errno.c#4 (text+ko) ==== @@ -588,6 +588,13 @@ ERRNO_NO_LOCAL_MAPPING, #endif ES("Key was rejected by service") }, + { BSM_ERRNO_ENOTCAPABLE, +#ifdef ENOTCAPABLE + ENOTCAPABLE, +#else + ERRNO_NO_LOCAL_MAPPING, +#endif + ES("Capabilities insufficient") }, }; static const int bsm_errnos_count = sizeof(bsm_errnos) / sizeof(bsm_errnos[0]);