aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/security/mac/mac_internal.h7
-rw-r--r--sys/security/mac/mac_policy.h15
-rw-r--r--sys/security/mac_biba/mac_biba.c2
-rw-r--r--sys/security/mac_bsdextended/mac_bsdextended.c2
-rw-r--r--sys/security/mac_ifoff/mac_ifoff.c2
-rw-r--r--sys/security/mac_lomac/mac_lomac.c2
-rw-r--r--sys/security/mac_mls/mac_mls.c2
-rw-r--r--sys/security/mac_ntpd/mac_ntpd.c2
-rw-r--r--sys/security/mac_partition/mac_partition.c2
-rw-r--r--sys/security/mac_portacl/mac_portacl.c2
-rw-r--r--sys/security/mac_priority/mac_priority.c2
-rw-r--r--sys/security/mac_seeotheruids/mac_seeotheruids.c2
-rw-r--r--sys/security/mac_stub/mac_stub.c2
-rw-r--r--sys/security/mac_test/mac_test.c2
-rw-r--r--sys/security/mac_veriexec/mac_veriexec.c2
15 files changed, 15 insertions, 33 deletions
diff --git a/sys/security/mac/mac_internal.h b/sys/security/mac/mac_internal.h
index 4b2be98b4e03..c35504e04ea9 100644
--- a/sys/security/mac/mac_internal.h
+++ b/sys/security/mac/mac_internal.h
@@ -57,13 +57,6 @@
#include <sys/rmlock.h>
/*
- * MAC Framework sysctl namespace.
- */
-#ifdef SYSCTL_DECL
-SYSCTL_DECL(_security_mac);
-#endif /* SYSCTL_DECL */
-
-/*
* MAC Framework SDT DTrace probe namespace, macros for declaring entry
* point probes, macros for invoking them.
*/
diff --git a/sys/security/mac/mac_policy.h b/sys/security/mac/mac_policy.h
index 3c8eec69f17e..89239c0869c3 100644
--- a/sys/security/mac/mac_policy.h
+++ b/sys/security/mac/mac_policy.h
@@ -1034,4 +1034,19 @@ int mac_policy_modevent(module_t mod, int type, void *data);
intptr_t mac_label_get(struct label *l, int slot);
void mac_label_set(struct label *l, int slot, intptr_t v);
+/*
+ * Common MAC Framework's sysctl and jail parameters' sysctl nodes' declarations.
+ *
+ * Headers <sys/jail.h> and <sys/sysctl.h> normally have to be included before
+ * this header as style(9) hints to. If they weren't, just forego the
+ * corresponding declarations, assuming they are not needed.
+ */
+#ifdef SYSCTL_DECL
+SYSCTL_DECL(_security_mac);
+#endif
+
+#ifdef SYSCTL_JAIL_PARAM_DECL
+SYSCTL_JAIL_PARAM_DECL(mac);
+#endif
+
#endif /* !_SECURITY_MAC_MAC_POLICY_H_ */
diff --git a/sys/security/mac_biba/mac_biba.c b/sys/security/mac_biba/mac_biba.c
index 2d0df254f94c..8b683dc380eb 100644
--- a/sys/security/mac_biba/mac_biba.c
+++ b/sys/security/mac_biba/mac_biba.c
@@ -88,8 +88,6 @@
#include <security/mac/mac_policy.h>
#include <security/mac_biba/mac_biba.h>
-SYSCTL_DECL(_security_mac);
-
static SYSCTL_NODE(_security_mac, OID_AUTO, biba,
CTLFLAG_RW | CTLFLAG_MPSAFE, 0,
"TrustedBSD mac_biba policy controls");
diff --git a/sys/security/mac_bsdextended/mac_bsdextended.c b/sys/security/mac_bsdextended/mac_bsdextended.c
index 95efc537735a..8a6549214380 100644
--- a/sys/security/mac_bsdextended/mac_bsdextended.c
+++ b/sys/security/mac_bsdextended/mac_bsdextended.c
@@ -68,8 +68,6 @@
static struct mtx ugidfw_mtx;
-SYSCTL_DECL(_security_mac);
-
static SYSCTL_NODE(_security_mac, OID_AUTO, bsdextended,
CTLFLAG_RW | CTLFLAG_MPSAFE, 0,
"TrustedBSD extended BSD MAC policy controls");
diff --git a/sys/security/mac_ifoff/mac_ifoff.c b/sys/security/mac_ifoff/mac_ifoff.c
index b5a65f4765b2..97fc306990ee 100644
--- a/sys/security/mac_ifoff/mac_ifoff.c
+++ b/sys/security/mac_ifoff/mac_ifoff.c
@@ -58,8 +58,6 @@
#include <security/mac/mac_policy.h>
-SYSCTL_DECL(_security_mac);
-
static SYSCTL_NODE(_security_mac, OID_AUTO, ifoff,
CTLFLAG_RW | CTLFLAG_MPSAFE, 0,
"TrustedBSD mac_ifoff policy controls");
diff --git a/sys/security/mac_lomac/mac_lomac.c b/sys/security/mac_lomac/mac_lomac.c
index 761214db07e4..d878f9a7b965 100644
--- a/sys/security/mac_lomac/mac_lomac.c
+++ b/sys/security/mac_lomac/mac_lomac.c
@@ -89,8 +89,6 @@ struct mac_lomac_proc {
struct mtx mtx;
};
-SYSCTL_DECL(_security_mac);
-
static SYSCTL_NODE(_security_mac, OID_AUTO, lomac,
CTLFLAG_RW | CTLFLAG_MPSAFE, 0,
"TrustedBSD mac_lomac policy controls");
diff --git a/sys/security/mac_mls/mac_mls.c b/sys/security/mac_mls/mac_mls.c
index 4c87b4c7f5ce..3cdf438ea6b9 100644
--- a/sys/security/mac_mls/mac_mls.c
+++ b/sys/security/mac_mls/mac_mls.c
@@ -89,8 +89,6 @@
#include <security/mac/mac_policy.h>
#include <security/mac_mls/mac_mls.h>
-SYSCTL_DECL(_security_mac);
-
static SYSCTL_NODE(_security_mac, OID_AUTO, mls,
CTLFLAG_RW | CTLFLAG_MPSAFE, 0,
"TrustedBSD mac_mls policy controls");
diff --git a/sys/security/mac_ntpd/mac_ntpd.c b/sys/security/mac_ntpd/mac_ntpd.c
index 3125bc057be8..1aeaeb032bb8 100644
--- a/sys/security/mac_ntpd/mac_ntpd.c
+++ b/sys/security/mac_ntpd/mac_ntpd.c
@@ -34,8 +34,6 @@
#include <security/mac/mac_policy.h>
-SYSCTL_DECL(_security_mac);
-
static SYSCTL_NODE(_security_mac, OID_AUTO, ntpd,
CTLFLAG_RW | CTLFLAG_MPSAFE, 0,
"mac_ntpd policy controls");
diff --git a/sys/security/mac_partition/mac_partition.c b/sys/security/mac_partition/mac_partition.c
index 2cff042cb33a..2f0189b79ace 100644
--- a/sys/security/mac_partition/mac_partition.c
+++ b/sys/security/mac_partition/mac_partition.c
@@ -61,8 +61,6 @@
#include <security/mac/mac_policy.h>
#include <security/mac_partition/mac_partition.h>
-SYSCTL_DECL(_security_mac);
-
static SYSCTL_NODE(_security_mac, OID_AUTO, partition,
CTLFLAG_RW | CTLFLAG_MPSAFE, 0,
"TrustedBSD mac_partition policy controls");
diff --git a/sys/security/mac_portacl/mac_portacl.c b/sys/security/mac_portacl/mac_portacl.c
index 184ec4b4738c..b3a5e06c0e2a 100644
--- a/sys/security/mac_portacl/mac_portacl.c
+++ b/sys/security/mac_portacl/mac_portacl.c
@@ -79,8 +79,6 @@
#include <security/mac/mac_policy.h>
-SYSCTL_DECL(_security_mac);
-
static SYSCTL_NODE(_security_mac, OID_AUTO, portacl,
CTLFLAG_RW | CTLFLAG_MPSAFE, 0,
"TrustedBSD mac_portacl policy controls");
diff --git a/sys/security/mac_priority/mac_priority.c b/sys/security/mac_priority/mac_priority.c
index f460e5195cb9..1e5bfb5386cb 100644
--- a/sys/security/mac_priority/mac_priority.c
+++ b/sys/security/mac_priority/mac_priority.c
@@ -35,8 +35,6 @@
#include <security/mac/mac_policy.h>
-SYSCTL_DECL(_security_mac);
-
static SYSCTL_NODE(_security_mac, OID_AUTO, priority,
CTLFLAG_RW | CTLFLAG_MPSAFE, 0,
"mac_priority policy controls");
diff --git a/sys/security/mac_seeotheruids/mac_seeotheruids.c b/sys/security/mac_seeotheruids/mac_seeotheruids.c
index 1677b092daad..9cd2e0f3c0fc 100644
--- a/sys/security/mac_seeotheruids/mac_seeotheruids.c
+++ b/sys/security/mac_seeotheruids/mac_seeotheruids.c
@@ -59,8 +59,6 @@
#include <security/mac/mac_policy.h>
-SYSCTL_DECL(_security_mac);
-
static SYSCTL_NODE(_security_mac, OID_AUTO, seeotheruids,
CTLFLAG_RW | CTLFLAG_MPSAFE, 0,
"TrustedBSD mac_seeotheruids policy controls");
diff --git a/sys/security/mac_stub/mac_stub.c b/sys/security/mac_stub/mac_stub.c
index 1014aff07980..8406392443bf 100644
--- a/sys/security/mac_stub/mac_stub.c
+++ b/sys/security/mac_stub/mac_stub.c
@@ -85,8 +85,6 @@
#include <security/mac/mac_policy.h>
-SYSCTL_DECL(_security_mac);
-
static SYSCTL_NODE(_security_mac, OID_AUTO, stub,
CTLFLAG_RW | CTLFLAG_MPSAFE, 0,
"TrustedBSD mac_stub policy controls");
diff --git a/sys/security/mac_test/mac_test.c b/sys/security/mac_test/mac_test.c
index ff7990162e56..dca14d033b66 100644
--- a/sys/security/mac_test/mac_test.c
+++ b/sys/security/mac_test/mac_test.c
@@ -76,8 +76,6 @@
#include <security/mac/mac_policy.h>
-SYSCTL_DECL(_security_mac);
-
static SYSCTL_NODE(_security_mac, OID_AUTO, test,
CTLFLAG_RW | CTLFLAG_MPSAFE, 0,
"TrustedBSD mac_test policy controls");
diff --git a/sys/security/mac_veriexec/mac_veriexec.c b/sys/security/mac_veriexec/mac_veriexec.c
index caba5dfe9d51..11046b160ad4 100644
--- a/sys/security/mac_veriexec/mac_veriexec.c
+++ b/sys/security/mac_veriexec/mac_veriexec.c
@@ -73,8 +73,6 @@
static int sysctl_mac_veriexec_state(SYSCTL_HANDLER_ARGS);
static int sysctl_mac_veriexec_db(SYSCTL_HANDLER_ARGS);
-SYSCTL_DECL(_security_mac);
-
SYSCTL_NODE(_security_mac, OID_AUTO, veriexec, CTLFLAG_RW | CTLFLAG_MPSAFE, 0,
"MAC/veriexec policy controls");
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-16 04:06:44 +0000