Module Name: src
Committed By: pooka
Date: Thu Apr 16 14:07:18 UTC 2009
Modified Files:
src/sys/rump/librump/rumpkern: Makefile.rumpkern rump.c
Log Message:
When I switched to real kauth, I forgot to include a secmodel.
Fix this oversight by including bsd44. Makes permissions for p2k
work again.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs rdiff -u -r1.100 -r1.101 src/sys/rump/librump/rumpkern/rump.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.42 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.43
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.42 Sun Mar 29 18:22:08 2009
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Thu Apr 16 14:07:17 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.42 2009/03/29 18:22:08 pooka Exp $
+# $NetBSD: Makefile.rumpkern,v 1.43 2009/04/16 14:07:17 pooka Exp $
#
.include "${RUMPTOP}/Makefile.rump"
@@ -8,7 +8,8 @@
.PATH: ${RUMPTOP}/librump/rumpkern \
${RUMPTOP}/../kern \
${RUMPTOP}/../conf \
- ${RUMPTOP}/../dev
+ ${RUMPTOP}/../dev \
+ ${RUMPTOP}/../secmodel/bsd44 ${RUMPTOP}/../secmodel/securelevel
#
# Source modules, first the ones specifically implemented for librump.
@@ -37,6 +38,10 @@
subr_iostat.c subr_kobj.c subr_log.c subr_once.c subr_prf.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
+
# 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,
# it doesn't pull in other gunk.
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.100 src/sys/rump/librump/rumpkern/rump.c:1.101
--- src/sys/rump/librump/rumpkern/rump.c:1.100 Sun Mar 29 18:22:08 2009
+++ src/sys/rump/librump/rumpkern/rump.c Thu Apr 16 14:07:18 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.100 2009/03/29 18:22:08 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.101 2009/04/16 14:07:18 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.100 2009/03/29 18:22:08 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.101 2009/04/16 14:07:18 pooka Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -60,6 +60,8 @@
#include <rump/rumpuser.h>
+#include <secmodel/secmodel.h>
+
#include "rump_private.h"
#include "rump_net_private.h"
#include "rump_vfs_private.h"
@@ -85,6 +87,9 @@
char machine[] = "rump";
static kauth_cred_t rump_susercred;
+/* pretend the master rump proc is init */
+struct proc *initproc = &proc0;
+
struct rumpuser_mtx *rump_giantlock;
sigset_t sigcantmask;
@@ -211,6 +216,7 @@
softint_init(&rump_cpu);
cold = 0;
devsw_init();
+ secmodel_start();
/* these do nothing if not present */
rump_vfs_init();
