From 1e5294bc0ad767219f2b0daeb63b91b51baf53b7 Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Fri, 7 Jul 2006 14:02:17 +0000 Subject: [PATCH] Following repo-copy of mac_is_present_np.3 to mac_is_present.3, remove old file, update references, etc. The C function is already named mac_is_present(). Obtained from: TrustedBSD Project --- lib/libc/posix1e/Makefile.inc | 2 +- lib/libc/posix1e/mac_is_present.3 | 4 +- lib/libc/posix1e/mac_is_present_np.3 | 87 ---------------------------- lib/libc/posix1e/mac_prepare.3 | 2 +- lib/libc/posix1e/mac_set.3 | 2 +- lib/libc/posix1e/mac_text.3 | 2 +- 6 files changed, 6 insertions(+), 93 deletions(-) delete mode 100644 lib/libc/posix1e/mac_is_present_np.3 diff --git a/lib/libc/posix1e/Makefile.inc b/lib/libc/posix1e/Makefile.inc index 91422d4c21d2..99f58e3c42e2 100644 --- a/lib/libc/posix1e/Makefile.inc +++ b/lib/libc/posix1e/Makefile.inc @@ -53,7 +53,7 @@ MAN+= acl.3 \ mac.3 \ mac.conf.5 \ mac_free.3 \ - mac_is_present_np.3 \ + mac_is_present.3 \ mac_get.3 \ mac_prepare.3 \ mac_set.3 \ diff --git a/lib/libc/posix1e/mac_is_present.3 b/lib/libc/posix1e/mac_is_present.3 index 6466488d7752..4d2974848967 100644 --- a/lib/libc/posix1e/mac_is_present.3 +++ b/lib/libc/posix1e/mac_is_present.3 @@ -34,7 +34,7 @@ .Dt MAC_IS_PRESENT_NP 3 .Os .Sh NAME -.Nm mac_is_present_np +.Nm mac_is_present .Nd report whether the running system has MAC support .Sh LIBRARY .Lb libc @@ -44,7 +44,7 @@ .Fn mac_is_present "const char *policyname" .Sh DESCRIPTION The -.Fn mac_is_present_np +.Fn mac_is_present function determines whether the currently-running kernel supports MAC for a given policy or not. If diff --git a/lib/libc/posix1e/mac_is_present_np.3 b/lib/libc/posix1e/mac_is_present_np.3 deleted file mode 100644 index 6466488d7752..000000000000 --- a/lib/libc/posix1e/mac_is_present_np.3 +++ /dev/null @@ -1,87 +0,0 @@ -.\" Copyright (c) 2002 Networks Associates Technology, Inc. -.\" All rights reserved. -.\" -.\" This software was developed for the FreeBSD Project by Chris -.\" Costello at Safeport Network Services and 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. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $FreeBSD$ -.\" -.Dd January 9, 2002 -.Dt MAC_IS_PRESENT_NP 3 -.Os -.Sh NAME -.Nm mac_is_present_np -.Nd report whether the running system has MAC support -.Sh LIBRARY -.Lb libc -.Sh SYNOPSIS -.In sys/mac.h -.Ft int -.Fn mac_is_present "const char *policyname" -.Sh DESCRIPTION -The -.Fn mac_is_present_np -function determines whether the currently-running kernel supports MAC for -a given policy or not. -If -.Fa policyname -is -.No non- Ns Dv NULL , -the presence of the named policy -(e.g.\& -.Dq Li biba , -.Dq Li mls , -.Dq Li te ) -is checked, otherwise the presence of any MAC policies at all is checked. -.Sh RETURN VALUES -If the system supports the given MAC policy, the value 1 is returned. -If the specified MAC policy is not supported, the value 0 is returned. -If an error occurs, the value \-1 is returned. -.Sh ERRORS -.Bl -tag -width Er -.It Bq Er EINVAL -The value of -.Fa policyname -is not valid. -.It Bq Er ENOMEM -Insufficient memory was available to allocate internal storage. -.El -.Sh SEE ALSO -.Xr mac 3 , -.Xr mac_free 3 , -.Xr mac_get 3 , -.Xr mac_prepare 3 , -.Xr mac_set 3 , -.Xr mac_text 3 , -.Xr mac 4 , -.Xr mac 9 -.Sh HISTORY -Support for Mandatory Access Control was introduced in -.Fx 5.0 -as part of the -.Tn TrustedBSD -Project. diff --git a/lib/libc/posix1e/mac_prepare.3 b/lib/libc/posix1e/mac_prepare.3 index 2e5f25ae2311..1d8522908f9a 100644 --- a/lib/libc/posix1e/mac_prepare.3 +++ b/lib/libc/posix1e/mac_prepare.3 @@ -103,7 +103,7 @@ respectively. .Xr mac 3 , .Xr mac_free 3 , .Xr mac_get 3 , -.Xr mac_is_present_np 3 , +.Xr mac_is_present 3 , .Xr mac_set 3 , .Xr mac 4 , .Xr mac.conf 5 , diff --git a/lib/libc/posix1e/mac_set.3 b/lib/libc/posix1e/mac_set.3 index 175a25a11556..84a1800412df 100644 --- a/lib/libc/posix1e/mac_set.3 +++ b/lib/libc/posix1e/mac_set.3 @@ -135,7 +135,7 @@ is not a directory. .Xr mac 3 , .Xr mac_free 3 , .Xr mac_get 3 , -.Xr mac_is_present_np 3 , +.Xr mac_is_present 3 , .Xr mac_prepare 3 , .Xr mac_text 3 , .Xr mac 4 , diff --git a/lib/libc/posix1e/mac_text.3 b/lib/libc/posix1e/mac_text.3 index 068533a215a6..66c1e2113948 100644 --- a/lib/libc/posix1e/mac_text.3 +++ b/lib/libc/posix1e/mac_text.3 @@ -95,7 +95,7 @@ to allocate internal storage. .Xr free 3 , .Xr mac 3 , .Xr mac_get 3 , -.Xr mac_is_present_np 3 , +.Xr mac_is_present 3 , .Xr mac_prepare 3 , .Xr mac_set 3 , .Xr mac 4 ,