From owner-p4-projects@FreeBSD.ORG Thu Jul 6 12:04:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B2C016A4E1; Thu, 6 Jul 2006 12:04:57 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 4BAFC16A4DE for ; Thu, 6 Jul 2006 12:04:57 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B888B43D53 for ; Thu, 6 Jul 2006 12:04:50 +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 k66C4itp070168 for ; Thu, 6 Jul 2006 12:04:44 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 k66C4i0f070165 for perforce@freebsd.org; Thu, 6 Jul 2006 12:04:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 6 Jul 2006 12:04:44 GMT Message-Id: <200607061204.k66C4i0f070165@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 100734 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: Thu, 06 Jul 2006 12:04:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=100734 Change 100734 by rwatson@rwatson_zoo on 2006/07/06 12:04:13 Rename. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/kern/init_main.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_acct.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_acl.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_environment.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_exec.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_exit.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_fork.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_jail.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_ktrace.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_linker.c#3 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/kern/init_main.c#3 (text+ko) ==== @@ -445,7 +445,7 @@ audit_proc_kproc0(p); #endif #ifdef MAC - mac_create_proc0(p->p_ucred); + mac_proc_create_swapper(p->p_ucred); #endif td->td_ucred = crhold(p->p_ucred); @@ -704,7 +704,7 @@ oldcred = initproc->p_ucred; crcopy(newcred, oldcred); #ifdef MAC - mac_create_proc1(newcred); + mac_proc_create_init(newcred); #endif #ifdef AUDIT audit_proc_init(initproc); ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_acct.c#3 (text+ko) ==== @@ -180,7 +180,7 @@ vfslocked = NDHASGIANT(&nd); NDFREE(&nd, NDF_ONLY_PNBUF); #ifdef MAC - error = mac_check_system_acct(td->td_ucred, nd.ni_vp); + error = mac_system_check_acct(td->td_ucred, nd.ni_vp); if (error) { VOP_UNLOCK(nd.ni_vp, 0, td); vn_close(nd.ni_vp, flags, td->td_ucred, td); @@ -197,7 +197,7 @@ VFS_UNLOCK_GIANT(vfslocked); #ifdef MAC } else { - error = mac_check_system_acct(td->td_ucred, NULL); + error = mac_system_check_acct(td->td_ucred, NULL); if (error) return (error); #endif ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_acl.c#3 (text+ko) ==== @@ -673,7 +673,7 @@ VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); #ifdef MAC - error = mac_check_vnode_setacl(td->td_ucred, vp, type, &inkernacl); + error = mac_vnode_check_setacl(td->td_ucred, vp, type, &inkernacl); if (error != 0) goto out; #endif @@ -699,7 +699,7 @@ VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); #ifdef MAC - error = mac_check_vnode_getacl(td->td_ucred, vp, type); + error = mac_vnode_check_getacl(td->td_ucred, vp, type); if (error != 0) goto out; #endif @@ -728,7 +728,7 @@ VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); #ifdef MAC - error = mac_check_vnode_deleteacl(td->td_ucred, vp, type); + error = mac_vnode_check_deleteacl(td->td_ucred, vp, type); if (error) goto out; #endif ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_environment.c#3 (text+ko) ==== @@ -95,7 +95,7 @@ error = 0; if (uap->what == KENV_DUMP) { #ifdef MAC - error = mac_check_kenv_dump(td->td_ucred); + error = mac_kenv_check_dump(td->td_ucred); if (error) return (error); #endif @@ -138,7 +138,7 @@ switch (uap->what) { case KENV_GET: #ifdef MAC - error = mac_check_kenv_get(td->td_ucred, name); + error = mac_kenv_check_get(td->td_ucred, name); if (error) goto done; #endif @@ -171,7 +171,7 @@ goto done; } #ifdef MAC - error = mac_check_kenv_set(td->td_ucred, name, value); + error = mac_kenv_check_set(td->td_ucred, name, value); if (error == 0) #endif setenv(name, value); @@ -179,7 +179,7 @@ break; case KENV_UNSET: #ifdef MAC - error = mac_check_kenv_unset(td->td_ucred, name); + error = mac_kenv_check_unset(td->td_ucred, name); if (error) goto done; #endif ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_exec.c#3 (text+ko) ==== @@ -437,7 +437,7 @@ NDFREE(ndp, NDF_ONLY_PNBUF); #ifdef MAC interplabel = mac_vnode_label_alloc(); - mac_copy_vnode_label(ndp->ni_vp->v_label, interplabel); + mac_vnode_copy_label(ndp->ni_vp->v_label, interplabel); #endif vput(ndp->ni_vp); vm_object_deallocate(imgp->object); @@ -1187,7 +1187,7 @@ return (error); #ifdef MAC - error = mac_check_vnode_exec(td->td_ucred, imgp->vp, imgp); + error = mac_vnode_check_exec(td->td_ucred, imgp->vp, imgp); if (error) return (error); #endif ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_exit.c#3 (text+ko) ==== @@ -813,7 +813,7 @@ */ vm_waitproc(p); #ifdef MAC - mac_destroy_proc(p); + mac_proc_destroy(p); #endif #ifdef AUDIT audit_proc_free(p); ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_fork.c#3 (text+ko) ==== @@ -288,7 +288,7 @@ /* Allocate new proc. */ newproc = uma_zalloc(proc_zone, M_WAITOK); #ifdef MAC - mac_init_proc(newproc); + mac_proc_init(newproc); #endif #ifdef AUDIT audit_proc_alloc(newproc); @@ -758,7 +758,7 @@ td->td_ucred->cr_ruid); sx_xunlock(&allproc_lock); #ifdef MAC - mac_destroy_proc(newproc); + mac_proc_destroy(newproc); #endif #ifdef AUDIT audit_proc_free(newproc); ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_jail.c#3 (text+ko) ==== @@ -225,7 +225,7 @@ if ((error = change_dir(pr->pr_root, td)) != 0) goto e_unlock; #ifdef MAC - if ((error = mac_check_vnode_chroot(td->td_ucred, pr->pr_root))) + if ((error = mac_vnode_check_chroot(td->td_ucred, pr->pr_root))) goto e_unlock; #endif VOP_UNLOCK(pr->pr_root, 0, td); ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_ktrace.c#3 (text+ko) ==== @@ -949,7 +949,7 @@ vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); (void)VOP_LEASE(vp, td, cred, LEASE_WRITE); #ifdef MAC - error = mac_check_vnode_write(cred, NOCRED, vp); + error = mac_vnode_check_write(cred, NOCRED, vp); if (error == 0) #endif error = VOP_WRITE(vp, &auio, IO_UNIT | IO_APPEND, cred); ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_linker.c#3 (text+ko) ==== @@ -552,7 +552,7 @@ if (securelevel > 0) return (EPERM); #ifdef MAC - error = mac_check_kld_unload(curthread->td_ucred); + error = mac_kld_check_unload(curthread->td_ucred); if (error) return (error); #endif @@ -985,7 +985,7 @@ int error; #ifdef MAC - error = mac_check_kld_stat(td->td_ucred); + error = mac_kld_check_stat(td->td_ucred); if (error) return (error); #endif @@ -1019,7 +1019,7 @@ int error = 0; #ifdef MAC - error = mac_check_kld_stat(td->td_ucred); + error = mac_kld_check_stat(td->td_ucred); if (error) return (error); #endif @@ -1065,7 +1065,7 @@ return (EINVAL); #ifdef MAC - error = mac_check_kld_stat(td->td_ucred); + error = mac_kld_check_stat(td->td_ucred); if (error) return (error); #endif @@ -1103,7 +1103,7 @@ int error = 0; #ifdef MAC - error = mac_check_kld_stat(td->td_ucred); + error = mac_kld_check_stat(td->td_ucred); if (error) return (error); #endif @@ -1138,7 +1138,7 @@ int error = 0; #ifdef MAC - error = mac_check_kld_stat(td->td_ucred); + error = mac_kld_check_stat(td->td_ucred); if (error) return (error); #endif @@ -1983,7 +1983,7 @@ int error; #ifdef MAC - error = mac_check_kld_stat(req->td->td_ucred); + error = mac_kld_check_stat(req->td->td_ucred); if (error) return (error); #endif