From owner-trustedbsd-cvs@FreeBSD.ORG Fri Dec 1 16:02:53 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6BA6516A534 for ; Fri, 1 Dec 2006 16:02:53 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0F25843CAF for ; Fri, 1 Dec 2006 16:02:35 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [69.147.83.53]) by cyrus.watson.org (Postfix) with ESMTP id 690FD46E95 for ; Fri, 1 Dec 2006 11:02:41 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [69.147.83.54]) by mx2.freebsd.org (Postfix) with ESMTP id 3B25614D247; Fri, 1 Dec 2006 16:02:35 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 1DA3F16A40F; Fri, 1 Dec 2006 16:02:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E70C916A47B for ; Fri, 1 Dec 2006 16:02:39 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5213943CB1 for ; Fri, 1 Dec 2006 16:02:20 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB1G2XXD009867 for ; Fri, 1 Dec 2006 16:02:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB1G2Woh009860 for perforce@freebsd.org; Fri, 1 Dec 2006 16:02:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 1 Dec 2006 16:02:32 GMT Message-Id: <200612011602.kB1G2Woh009860@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 110811 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Dec 2006 16:02:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=110811 Change 110811 by rwatson@rwatson_zoo on 2006/12/01 16:01:52 In the new world order, MAC Framework entry point functions are declared in mac_framework.h. Move the new audit entry points there from mac.h where they previously existed. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/mac/mac_framework.h#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/mac/mac_framework.h#2 (text+ko) ==== @@ -52,6 +52,7 @@ #include +struct auditinfo; struct bpf_d; struct cdev; struct componentname; @@ -411,6 +412,18 @@ int mac_priv_grant(struct ucred *cred, int priv); /* + * XXXRW: Audit checks should be above, but list them here to make a more + * sensible diff for now. + */ +int mac_check_system_audit(struct ucred *cred, void *record, int length); +int mac_check_system_auditon(struct ucred *cred, int cmd); +int mac_check_system_auditctl(struct ucred *cred, struct vnode *vp); +int mac_check_proc_getauid(struct ucred *cred); +int mac_check_proc_setauid(struct ucred *cred, uid_t auid); +int mac_check_proc_getaudit(struct ucred *cred); +int mac_check_proc_setaudit(struct ucred *cred, struct auditinfo *ai); + +/* * Calls to help various file systems implement labeling functionality * using their existing EA implementation. */