PERFORCE change 19901 for review

[Robert Watson]

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

Change 19901 by rwatson at 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 at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message