From owner-p4-projects Sat Nov 16 20:25: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A76D337B404; Sat, 16 Nov 2002 20:24:57 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 268F237B401 for ; Sat, 16 Nov 2002 20:24:57 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C097A43E88 for ; Sat, 16 Nov 2002 20:24:56 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAH4MBmV023648 for ; Sat, 16 Nov 2002 20:22:11 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAH4MAqf023645 for perforce@freebsd.org; Sat, 16 Nov 2002 20:22:10 -0800 (PST) Date: Sat, 16 Nov 2002 20:22:10 -0800 (PST) Message-Id: <200211170422.gAH4MAqf023645@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 Subject: PERFORCE change 21129 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21129 Change 21129 by rwatson@rwatson_paprika on 2002/11/16 20:22:03 Rename mac_check_kld_observe() to mac_check_kld_stat() to improve congruence with mount_stat(), vnode_stat(), and actually interface names (kldstat, modstat, etc). Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_linker.c#17 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#363 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#110 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#86 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#219 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#173 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_linker.c#17 (text+ko) ==== @@ -832,7 +832,7 @@ int error = 0; #ifdef MAC - error = mac_check_kld_observe(curthread->td_ucred); + error = mac_check_kld_stat(curthread->td_ucred); if (error) return (error); #endif @@ -868,7 +868,7 @@ int error = 0; #ifdef MAC - error = mac_check_kld_observe(curthread->td_ucred); + error = mac_check_kld_stat(curthread->td_ucred); if (error) return (error); #endif @@ -909,7 +909,7 @@ struct kld_file_stat *stat; #ifdef MAC - error = mac_check_kld_observe(curthread->td_ucred); + error = mac_check_kld_stat(curthread->td_ucred); if (error) return (error); #endif @@ -964,7 +964,7 @@ int error = 0; #ifdef MAC - error = mac_check_kld_observe(curthread->td_ucred); + error = mac_check_kld_stat(curthread->td_ucred); if (error) return (error); #endif @@ -999,7 +999,7 @@ int error = 0; #ifdef MAC - error = mac_check_kld_observe(curthread->td_ucred); + error = mac_check_kld_stat(curthread->td_ucred); if (error) return (error); #endif @@ -1838,7 +1838,7 @@ int error; #ifdef MAC - error = mac_check_kld_observe(curthread->td_ucred); + error = mac_check_kld_stat(curthread->td_ucred); if (error) return (error); #endif ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#363 (text+ko) ==== @@ -2335,14 +2335,14 @@ } int -mac_check_kld_observe(struct ucred *cred) +mac_check_kld_stat(struct ucred *cred) { int error; if (!mac_enforce_system) return (0); - MAC_CHECK(check_kld_observe, cred); + MAC_CHECK(check_kld_stat, cred); return (error); } ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#110 (text+ko) ==== @@ -527,7 +527,7 @@ } static int -mac_none_check_kld_observe(struct ucred *cred) +mac_none_check_kld_stat(struct ucred *cred) { return (0); @@ -1040,7 +1040,7 @@ .mpo_check_kenv_set = mac_none_check_kenv_set, .mpo_check_kenv_unset = mac_none_check_kenv_unset, .mpo_check_kld_load = mac_none_check_kld_load, - .mpo_check_kld_observe = mac_none_check_kld_observe, + .mpo_check_kld_stat = mac_none_check_kld_stat, .mpo_check_kld_unload = mac_none_check_kld_unload, .mpo_check_mount_stat = mac_none_check_mount_stat, .mpo_check_pipe_ioctl = mac_none_check_pipe_ioctl, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#86 (text+ko) ==== @@ -923,7 +923,7 @@ } static int -mac_test_check_kld_observe(struct ucred *cred) +mac_test_check_kld_stat(struct ucred *cred) { return (0); @@ -1437,7 +1437,7 @@ .mpo_check_kenv_set = mac_test_check_kenv_set, .mpo_check_kenv_unset = mac_test_check_kenv_unset, .mpo_check_kld_load = mac_test_check_kld_load, - .mpo_check_kld_observe = mac_test_check_kld_observe, + .mpo_check_kld_stat = mac_test_check_kld_stat, .mpo_check_kld_unload = mac_test_check_kld_unload, .mpo_check_mount_stat = mac_test_check_mount_stat, .mpo_check_pipe_ioctl = mac_test_check_pipe_ioctl, ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#219 (text+ko) ==== @@ -240,7 +240,7 @@ int mac_check_kenv_set(struct ucred *cred, char *name, char *value); int mac_check_kenv_unset(struct ucred *cred, char *name); int mac_check_kld_load(struct ucred *cred, struct vnode *vp); -int mac_check_kld_observe(struct ucred *cred); +int mac_check_kld_stat(struct ucred *cred); int mac_check_kld_unload(struct ucred *cred); int mac_check_mount_stat(struct ucred *cred, struct mount *mp); int mac_check_pipe_ioctl(struct ucred *cred, struct pipe *pipe, ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#173 (text+ko) ==== @@ -276,7 +276,7 @@ int (*mpo_check_kenv_unset)(struct ucred *cred, char *name); int (*mpo_check_kld_load)(struct ucred *cred, struct vnode *vp, struct label *vlabel); - int (*mpo_check_kld_observe)(struct ucred *cred); + int (*mpo_check_kld_stat)(struct ucred *cred); int (*mpo_check_kld_unload)(struct ucred *cred); int (*mpo_check_mount_stat)(struct ucred *cred, struct mount *mp, struct label *mntlabel); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message