From owner-p4-projects@FreeBSD.ORG  Wed May 30 08:15:59 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A8DDF16A46C; Wed, 30 May 2007 08:15:59 +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 86FDE16A469
	for <perforce@freebsd.org>; Wed, 30 May 2007 08:15:59 +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 7434713C457
	for <perforce@freebsd.org>; Wed, 30 May 2007 08:15:59 +0000 (UTC)
	(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.8/8.13.8) with ESMTP id l4U8FxML090018
	for <perforce@freebsd.org>; Wed, 30 May 2007 08:15:59 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4U8FxM1090012
	for perforce@freebsd.org; Wed, 30 May 2007 08:15:59 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 30 May 2007 08:15:59 GMT
Message-Id: <200705300815.l4U8FxM1090012@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 <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 120602 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 30 May 2007 08:16:00 -0000

http://perforce.freebsd.org/chv.cgi?CH=120602

Change 120602 by rwatson@rwatson_zoo on 2007/05/30 08:15:41

	Remove duplicate test functions that got brought in when the MAC
	audit support was looped back from CVS.

Affected files ...

.. //depot/projects/trustedbsd/audit3/sys/security/mac_test/mac_test.c#11 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/sys/security/mac_test/mac_test.c#11 (text+ko) ====

@@ -1681,24 +1681,6 @@
 
 COUNTER_DECL(check_proc_setuid);
 static int
-mac_test_check_proc_setaudit(struct ucred *cred, struct auditinfo *ai)
-{
-
-	ASSERT_CRED_LABEL(cred->cr_label);
-
-	return (0);
-}
-
-static int
-mac_test_check_proc_setauid(struct ucred *cred, uid_t auid)
-{
-
-	ASSERT_CRED_LABEL(cred->cr_label);
-
-	return (0);
-}
-
-static int
 mac_test_check_proc_setuid(struct ucred *cred, uid_t uid)
 {
 
@@ -1982,15 +1964,6 @@
 	return (0);
 }
 
-static int
-mac_test_check_system_audit(struct ucred *cred, void *record, int length)
-{
-
-	ASSERT_CRED_LABEL(cred->cr_label);
-
-	return (0);
-}
-
 COUNTER_DECL(check_system_auditctl);
 static int
 mac_test_check_system_auditctl(struct ucred *cred, struct vnode *vp,