summaryrefslogtreecommitdiff
path: root/sys/isofs
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2008-06-09 23:38:38 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2008-06-09 23:38:38 +0000
commit6ab91dcac15548bdc6bcffa3890577632f184bfd (patch)
tree8ff9467b7fc42b782aaab7f51a457123319dcb7c /sys/isofs
parent12fc9e1c5534a9b647e6974808513f5f34652019 (diff)
Update access(2) to have modern semantics with respect to X_OK and
the superuser. access(2) will now only indicate success for X_OK on non-directories if there is at least one execute bit set on the file. OK deraadt@ thib@ otto@
Diffstat (limited to 'sys/isofs')
-rw-r--r--sys/isofs/cd9660/cd9660_vnops.c6
-rw-r--r--sys/isofs/udf/udf_vnops.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c
index 1e2ec604a39..4936f1e46ab 100644
--- a/sys/isofs/cd9660/cd9660_vnops.c
+++ b/sys/isofs/cd9660/cd9660_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cd9660_vnops.c,v 1.45 2008/05/08 17:45:45 thib Exp $ */
+/* $OpenBSD: cd9660_vnops.c,v 1.46 2008/06/09 23:38:37 millert Exp $ */
/* $NetBSD: cd9660_vnops.c,v 1.42 1997/10/16 23:56:57 christos Exp $ */
/*-
@@ -215,8 +215,8 @@ cd9660_access(v)
struct vop_access_args *ap = v;
struct iso_node *ip = VTOI(ap->a_vp);
- return (vaccess(ip->inode.iso_mode & ALLPERMS, ip->inode.iso_uid,
- ip->inode.iso_gid, ap->a_mode, ap->a_cred));
+ return (vaccess(ap->a_vp->v_type, ip->inode.iso_mode & ALLPERMS,
+ ip->inode.iso_uid, ip->inode.iso_gid, ap->a_mode, ap->a_cred));
}
int
diff --git a/sys/isofs/udf/udf_vnops.c b/sys/isofs/udf/udf_vnops.c
index 1ab4c8eec18..5b096a7b8eb 100644
--- a/sys/isofs/udf/udf_vnops.c
+++ b/sys/isofs/udf/udf_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: udf_vnops.c,v 1.31 2008/05/08 17:45:45 thib Exp $ */
+/* $OpenBSD: udf_vnops.c,v 1.32 2008/06/09 23:38:37 millert Exp $ */
/*
* Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org>
@@ -222,8 +222,8 @@ udf_access(void *v)
mode = udf_permtomode(up);
- return (vaccess(mode, up->u_fentry->uid, up->u_fentry->gid, a_mode,
- ap->a_cred));
+ return (vaccess(vp->v_type, mode, up->u_fentry->uid, up->u_fentry->gid,
+ a_mode, ap->a_cred));
}
static int mon_lens[2][12] = {