From dadcd7355c9306ae7d80938480b00d2943cadf20 Mon Sep 17 00:00:00 2001 From: elad Date: Thu, 24 Dec 2009 19:02:07 +0000 Subject: [PATCH] Rename KAUTH_GENERIC_CANSEE to KAUTH_GENERIC_UNUSED1 and remove handling for the former. (I'll remove it from the header next time a kernel version bump happens.) --- sys/secmodel/suser/secmodel_suser.c | 12 ++---------- sys/sys/kauth.h | 6 +++--- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/sys/secmodel/suser/secmodel_suser.c b/sys/secmodel/suser/secmodel_suser.c index 6a52815f880e..a4cda3aa8086 100644 --- a/sys/secmodel/suser/secmodel_suser.c +++ b/sys/secmodel/suser/secmodel_suser.c @@ -1,4 +1,4 @@ -/* $NetBSD: secmodel_suser.c,v 1.32 2009/11/18 09:47:18 stacktic Exp $ */ +/* $NetBSD: secmodel_suser.c,v 1.33 2009/12/24 19:02:07 elad Exp $ */ /*- * Copyright (c) 2006 Elad Efrat * All rights reserved. @@ -38,7 +38,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: secmodel_suser.c,v 1.32 2009/11/18 09:47:18 stacktic Exp $"); +__KERNEL_RCSID(0, "$NetBSD: secmodel_suser.c,v 1.33 2009/12/24 19:02:07 elad Exp $"); #include #include @@ -237,14 +237,6 @@ secmodel_suser_generic_cb(kauth_cred_t cred, kauth_action_t action, result = KAUTH_RESULT_ALLOW; break; - case KAUTH_GENERIC_CANSEE: - if (!secmodel_suser_curtain) - result = KAUTH_RESULT_ALLOW; - else if (isroot || kauth_cred_uidmatch(cred, arg0)) - result = KAUTH_RESULT_ALLOW; - - break; - default: break; } diff --git a/sys/sys/kauth.h b/sys/sys/kauth.h index e13d9311bd5c..7a31401259d6 100644 --- a/sys/sys/kauth.h +++ b/sys/sys/kauth.h @@ -1,4 +1,4 @@ -/* $NetBSD: kauth.h,v 1.63 2009/09/03 04:45:27 elad Exp $ */ +/* $NetBSD: kauth.h,v 1.64 2009/12/24 19:02:07 elad Exp $ */ /*- * Copyright (c) 2005, 2006 Elad Efrat @@ -73,8 +73,8 @@ typedef struct kauth_key *kauth_key_t; * Generic scope - actions. */ enum { - KAUTH_GENERIC_CANSEE=1, - KAUTH_GENERIC_ISSUSER + KAUTH_GENERIC_UNUSED1=1, + KAUTH_GENERIC_ISSUSER, }; /*