From owner-p4-projects  Tue Oct 22 10: 4:30 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EFEC937B404; Tue, 22 Oct 2002 10:04:25 -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 9FFC737B401
	for <perforce@freebsd.org>; Tue, 22 Oct 2002 10:04:25 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E8E4B43E65
	for <perforce@freebsd.org>; Tue, 22 Oct 2002 10:04:23 -0700 (PDT)
	(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 g9MH3nmV016015
	for <perforce@freebsd.org>; Tue, 22 Oct 2002 10:03:49 -0700 (PDT)
	(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 g9MH3n4g016008
	for perforce@freebsd.org; Tue, 22 Oct 2002 10:03:49 -0700 (PDT)
Date: Tue, 22 Oct 2002 10:03:49 -0700 (PDT)
Message-Id: <200210221703.g9MH3n4g016008@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>
Subject: PERFORCE change 19901 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

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

Change 19901 by rwatson@rwatson_tislabs on 2002/10/22 10:03:38

	Reduce a variety of gratuitous diffs from the main tree to the
	MAC tree.

Affected files ...

.. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw.c#7 edit
.. //depot/projects/trustedbsd/mac/share/man/man9/VOP_ACCESS.9#9 edit
.. //depot/projects/trustedbsd/mac/share/man/man9/acl.9#9 edit
.. //depot/projects/trustedbsd/mac/share/man/man9/mac.9#9 edit
.. //depot/projects/trustedbsd/mac/share/man/man9/vaccess_acl_posix1e.9#5 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw.c#7 (text+ko) ====

@@ -25,7 +25,6 @@
 
 
 #include <sys/param.h>
-#include <sys/mac.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>

==== //depot/projects/trustedbsd/mac/share/man/man9/VOP_ACCESS.9#9 (text+ko) ====

@@ -144,8 +144,8 @@
 requested access.
 .El
 .Sh SEE ALSO
+.Xr vaccess 9 ,
 .Xr vaccess_acl_posix1e 9 ,
-.Xr vaccess 9 ,
 .Xr vnode 9
 .Sh AUTHORS
 This man page was written by

==== //depot/projects/trustedbsd/mac/share/man/man9/acl.9#9 (text+ko) ====

@@ -247,10 +247,9 @@
 .Ed
 .Sh SEE ALSO
 .Xr acl 3 ,
-.Xr vnaccess 9 ,
+.Xr vaccess 9 ,
 .Xr vaccess_acl_posix1e 9 ,
 .Xr VFS 9 ,
-.Xr vnaccess 9 ,
 .Xr VOP_ACLCHECK 9 ,
 .Xr VOP_GETACL 9 ,
 .Xr VOP_SETACL 9

==== //depot/projects/trustedbsd/mac/share/man/man9/mac.9#9 (text+ko) ====

@@ -5,10 +5,10 @@
 .\"
 .\" This software was developed by Robert Watson for the TrustedBSD Project.
 .\"
-.\" This software was developed for the FreeBSD Project in part by NAI Labs,
-.\" the Security Research Division of Network Associates, Inc. under
-.\" DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA
-.\" CHATS research program.
+.\" This software was developed for the FreeBSD Project in part by Network
+.\" Associates Laboratories, the Security Research Division of Network
+.\" Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035
+.\" ("CBOSS"), as part of the DARPA CHATS research program.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -347,7 +347,7 @@
 .Xr lomac 4 ,
 .Xr posix1e 3 ,
 .Xr ucred 9 ,
-.Xr vnaccess 9 ,
+.Xr vaccess 9 ,
 .Xr VFS 9 ,
 .Rs
 .%T "FreeBSD Developers' Handbook"

==== //depot/projects/trustedbsd/mac/share/man/man9/vaccess_acl_posix1e.9#5 (text+ko) ====

@@ -115,8 +115,8 @@
 appropriate privileges or to the owner of a file or other resource.
 .El
 .Sh SEE ALSO
-.Xr vaccess_dac 9 ,
-.Xr vnaccess 9 ,
+.Xr vaccess 9 ,
+.Xr vaccess_acl_posix1e 9 ,
 .Xr vnode 9 ,
 .Xr VOP_ACCESS 9
 .Sh AUTHORS

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message