[src/trunk]: src/sys/secmodel/securelevel secmodel_eval(9) may want to access...

[jym <jym%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d51e4e7dc6ad
branches:  trunk
changeset: 771873:d51e4e7dc6ad
user:      jym <jym%NetBSD.org@localhost>
date:      Mon Dec 05 00:13:30 2011 +0000

description:
secmodel_eval(9) may want to access securelevel before it is set
to the right value, so init it first before registering secmodel(9).

diffstat:

 sys/secmodel/securelevel/secmodel_securelevel.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r af2f9aa661ac -r d51e4e7dc6ad sys/secmodel/securelevel/secmodel_securelevel.c
--- a/sys/secmodel/securelevel/secmodel_securelevel.c   Sun Dec 04 23:59:25 2011 +0000
+++ b/sys/secmodel/securelevel/secmodel_securelevel.c   Mon Dec 05 00:13:30 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: secmodel_securelevel.c,v 1.23 2011/12/04 19:25:00 jym Exp $ */
+/* $NetBSD: secmodel_securelevel.c,v 1.24 2011/12/05 00:13:30 jym Exp $ */
 /*-
  * Copyright (c) 2006 Elad Efrat <elad%NetBSD.org@localhost>
  * All rights reserved.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: secmodel_securelevel.c,v 1.23 2011/12/04 19:25:00 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: secmodel_securelevel.c,v 1.24 2011/12/05 00:13:30 jym Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_insecure.h"
@@ -205,6 +205,7 @@
 
        switch (cmd) {
        case MODULE_CMD_INIT:
+               secmodel_securelevel_init();
                error = secmodel_register(&securelevel_sm,
                    SECMODEL_SECURELEVEL_ID, SECMODEL_SECURELEVEL_NAME,
                    NULL, securelevel_eval, NULL);
@@ -212,7 +213,6 @@
                        printf("securelevel_modcmd::init: secmodel_register "
                            "returned %d\n", error);
 
-               secmodel_securelevel_init();
                secmodel_securelevel_start();
                sysctl_security_securelevel_setup(&securelevel_sysctl_log);
                break;