summaryrefslogtreecommitdiff
path: root/sys/secmodel
diff options
context:
space:
mode:
authorelad <elad@NetBSD.org>2007-01-16 00:11:39 +0000
committerelad <elad@NetBSD.org>2007-01-16 00:11:39 +0000
commit2b3921e3e7cd13c3f091fedc5e3a3bea5b21d5c9 (patch)
tree7e7d3e5c7e61baca438666d733a3b92eaf924438 /sys/secmodel
parent6a5bb11672e9274cafed759b651f70442ee28b9e (diff)
Implement secmodel_bsd44_start(), secmodel_bsd44_stop(), and
secmodel_overlay_start().
Diffstat (limited to 'sys/secmodel')
-rw-r--r--sys/secmodel/bsd44/bsd44.h3
-rw-r--r--sys/secmodel/bsd44/secmodel_bsd44.c28
-rw-r--r--sys/secmodel/overlay/secmodel_overlay.c12
3 files changed, 32 insertions, 11 deletions
diff --git a/sys/secmodel/bsd44/bsd44.h b/sys/secmodel/bsd44/bsd44.h
index ce061aa8eb5..28117ad766e 100644
--- a/sys/secmodel/bsd44/bsd44.h
+++ b/sys/secmodel/bsd44/bsd44.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bsd44.h,v 1.3 2007/01/09 12:57:56 elad Exp $ */
+/* $NetBSD: bsd44.h,v 1.4 2007/01/16 00:11:39 elad Exp $ */
/*-
* Copyright (c) 2006 Elad Efrat <elad@NetBSD.org>
* All rights reserved.
@@ -33,6 +33,7 @@ void secmodel_bsd44_init(void);
void secmodel_bsd44_start(void);
#if defined(_LKM)
+void secmodel_bsd44_stop(void);
SYSCTL_SETUP_PROTO(sysctl_security_bsd44_setup);
#endif /* _LKM */
diff --git a/sys/secmodel/bsd44/secmodel_bsd44.c b/sys/secmodel/bsd44/secmodel_bsd44.c
index 00e7d12c656..32e425bf66e 100644
--- a/sys/secmodel/bsd44/secmodel_bsd44.c
+++ b/sys/secmodel/bsd44/secmodel_bsd44.c
@@ -1,4 +1,4 @@
-/* $NetBSD: secmodel_bsd44.c,v 1.8 2007/01/09 12:57:56 elad Exp $ */
+/* $NetBSD: secmodel_bsd44.c,v 1.9 2007/01/16 00:11:39 elad Exp $ */
/*-
* Copyright (c) 2006 Elad Efrat <elad@NetBSD.org>
* All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: secmodel_bsd44.c,v 1.8 2007/01/09 12:57:56 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: secmodel_bsd44.c,v 1.9 2007/01/16 00:11:39 elad Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -94,16 +94,30 @@ SYSCTL_SETUP(sysctl_security_bsd44_setup,
CTL_CREATE, CTL_EOL);
}
-#if !defined(_LKM)
-/*
- * Start the traditional NetBSD security model.
- */
void
-secmodel_start(void)
+secmodel_bsd44_start(void)
{
secmodel_bsd44_init();
secmodel_bsd44_suser_start();
secmodel_bsd44_securelevel_start();
}
+
+#if defined(_LKM)
+void
+secmodel_bsd44_stop(void)
+{
+ secmodel_bsd44_suser_stop();
+ secmodel_bsd44_securelevel_stop();
+}
+#endif /* _LKM */
+
+#if !defined(_LKM)
+void
+secmodel_start(void)
+{
+ secmodel_bsd44_start();
+}
#endif /* !_LKM */
+
+
diff --git a/sys/secmodel/overlay/secmodel_overlay.c b/sys/secmodel/overlay/secmodel_overlay.c
index 1c18d0becc0..31ea9cda6d1 100644
--- a/sys/secmodel/overlay/secmodel_overlay.c
+++ b/sys/secmodel/overlay/secmodel_overlay.c
@@ -1,4 +1,4 @@
-/* $NetBSD: secmodel_overlay.c,v 1.6 2007/01/15 11:58:00 elad Exp $ */
+/* $NetBSD: secmodel_overlay.c,v 1.7 2007/01/16 00:11:39 elad Exp $ */
/*-
* Copyright (c) 2006 Elad Efrat <elad@NetBSD.org>
* All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: secmodel_overlay.c,v 1.6 2007/01/15 11:58:00 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: secmodel_overlay.c,v 1.7 2007/01/16 00:11:39 elad Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -168,7 +168,7 @@ SYSCTL_SETUP(sysctl_security_overlay_setup,
* Start the overlay security model.
*/
void
-secmodel_start(void)
+secmodel_overlay_start(void)
{
secmodel_overlay_init();
@@ -186,6 +186,12 @@ secmodel_start(void)
secmodel_overlay_device_cb, NULL);
}
+void
+secmodel_start(void)
+{
+ secmodel_overlay_start();
+}
+
/*
* Overlay listener for the generic scope.
*/