Define 'struct label' in _label.h rather than mac.h, which will permit

us to reduce namespace pollution by doing a nested include of _label.h
rather than mac.h.  mac.h contains lots of baggage, whereas _label.h
contains much less.  A follow-up sweep to change nested inclusion will
follow.  The problem regarding exporting 'struct label' to userland
due to excessive exporting of kernel structures to userland still
needs to be resolved.

Obtained from:	TrustedBSD Project
Sponsored by:	DARPA, NAI Labs
Suggested by:	bde

3 files changed, 61 insertions, 36 deletions

diff --git a/sys/security/mac/mac_framework.h b/sys/security/mac/mac_framework.h
index 05aa0a9..feb1aea 100644
--- a/sys/security/mac/mac_framework.h
+++ b/sys/security/mac/mac_framework.h
@@ -45,6 +45,8 @@
 #ifndef _SYS_MAC_H
 #define	_SYS_MAC_H
 
+#include <sys/_label.h>
+
 #ifndef _POSIX_MAC
 #define	_POSIX_MAC
 #endif
@@ -177,24 +179,6 @@ int	__mac_set_file(const char *_path_p, struct mac *_mac_p);
 int	__mac_set_proc(struct mac *_mac_p);
 
 #else /* _KERNEL */
-#endif /* _KERNEL */
-
-/*
- * XXXMAC: This shouldn't be exported to userland, but is because of ucred.h
- * and various other messes.
- */
-
-#define	MAC_MAX_POLICIES	4
-
-struct label {
-	int	l_flags;
-	union {
-		void	*l_ptr;
-		long	 l_long;
-	}	l_perpolicy[MAC_MAX_POLICIES];
-};
-
-#ifdef _KERNEL
 
 /*
  * MAC entry point operations
diff --git a/sys/sys/_label.h b/sys/sys/_label.h
new file mode 100644
index 0000000..98c08d7
--- /dev/null
+++ b/sys/sys/_label.h
@@ -0,0 +1,57 @@
+/*-
+ * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson
+ * Copyright (c) 2001, 2002 Networks Associates Technology, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ *
+ * 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.
+ * 3. The names of the authors may not be used to endorse or promote
+ *    products derived from this software without specific prior written
+ *    permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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$
+ */
+#ifndef _SYS__LABEL_H
+#define	_SYS__LABEL_H
+
+/*
+ * XXXMAC: This shouldn't be exported to userland, but is because of ucred.h
+ * and various other messes.
+ */
+
+#define	MAC_MAX_POLICIES	4
+
+struct label {
+	int	l_flags;
+	union {
+		void	*l_ptr;
+		long	 l_long;
+	}	l_perpolicy[MAC_MAX_POLICIES];
+};
+
+#endif /* !_SYS__LABEL_H */
diff --git a/sys/sys/mac.h b/sys/sys/mac.h
index 05aa0a9..feb1aea 100644
--- a/sys/sys/mac.h
+++ b/sys/sys/mac.h
@@ -45,6 +45,8 @@
 #ifndef _SYS_MAC_H
 #define	_SYS_MAC_H
 
+#include <sys/_label.h>
+
 #ifndef _POSIX_MAC
 #define	_POSIX_MAC
 #endif
@@ -177,24 +179,6 @@ int	__mac_set_file(const char *_path_p, struct mac *_mac_p);
 int	__mac_set_proc(struct mac *_mac_p);
 
 #else /* _KERNEL */
-#endif /* _KERNEL */
-
-/*
- * XXXMAC: This shouldn't be exported to userland, but is because of ucred.h
- * and various other messes.
- */
-
-#define	MAC_MAX_POLICIES	4
-
-struct label {
-	int	l_flags;
-	union {
-		void	*l_ptr;
-		long	 l_long;
-	}	l_perpolicy[MAC_MAX_POLICIES];
-};
-
-#ifdef _KERNEL
 
 /*
  * MAC entry point operations