aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Watson <rwatson@FreeBSD.org>2002-07-30 22:28:28 +0000
committerRobert Watson <rwatson@FreeBSD.org>2002-07-30 22:28:28 +0000
commitfae89e29b16a3029b4ca31cea12ddba540887dc5 (patch)
treee8bc100c2e4703561dd32d3773a96f4d98034eb5
parent3b2e600940b97b6afe636dc9cc5a490de2b81325 (diff)
Notes
-rw-r--r--sys/sys/ucred.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h
index f1ae35019284..115fb7b88763 100644
--- a/sys/sys/ucred.h
+++ b/sys/sys/ucred.h
@@ -38,6 +38,14 @@
#define _SYS_UCRED_H_
/*
+ * XXXMAC: Recursively include mac.h due to an API assumption that it
+ * it is sufficient to include types.h and ucred.h to have a defined
+ * struct ucred. This should be changed so that struct ucred is not
+ * exported to userland via _KERNEL.
+ */
+#include <sys/mac.h>
+
+/*
* Credentials.
*
* Please do not inspect cr_uid directly to determine superuserness.
@@ -56,7 +64,8 @@ struct ucred {
struct uidinfo *cr_uidinfo; /* per euid resource consumption */
struct uidinfo *cr_ruidinfo; /* per ruid resource consumption */
struct prison *cr_prison; /* jail(4) */
-#define cr_endcopy cr_mtxp
+#define cr_endcopy cr_label
+ struct label cr_label; /* MAC label */
struct mtx *cr_mtxp; /* protect refcount */
};
#define NOCRED ((struct ucred *)0) /* no credential available */