summaryrefslogtreecommitdiff
path: root/sys/miscfs
diff options
context:
space:
mode:
authorplunky <plunky@NetBSD.org>2013-03-18 19:35:35 +0000
committerplunky <plunky@NetBSD.org>2013-03-18 19:35:35 +0000
commite5c652ae7a4abd2ebad85482f3b8115d5d2ff12e (patch)
treeef6ed47cc69a2063bd79584a14deeb4b227628cf /sys/miscfs
parentf46d5379cf303bfa36adf59b8d8e0a6dd9fefa04 (diff)
C99 section 6.7.2.3 (Tags) Note 3 states that:
A type specifier of the form enum identifier without an enumerator list shall only appear after the type it specifies is complete. which means that we cannot pass an "enum vtype" argument to kauth_access_action() without fully specifying the type first. Unfortunately there is a complicated include file loop which makes that difficult, so convert this minimal function into a macro (and capitalize it). (ok elad@)
Diffstat (limited to 'sys/miscfs')
-rw-r--r--sys/miscfs/kernfs/kernfs_vnops.c6
-rw-r--r--sys/miscfs/procfs/procfs_vnops.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/miscfs/kernfs/kernfs_vnops.c b/sys/miscfs/kernfs/kernfs_vnops.c
index 1519a236cea..fe1f75027af 100644
--- a/sys/miscfs/kernfs/kernfs_vnops.c
+++ b/sys/miscfs/kernfs/kernfs_vnops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kernfs_vnops.c,v 1.146 2012/03/22 20:34:38 drochner Exp $ */
+/* $NetBSD: kernfs_vnops.c,v 1.147 2013/03/18 19:35:44 plunky Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kernfs_vnops.c,v 1.146 2012/03/22 20:34:38 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kernfs_vnops.c,v 1.147 2013/03/18 19:35:44 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -586,7 +586,7 @@ kernfs_access(void *v)
return (error);
return kauth_authorize_vnode(ap->a_cred,
- kauth_access_action(ap->a_mode, ap->a_vp->v_type, va.va_mode),
+ KAUTH_ACCESS_ACTION(ap->a_mode, ap->a_vp->v_type, va.va_mode),
ap->a_vp, NULL, genfs_can_access(va.va_type, va.va_mode,
va.va_uid, va.va_gid, ap->a_mode, ap->a_cred));
}
diff --git a/sys/miscfs/procfs/procfs_vnops.c b/sys/miscfs/procfs/procfs_vnops.c
index 3428c6d700e..ff6bd82da11 100644
--- a/sys/miscfs/procfs/procfs_vnops.c
+++ b/sys/miscfs/procfs/procfs_vnops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_vnops.c,v 1.185 2012/11/25 01:03:05 christos Exp $ */
+/* $NetBSD: procfs_vnops.c,v 1.186 2013/03/18 19:35:44 plunky Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -105,7 +105,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_vnops.c,v 1.185 2012/11/25 01:03:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_vnops.c,v 1.186 2013/03/18 19:35:44 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -955,7 +955,7 @@ procfs_access(void *v)
return (error);
return kauth_authorize_vnode(ap->a_cred,
- kauth_access_action(ap->a_mode, ap->a_vp->v_type, va.va_mode),
+ KAUTH_ACCESS_ACTION(ap->a_mode, ap->a_vp->v_type, va.va_mode),
ap->a_vp, NULL, genfs_can_access(va.va_type, va.va_mode,
va.va_uid, va.va_gid, ap->a_mode, ap->a_cred));
}