diff options
| author | ad <ad@NetBSD.org> | 2007-12-31 15:31:24 +0000 |
|---|---|---|
| committer | ad <ad@NetBSD.org> | 2007-12-31 15:31:24 +0000 |
| commit | 2ecdf58c2c9f227031628cbec276d336f29dbb4e (patch) | |
| tree | eb4cf06176c6df69528c0740d6107cfed83e3715 /sys/secmodel | |
| parent | 7f3f50946654b3decba8b7e003bb6b2351d5c011 (diff) | |
Remove systrace. Ok core@.
Diffstat (limited to 'sys/secmodel')
| -rw-r--r-- | sys/secmodel/bsd44/secmodel_bsd44_suser.c | 19 | ||||
| -rw-r--r-- | sys/secmodel/securelevel/secmodel_securelevel.c | 5 |
2 files changed, 4 insertions, 20 deletions
diff --git a/sys/secmodel/bsd44/secmodel_bsd44_suser.c b/sys/secmodel/bsd44/secmodel_bsd44_suser.c index 63d8083052e..17fde72a1e6 100644 --- a/sys/secmodel/bsd44/secmodel_bsd44_suser.c +++ b/sys/secmodel/bsd44/secmodel_bsd44_suser.c @@ -1,4 +1,4 @@ -/* $NetBSD: secmodel_bsd44_suser.c,v 1.42 2007/12/01 21:59:49 elad Exp $ */ +/* $NetBSD: secmodel_bsd44_suser.c,v 1.43 2007/12/31 15:32:13 ad Exp $ */ /*- * Copyright (c) 2006 Elad Efrat <elad@NetBSD.org> * All rights reserved. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: secmodel_bsd44_suser.c,v 1.42 2007/12/01 21:59:49 elad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: secmodel_bsd44_suser.c,v 1.43 2007/12/31 15:32:13 ad Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -520,21 +520,6 @@ secmodel_bsd44_suser_process_cb(kauth_cred_t cred, kauth_action_t action, break; } - case KAUTH_PROCESS_CANSYSTRACE: - if (isroot) { - result = KAUTH_RESULT_ALLOW; - break; - } - - if (kauth_cred_getuid(cred) != kauth_cred_getuid(p->p_cred) || - ISSET(p->p_flag, PK_SUGID)) { - result = KAUTH_RESULT_DENY; - break; - } - - result = KAUTH_RESULT_ALLOW; - break; - case KAUTH_PROCESS_CORENAME: result = KAUTH_RESULT_ALLOW; diff --git a/sys/secmodel/securelevel/secmodel_securelevel.c b/sys/secmodel/securelevel/secmodel_securelevel.c index 6810f99a9b3..2760ecaa89d 100644 --- a/sys/secmodel/securelevel/secmodel_securelevel.c +++ b/sys/secmodel/securelevel/secmodel_securelevel.c @@ -1,4 +1,4 @@ -/* $NetBSD: secmodel_securelevel.c,v 1.4 2007/11/25 09:39:26 elad Exp $ */ +/* $NetBSD: secmodel_securelevel.c,v 1.5 2007/12/31 15:32:13 ad Exp $ */ /*- * Copyright (c) 2006 Elad Efrat <elad@NetBSD.org> * All rights reserved. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: secmodel_securelevel.c,v 1.4 2007/11/25 09:39:26 elad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: secmodel_securelevel.c,v 1.5 2007/12/31 15:32:13 ad Exp $"); #ifdef _KERNEL_OPT #include "opt_insecure.h" @@ -309,7 +309,6 @@ secmodel_securelevel_process_cb(kauth_cred_t cred, } case KAUTH_PROCESS_CANPTRACE: - case KAUTH_PROCESS_CANSYSTRACE: if ((p == initproc) && (securelevel >= 0)) result = KAUTH_RESULT_DENY; |
