From d018a84cbc6f7af55c2bf809db2acd2042eef012 Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Sun, 4 Nov 2001 19:12:59 +0000 Subject: Fix "echo > /dev/null" for non-root users which broke in previous commit. --- sys/fs/devfs/devfs_vnops.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'sys') diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c index 45c5479cc8d7..7b445a6d93d6 100644 --- a/sys/fs/devfs/devfs_vnops.c +++ b/sys/fs/devfs/devfs_vnops.c @@ -698,11 +698,13 @@ devfs_setattr(ap) c = 1; } - /* see comment in ufs_vnops::ufs_setattr() */ - if ((error = VOP_ACCESS(vp, VADMIN, ap->a_cred, ap->a_td)) && - ((vap->va_vaflags & VA_UTIMES_NULL) == 0 || - (error = VOP_ACCESS(vp, VWRITE, ap->a_cred, ap->a_td)))) - return (error); + if (vap->va_atime.tv_sec != VNOVAL || vap->va_mtime.tv_sec != VNOVAL) { + /* see comment in ufs_vnops::ufs_setattr() */ + if ((error = VOP_ACCESS(vp, VADMIN, ap->a_cred, ap->a_td)) && + ((vap->va_vaflags & VA_UTIMES_NULL) == 0 || + (error = VOP_ACCESS(vp, VWRITE, ap->a_cred, ap->a_td)))) + return (error); + } if (vap->va_mode != (mode_t)VNOVAL) { if ((ap->a_cred->cr_uid != de->de_uid) && -- cgit v1.3