From owner-svn-src-head@FreeBSD.ORG Tue Oct 28 09:12:13 2008 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6F1D8106567D; Tue, 28 Oct 2008 09:12:13 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5E5CF8FC20; Tue, 28 Oct 2008 09:12:13 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9S9CDjj088603; Tue, 28 Oct 2008 09:12:13 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9S9CDLh088602; Tue, 28 Oct 2008 09:12:13 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <200810280912.m9S9CDLh088602@svn.freebsd.org> From: Robert Watson Date: Tue, 28 Oct 2008 09:12:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r184401 - head/sys/security/mac_partition X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Oct 2008 09:12:13 -0000 Author: rwatson Date: Tue Oct 28 09:12:13 2008 New Revision: 184401 URL: http://svn.freebsd.org/changeset/base/184401 Log: Rename label_on_label() to partition_check(), which is far more suggestive as to its actual function. Obtained from: TrustedBSD Project MFC after: 3 days Modified: head/sys/security/mac_partition/mac_partition.c Modified: head/sys/security/mac_partition/mac_partition.c ============================================================================== --- head/sys/security/mac_partition/mac_partition.c Tue Oct 28 08:50:09 2008 (r184400) +++ head/sys/security/mac_partition/mac_partition.c Tue Oct 28 09:12:13 2008 (r184401) @@ -77,7 +77,7 @@ static int partition_slot; #define SLOT_SET(l, v) mac_label_set((l), partition_slot, (v)) static int -label_on_label(struct label *subject, struct label *object) +partition_check(struct label *subject, struct label *object) { if (partition_enabled == 0) @@ -133,7 +133,7 @@ partition_cred_check_visible(struct ucre { int error; - error = label_on_label(cr1->cr_label, cr2->cr_label); + error = partition_check(cr1->cr_label, cr2->cr_label); return (error == 0 ? 0 : ESRCH); } @@ -209,7 +209,7 @@ partition_inpcb_check_visible(struct ucr { int error; - error = label_on_label(cred->cr_label, inp->inp_cred->cr_label); + error = partition_check(cred->cr_label, inp->inp_cred->cr_label); return (error ? ENOENT : 0); } @@ -219,7 +219,7 @@ partition_proc_check_debug(struct ucred { int error; - error = label_on_label(cred->cr_label, p->p_ucred->cr_label); + error = partition_check(cred->cr_label, p->p_ucred->cr_label); return (error ? ESRCH : 0); } @@ -229,7 +229,7 @@ partition_proc_check_sched(struct ucred { int error; - error = label_on_label(cred->cr_label, p->p_ucred->cr_label); + error = partition_check(cred->cr_label, p->p_ucred->cr_label); return (error ? ESRCH : 0); } @@ -240,7 +240,7 @@ partition_proc_check_signal(struct ucred { int error; - error = label_on_label(cred->cr_label, p->p_ucred->cr_label); + error = partition_check(cred->cr_label, p->p_ucred->cr_label); return (error ? ESRCH : 0); } @@ -265,7 +265,7 @@ partition_socket_check_visible(struct uc { int error; - error = label_on_label(cred->cr_label, so->so_cred->cr_label); + error = partition_check(cred->cr_label, so->so_cred->cr_label); return (error ? ENOENT : 0); }