From owner-p4-projects Tue Aug 27 22:20:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2BBD237B401; Tue, 27 Aug 2002 22:20:33 -0700 (PDT) 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 DD51237B400 for ; Tue, 27 Aug 2002 22:20:32 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9719343E3B for ; Tue, 27 Aug 2002 22:20:32 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7S5KWJU076352 for ; Tue, 27 Aug 2002 22:20:32 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7S5KWgR076345 for perforce@freebsd.org; Tue, 27 Aug 2002 22:20:32 -0700 (PDT) Date: Tue, 27 Aug 2002 22:20:32 -0700 (PDT) Message-Id: <200208280520.g7S5KWgR076345@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16685 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://people.freebsd.org/~peter/p4db/chv.cgi?CH=16685 Change 16685 by rwatson@rwatson_paprika on 2002/08/27 22:19:39 Adopt sorting parallel to mac.h for pre_syscall, placing it with other process-related events. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#260 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#260 (text+ko) ==== @@ -656,6 +656,10 @@ case MAC_CREATE_PROC1: mpc->mpc_ops->mpo_create_proc1 = mpe->mpe_function; break; + case MAC_PRE_SYSCALL_RETURN: + mpc->mpc_ops->mpo_pre_syscall_return = + mpe->mpe_function; + break; case MAC_RELABEL_CRED: mpc->mpc_ops->mpo_relabel_cred = mpe->mpe_function; @@ -856,10 +860,6 @@ mpc->mpc_ops->mpo_check_vnode_write = mpe->mpe_function; break; - case MAC_PRE_SYSCALL_RETURN: - mpc->mpc_ops->mpo_pre_syscall_return = - mpe->mpe_function; - break; /* default: printf("MAC policy `%s': unknown operation %d\n", @@ -1330,6 +1330,13 @@ MAC_PERFORM(create_proc1, cred); } +void +mac_pre_syscall_return(void) +{ + + MAC_PERFORM(pre_syscall_return); +} + /* * When a new process is created, its label must be initialized. Generally, * this involves inheritence from the parent process, modulo possible @@ -2933,13 +2940,6 @@ return (mac_externalize(&so->so_label, extmac)); } -void -mac_pre_syscall_return(void) -{ - - MAC_PERFORM(pre_syscall_return); -} - int mac_getsockopt_peerlabel_get(struct ucred *cred, struct socket *so, struct mac *extmac) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message