diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 2001-11-04 19:12:59 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 2001-11-04 19:12:59 +0000 |
| commit | d018a84cbc6f7af55c2bf809db2acd2042eef012 (patch) | |
| tree | 4064a710ab97ccfb2b4d6986ab88b4249a6e82bb /sys/fs/devfs | |
| parent | 6b8bd2efc110b3d44e7fdad0b78de6585a09ba0c (diff) | |
| download | src-d018a84cbc6f7af55c2bf809db2acd2042eef012.tar.gz src-d018a84cbc6f7af55c2bf809db2acd2042eef012.zip | |
Fix "echo > /dev/null" for non-root users which broke in previous commit.
Notes
Notes:
svn path=/head/; revision=86040
Diffstat (limited to 'sys/fs/devfs')
| -rw-r--r-- | sys/fs/devfs/devfs_vnops.c | 12 |
1 files changed, 7 insertions, 5 deletions
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) && |