diff options
| author | pooka <pooka@NetBSD.org> | 2009-05-02 14:16:52 +0000 |
|---|---|---|
| committer | pooka <pooka@NetBSD.org> | 2009-05-02 14:16:52 +0000 |
| commit | fae90815dea01fd0773000f209ade1c01f4792aa (patch) | |
| tree | 8dc11a129abadd1c232d4a48e63a8ac4345cb3fe /sys | |
| parent | fb42667d02592b726d65cee00c49293ee311a495 (diff) | |
Do not include securelevel, it includes too many dependencies on
vfs in its current form.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/rump/librump/rumpkern/Makefile.rumpkern | 7 | ||||
| -rw-r--r-- | sys/rump/librump/rumpkern/misc_stub.c | 29 |
2 files changed, 30 insertions, 6 deletions
diff --git a/sys/rump/librump/rumpkern/Makefile.rumpkern b/sys/rump/librump/rumpkern/Makefile.rumpkern index eaaac51d79b..0e9873b726c 100644 --- a/sys/rump/librump/rumpkern/Makefile.rumpkern +++ b/sys/rump/librump/rumpkern/Makefile.rumpkern @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.rumpkern,v 1.44 2009/04/29 17:51:47 pooka Exp $ +# $NetBSD: Makefile.rumpkern,v 1.45 2009/05/02 14:16:52 pooka Exp $ # .include "${RUMPTOP}/Makefile.rump" @@ -9,7 +9,7 @@ LIB= rump ${RUMPTOP}/../kern \ ${RUMPTOP}/../conf \ ${RUMPTOP}/../dev \ - ${RUMPTOP}/../secmodel/bsd44 ${RUMPTOP}/../secmodel/securelevel + ${RUMPTOP}/../secmodel/bsd44 # # Source modules, first the ones specifically implemented for librump. @@ -40,8 +40,7 @@ SRCS+= subr_devsw.c subr_callback.c subr_evcnt.c subr_hash.c \ subr_specificdata.c subr_time.c subr_workqueue.c # 4.4BSD secmodel. selection is hardcoded for now -SRCS+= secmodel_bsd44.c secmodel_bsd44_logic.c secmodel_bsd44_suser.c \ - secmodel_securelevel.c +SRCS+= secmodel_bsd44.c secmodel_bsd44_logic.c secmodel_bsd44_suser.c # the funny bit. this doesn't really belong here, but helps with the # needs of kern_descrip.c. And since it's a fully dynamic interface, diff --git a/sys/rump/librump/rumpkern/misc_stub.c b/sys/rump/librump/rumpkern/misc_stub.c index a3494057c88..037c6223dfc 100644 --- a/sys/rump/librump/rumpkern/misc_stub.c +++ b/sys/rump/librump/rumpkern/misc_stub.c @@ -1,4 +1,4 @@ -/* $NetBSD: misc_stub.c,v 1.21 2009/03/29 18:22:08 pooka Exp $ */ +/* $NetBSD: misc_stub.c,v 1.22 2009/05/02 14:16:52 pooka Exp $ */ /* * Copyright (c) 2007 Antti Kantee. All Rights Reserved. @@ -28,18 +28,21 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: misc_stub.c,v 1.21 2009/03/29 18:22:08 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: misc_stub.c,v 1.22 2009/05/02 14:16:52 pooka Exp $"); #include <sys/param.h> #include <sys/cpu.h> #include <sys/evcnt.h> #include <sys/event.h> +#include <sys/kauth.h> #include <sys/sched.h> #include <sys/sysctl.h> #include <sys/systm.h> #include <sys/syscallvar.h> #include <sys/xcall.h> +#include <secmodel/securelevel/securelevel.h> + #ifdef __sparc__ /* * XXX Least common denominator - smallest sparc pagesize. @@ -109,3 +112,25 @@ xc_wait(uint64_t where) { } + +/* + * XXX: bsd44 secmodel depends on securelevel + */ +int +secmodel_securelevel_sysctl(SYSCTLFN_ARGS) +{ + + return 0; +} + +void +secmodel_securelevel_init() +{ + +} + +void +secmodel_securelevel_start() +{ + +} |
