summaryrefslogtreecommitdiff
path: root/sys/secmodel
diff options
context:
space:
mode:
authorelad <elad@NetBSD.org>2008-02-23 23:32:30 +0000
committerelad <elad@NetBSD.org>2008-02-23 23:32:30 +0000
commit2ef031e659949f6b93ca67995417ba563fc6aae5 (patch)
tree9862fa461c6e42bef34055915e5ca92ef8a174fd /sys/secmodel
parenta357ac49215b9e8aa75eec1328d592758bbeb9ed (diff)
Adapt to secmodel_securelevel.
Diffstat (limited to 'sys/secmodel')
-rw-r--r--sys/secmodel/overlay/secmodel_overlay.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/sys/secmodel/overlay/secmodel_overlay.c b/sys/secmodel/overlay/secmodel_overlay.c
index 7a707343ee5..7418fcc81dc 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.8 2007/01/16 11:53:00 elad Exp $ */
+/* $NetBSD: secmodel_overlay.c,v 1.9 2008/02/23 23:32:30 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.8 2007/01/16 11:53:00 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: secmodel_overlay.c,v 1.9 2008/02/23 23:32:30 elad Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -40,7 +40,8 @@ __KERNEL_RCSID(0, "$NetBSD: secmodel_overlay.c,v 1.8 2007/01/16 11:53:00 elad Ex
#include <secmodel/bsd44/bsd44.h>
#include <secmodel/bsd44/suser.h>
-#include <secmodel/bsd44/securelevel.h>
+
+#include <secmodel/securelevel/securelevel.h>
/*
* Fall-back settings.
@@ -93,27 +94,27 @@ secmodel_overlay_init(void)
kauth_listen_scope(OVERLAY_ISCOPE_SYSTEM,
secmodel_bsd44_suser_system_cb, NULL);
kauth_listen_scope(OVERLAY_ISCOPE_SYSTEM,
- secmodel_bsd44_securelevel_system_cb, NULL);
+ secmodel_securelevel_system_cb, NULL);
kauth_listen_scope(OVERLAY_ISCOPE_PROCESS,
secmodel_bsd44_suser_process_cb, NULL);
kauth_listen_scope(OVERLAY_ISCOPE_PROCESS,
- secmodel_bsd44_securelevel_process_cb, NULL);
+ secmodel_securelevel_process_cb, NULL);
kauth_listen_scope(OVERLAY_ISCOPE_NETWORK,
secmodel_bsd44_suser_network_cb, NULL);
kauth_listen_scope(OVERLAY_ISCOPE_NETWORK,
- secmodel_bsd44_securelevel_network_cb, NULL);
+ secmodel_securelevel_network_cb, NULL);
kauth_listen_scope(OVERLAY_ISCOPE_MACHDEP,
secmodel_bsd44_suser_machdep_cb, NULL);
kauth_listen_scope(OVERLAY_ISCOPE_MACHDEP,
- secmodel_bsd44_securelevel_machdep_cb, NULL);
+ secmodel_securelevel_machdep_cb, NULL);
kauth_listen_scope(OVERLAY_ISCOPE_DEVICE,
secmodel_bsd44_suser_device_cb, NULL);
kauth_listen_scope(OVERLAY_ISCOPE_DEVICE,
- secmodel_bsd44_securelevel_device_cb, NULL);
+ secmodel_securelevel_device_cb, NULL);
secmodel_bsd44_init();
}
@@ -152,7 +153,7 @@ SYSCTL_SETUP(sysctl_security_overlay_setup,
CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
CTLTYPE_INT, "securelevel",
SYSCTL_DESCR("System security level"),
- secmodel_bsd44_sysctl_securelevel, 0, NULL, 0,
+ secmodel_securelevel_sysctl, 0, NULL, 0,
CTL_CREATE, CTL_EOL);
sysctl_createv(clog, 0, &rnode, NULL,