diff --git a/sys/secmodel/bsd44/secmodel_bsd44.c b/sys/secmodel/bsd44/secmodel_bsd44.c index 725bca92e8d1..7102620653c3 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.13 2009/10/02 18:50:13 elad Exp $ */ +/* $NetBSD: secmodel_bsd44.c,v 1.14 2011/11/28 22:28:33 jym Exp $ */ /*- * Copyright (c) 2006 Elad Efrat * All rights reserved. @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: secmodel_bsd44.c,v 1.13 2009/10/02 18:50:13 elad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: secmodel_bsd44.c,v 1.14 2011/11/28 22:28:33 jym Exp $"); #include #include @@ -79,26 +79,19 @@ sysctl_security_bsd44_setup(struct sysctllog **clog) void secmodel_bsd44_init(void) { - secmodel_suser_init(); - secmodel_securelevel_init(); + } void secmodel_bsd44_start(void) { - secmodel_suser_start(); - secmodel_securelevel_start(); - /* secmodel_register(); */ } void secmodel_bsd44_stop(void) { - secmodel_suser_stop(); - secmodel_securelevel_stop(); - /* secmodel_deregister(); */ } static int diff --git a/sys/secmodel/overlay/secmodel_overlay.c b/sys/secmodel/overlay/secmodel_overlay.c index c0c0373b7bb3..3cc1028a5f0b 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.10 2009/10/02 18:50:13 elad Exp $ */ +/* $NetBSD: secmodel_overlay.c,v 1.11 2011/11/28 22:28:34 jym Exp $ */ /*- * Copyright (c) 2006 Elad Efrat * All rights reserved. @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: secmodel_overlay.c,v 1.10 2009/10/02 18:50:13 elad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: secmodel_overlay.c,v 1.11 2011/11/28 22:28:34 jym Exp $"); #include #include @@ -123,8 +123,6 @@ secmodel_overlay_init(void) secmodel_suser_device_cb, NULL); kauth_listen_scope(OVERLAY_ISCOPE_DEVICE, secmodel_securelevel_device_cb, NULL); - - secmodel_bsd44_init(); } void @@ -178,8 +176,6 @@ secmodel_overlay_start(void) secmodel_overlay_device_cb, NULL); l_vnode = kauth_listen_scope(KAUTH_SCOPE_VNODE, secmodel_overlay_vnode_cb, NULL); - - /* secmodel_register(); */ } /* @@ -205,7 +201,8 @@ secmodel_overlay_modcmd(modcmd_t cmd, void *arg) switch (cmd) { case MODULE_CMD_INIT: secmodel_overlay_init(); - secmodel_bsd44_stop(); + secmodel_suser_stop(); + secmodel_securelevel_stop(); secmodel_overlay_start(); sysctl_security_overlay_setup(&sysctl_overlay_log); break;