From 2789e47e2cad8f8a97023475a98de16f6d3e50fe Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Tue, 22 Oct 2002 15:33:33 +0000 Subject: [PATCH] Missed in previous merge: export sizeof(struct oldmac) rather than sizeof(struct mac). Obtained from: TrustedBSD Project Sponsored by: DARPA, Network Associates Laboratories --- sys/kern/kern_mac.c | 2 +- sys/security/mac/mac_framework.c | 2 +- sys/security/mac/mac_internal.h | 2 +- sys/security/mac/mac_net.c | 2 +- sys/security/mac/mac_pipe.c | 2 +- sys/security/mac/mac_process.c | 2 +- sys/security/mac/mac_syscalls.c | 2 +- sys/security/mac/mac_system.c | 2 +- sys/security/mac/mac_vfs.c | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/kern/kern_mac.c b/sys/kern/kern_mac.c index 575181318395..f80dfd6ccbab 100644 --- a/sys/kern/kern_mac.c +++ b/sys/kern/kern_mac.c @@ -140,7 +140,7 @@ SYSCTL_INT(_security_mac, OID_AUTO, enforce_vm, CTLFLAG_RW, &mac_enforce_vm, 0, "Enforce MAC policy on vm operations"); TUNABLE_INT("security.mac.enforce_vm", &mac_enforce_vm); -static int mac_label_size = sizeof(struct mac); +static int mac_label_size = sizeof(struct oldmac); SYSCTL_INT(_security_mac, OID_AUTO, label_size, CTLFLAG_RD, &mac_label_size, 0, "Pre-compiled MAC label size"); diff --git a/sys/security/mac/mac_framework.c b/sys/security/mac/mac_framework.c index 575181318395..f80dfd6ccbab 100644 --- a/sys/security/mac/mac_framework.c +++ b/sys/security/mac/mac_framework.c @@ -140,7 +140,7 @@ SYSCTL_INT(_security_mac, OID_AUTO, enforce_vm, CTLFLAG_RW, &mac_enforce_vm, 0, "Enforce MAC policy on vm operations"); TUNABLE_INT("security.mac.enforce_vm", &mac_enforce_vm); -static int mac_label_size = sizeof(struct mac); +static int mac_label_size = sizeof(struct oldmac); SYSCTL_INT(_security_mac, OID_AUTO, label_size, CTLFLAG_RD, &mac_label_size, 0, "Pre-compiled MAC label size"); diff --git a/sys/security/mac/mac_internal.h b/sys/security/mac/mac_internal.h index 575181318395..f80dfd6ccbab 100644 --- a/sys/security/mac/mac_internal.h +++ b/sys/security/mac/mac_internal.h @@ -140,7 +140,7 @@ SYSCTL_INT(_security_mac, OID_AUTO, enforce_vm, CTLFLAG_RW, &mac_enforce_vm, 0, "Enforce MAC policy on vm operations"); TUNABLE_INT("security.mac.enforce_vm", &mac_enforce_vm); -static int mac_label_size = sizeof(struct mac); +static int mac_label_size = sizeof(struct oldmac); SYSCTL_INT(_security_mac, OID_AUTO, label_size, CTLFLAG_RD, &mac_label_size, 0, "Pre-compiled MAC label size"); diff --git a/sys/security/mac/mac_net.c b/sys/security/mac/mac_net.c index 575181318395..f80dfd6ccbab 100644 --- a/sys/security/mac/mac_net.c +++ b/sys/security/mac/mac_net.c @@ -140,7 +140,7 @@ SYSCTL_INT(_security_mac, OID_AUTO, enforce_vm, CTLFLAG_RW, &mac_enforce_vm, 0, "Enforce MAC policy on vm operations"); TUNABLE_INT("security.mac.enforce_vm", &mac_enforce_vm); -static int mac_label_size = sizeof(struct mac); +static int mac_label_size = sizeof(struct oldmac); SYSCTL_INT(_security_mac, OID_AUTO, label_size, CTLFLAG_RD, &mac_label_size, 0, "Pre-compiled MAC label size"); diff --git a/sys/security/mac/mac_pipe.c b/sys/security/mac/mac_pipe.c index 575181318395..f80dfd6ccbab 100644 --- a/sys/security/mac/mac_pipe.c +++ b/sys/security/mac/mac_pipe.c @@ -140,7 +140,7 @@ SYSCTL_INT(_security_mac, OID_AUTO, enforce_vm, CTLFLAG_RW, &mac_enforce_vm, 0, "Enforce MAC policy on vm operations"); TUNABLE_INT("security.mac.enforce_vm", &mac_enforce_vm); -static int mac_label_size = sizeof(struct mac); +static int mac_label_size = sizeof(struct oldmac); SYSCTL_INT(_security_mac, OID_AUTO, label_size, CTLFLAG_RD, &mac_label_size, 0, "Pre-compiled MAC label size"); diff --git a/sys/security/mac/mac_process.c b/sys/security/mac/mac_process.c index 575181318395..f80dfd6ccbab 100644 --- a/sys/security/mac/mac_process.c +++ b/sys/security/mac/mac_process.c @@ -140,7 +140,7 @@ SYSCTL_INT(_security_mac, OID_AUTO, enforce_vm, CTLFLAG_RW, &mac_enforce_vm, 0, "Enforce MAC policy on vm operations"); TUNABLE_INT("security.mac.enforce_vm", &mac_enforce_vm); -static int mac_label_size = sizeof(struct mac); +static int mac_label_size = sizeof(struct oldmac); SYSCTL_INT(_security_mac, OID_AUTO, label_size, CTLFLAG_RD, &mac_label_size, 0, "Pre-compiled MAC label size"); diff --git a/sys/security/mac/mac_syscalls.c b/sys/security/mac/mac_syscalls.c index 575181318395..f80dfd6ccbab 100644 --- a/sys/security/mac/mac_syscalls.c +++ b/sys/security/mac/mac_syscalls.c @@ -140,7 +140,7 @@ SYSCTL_INT(_security_mac, OID_AUTO, enforce_vm, CTLFLAG_RW, &mac_enforce_vm, 0, "Enforce MAC policy on vm operations"); TUNABLE_INT("security.mac.enforce_vm", &mac_enforce_vm); -static int mac_label_size = sizeof(struct mac); +static int mac_label_size = sizeof(struct oldmac); SYSCTL_INT(_security_mac, OID_AUTO, label_size, CTLFLAG_RD, &mac_label_size, 0, "Pre-compiled MAC label size"); diff --git a/sys/security/mac/mac_system.c b/sys/security/mac/mac_system.c index 575181318395..f80dfd6ccbab 100644 --- a/sys/security/mac/mac_system.c +++ b/sys/security/mac/mac_system.c @@ -140,7 +140,7 @@ SYSCTL_INT(_security_mac, OID_AUTO, enforce_vm, CTLFLAG_RW, &mac_enforce_vm, 0, "Enforce MAC policy on vm operations"); TUNABLE_INT("security.mac.enforce_vm", &mac_enforce_vm); -static int mac_label_size = sizeof(struct mac); +static int mac_label_size = sizeof(struct oldmac); SYSCTL_INT(_security_mac, OID_AUTO, label_size, CTLFLAG_RD, &mac_label_size, 0, "Pre-compiled MAC label size"); diff --git a/sys/security/mac/mac_vfs.c b/sys/security/mac/mac_vfs.c index 575181318395..f80dfd6ccbab 100644 --- a/sys/security/mac/mac_vfs.c +++ b/sys/security/mac/mac_vfs.c @@ -140,7 +140,7 @@ SYSCTL_INT(_security_mac, OID_AUTO, enforce_vm, CTLFLAG_RW, &mac_enforce_vm, 0, "Enforce MAC policy on vm operations"); TUNABLE_INT("security.mac.enforce_vm", &mac_enforce_vm); -static int mac_label_size = sizeof(struct mac); +static int mac_label_size = sizeof(struct oldmac); SYSCTL_INT(_security_mac, OID_AUTO, label_size, CTLFLAG_RD, &mac_label_size, 0, "Pre-compiled MAC label size");