Module Name: src
Committed By: elad
Date: Thu Dec 24 19:02:07 UTC 2009
Modified Files:
src/sys/secmodel/suser: secmodel_suser.c
src/sys/sys: kauth.h
Log Message:
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.)
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/secmodel/suser/secmodel_suser.c
cvs rdiff -u -r1.63 -r1.64 src/sys/sys/kauth.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/secmodel/suser/secmodel_suser.c
diff -u src/sys/secmodel/suser/secmodel_suser.c:1.32 src/sys/secmodel/suser/secmodel_suser.c:1.33
--- src/sys/secmodel/suser/secmodel_suser.c:1.32 Wed Nov 18 09:47:18 2009
+++ src/sys/secmodel/suser/secmodel_suser.c Thu Dec 24 19:02:07 2009
@@ -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 <e...@netbsd.org>
* All rights reserved.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__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 <sys/types.h>
#include <sys/param.h>
@@ -237,14 +237,6 @@
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;
}
Index: src/sys/sys/kauth.h
diff -u src/sys/sys/kauth.h:1.63 src/sys/sys/kauth.h:1.64
--- src/sys/sys/kauth.h:1.63 Thu Sep 3 04:45:27 2009
+++ src/sys/sys/kauth.h Thu Dec 24 19:02:07 2009
@@ -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 <e...@netbsd.org>
@@ -73,8 +73,8 @@
* Generic scope - actions.
*/
enum {
- KAUTH_GENERIC_CANSEE=1,
- KAUTH_GENERIC_ISSUSER
+ KAUTH_GENERIC_UNUSED1=1,
+ KAUTH_GENERIC_ISSUSER,
};
/*
