diff options
| author | phk <phk@FreeBSD.org> | 2001-11-04 19:12:59 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2001-11-04 19:12:59 +0000 |
| commit | 3dd31a7df9d9f134d9590127c4dfd8ed2b5280c9 (patch) | |
| tree | 4064a710ab97ccfb2b4d6986ab88b4249a6e82bb /sys/fs/devfs/devfs_vnops.c | |
| parent | c9a56085cebe87767458dd48f7738acbe105619e (diff) | |
| download | FreeBSD-src-3dd31a7df9d9f134d9590127c4dfd8ed2b5280c9.zip FreeBSD-src-3dd31a7df9d9f134d9590127c4dfd8ed2b5280c9.tar.gz | |
Fix "echo > /dev/null" for non-root users which broke in previous commit.
Diffstat (limited to 'sys/fs/devfs/devfs_vnops.c')
| -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 45c5479..7b445a6 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) && |
