From b8be9d15c80e9347b73f94f7dc61f3081fc883ef Mon Sep 17 00:00:00 2001
From: Robert Watson <rwatson@FreeBSD.org>
Date: Thu, 21 Aug 2003 16:53:06 +0000
Subject: [PATCH] Hook up repo-copied mac_none.4 to mac_stub.4.

Update mac_none to reflect change in role; xref mac_stub.

Update mac_stub to reflect name change, arrival in 5.1; xref
mac_none.

Obtained from:	TrustedBSD Project
Sponsored by:	DARPA, Network Associates Laboratories
---
 share/man/man4/Makefile   |  1 +
 share/man/man4/mac_none.4 | 12 +++++++-----
 share/man/man4/mac_stub.4 | 23 ++++++++++++++---------
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index becb0f0643de..0556f2656af2 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -125,6 +125,7 @@ MAN=	aac.4 \
 	mac_partition.4 \
 	mac_portacl.4 \
 	mac_seeotheruids.4 \
+	mac_stub.4 \
 	mac_test.4 \
 	mouse.4 \
 	mtio.4 \
diff --git a/share/man/man4/mac_none.4 b/share/man/man4/mac_none.4
index 53f3e4c981e6..c91410caa488 100644
--- a/share/man/man4/mac_none.4
+++ b/share/man/man4/mac_none.4
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2002 Networks Associates Technology, Inc.
+.\" Copyright (c) 2002, 2003 Networks Associates Technology, Inc.
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by Chris Costello
@@ -35,9 +35,9 @@
 .Dt MAC_NONE 4
 .Sh NAME
 .Nm mac_none
-.Nd "sample MAC policy module"
+.Nd "null MAC policy module"
 .Sh SYNOPSIS
-To compile the sample policy
+To compile the null policy
 into your kernel, place the following lines in your kernel
 configuration file:
 .Bd -ragged -offset indent
@@ -61,8 +61,9 @@ The
 .Nm
 policy module implements a sample MAC policy that has no effect on
 access control in the system.
-Each MAC entry point is a
-.Dq no-op .
+Unlinke
+.Xr 4 mac_stub ,
+none of the MAC entry points are defined.
 .Ss Label Format
 No labels are defined for
 .Nm .
@@ -76,6 +77,7 @@ No labels are defined for
 .Xr mac_partition 4 ,
 .Xr mac_portacl 4 ,
 .Xr mac_seeotheruids 4 ,
+.Xr mac_stub 4 ,
 .Xr mac_test 4 ,
 .Xr mac 9
 .Sh HISTORY
diff --git a/share/man/man4/mac_stub.4 b/share/man/man4/mac_stub.4
index 53f3e4c981e6..68c71e2f6bb3 100644
--- a/share/man/man4/mac_stub.4
+++ b/share/man/man4/mac_stub.4
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2002 Networks Associates Technology, Inc.
+.\" Copyright (c) 2002, 2003 Networks Associates Technology, Inc.
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by Chris Costello
@@ -32,17 +32,17 @@
 .\"
 .Dd December 1, 2002
 .Os
-.Dt MAC_NONE 4
+.Dt MAC_STUB 4
 .Sh NAME
-.Nm mac_none
-.Nd "sample MAC policy module"
+.Nm mac_stub
+.Nd "MAC policy stub module"
 .Sh SYNOPSIS
 To compile the sample policy
 into your kernel, place the following lines in your kernel
 configuration file:
 .Bd -ragged -offset indent
 .Cd "options MAC"
-.Cd "options MAC_NONE"
+.Cd "options MAC_STUB"
 .Ed
 .Pp
 Alternately, to load the sample module at boot time, place the following line
@@ -54,15 +54,19 @@ in your kernel configuration file:
 and in
 .Xr loader.conf 5 :
 .Bd -literal -offset indent
-mac_none_load="YES"
+mac_stub_load="YES"
 .Ed
 .Sh DESCRIPTION
 The
 .Nm
 policy module implements a sample MAC policy that has no effect on
 access control in the system.
-Each MAC entry point is a
-.Dq no-op .
+Unlinke
+.Xr 4 mac_none ,
+each MAC entry point is defined as a
+.Dq no-op ,
+so the policy module will be entered for each event, but no change
+in system behavior should result.
 .Ss Label Format
 No labels are defined for
 .Nm .
@@ -73,6 +77,7 @@ No labels are defined for
 .Xr mac_ifoff 4 ,
 .Xr mac_lomac 4 ,
 .Xr mac_mls 4 ,
+.Xr mac_none 4 ,
 .Xr mac_partition 4 ,
 .Xr mac_portacl 4 ,
 .Xr mac_seeotheruids 4 ,
@@ -82,7 +87,7 @@ No labels are defined for
 The
 .Nm
 policy module first appeared in
-.Fx 5.0
+.Fx 5.1
 and was developed by the
 .Tn TrustedBSD
 Project.