fixed the condition for executing utime() and utimensat()

PERMISSION_HANDLING_BRANCH
Jean-Pierre André 2010-04-19 11:10:54 +02:00
parent c9d40485b4
commit df8e581464
2 changed files with 4 additions and 4 deletions

View File

@ -1589,10 +1589,10 @@ static int ntfs_fuse_utimens(struct SECURITY_CONTEXT *scx, fuse_ino_t ino,
/* no check or update if both UTIME_OMIT */
if (to_set & (FUSE_SET_ATTR_ATIME + FUSE_SET_ATTR_MTIME)) {
#if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
if (ntfs_allowed_access(scx, ni, S_IWRITE)
if (ntfs_allowed_as_owner(scx, ni)
|| ((to_set & FUSE_SET_ATTR_ATIME_NOW)
&& (to_set & FUSE_SET_ATTR_MTIME_NOW)
&& ntfs_allowed_as_owner(scx, ni))) {
&& ntfs_allowed_access(scx, ni, S_IWRITE))) {
#endif
ntfs_time_update_flags mask = NTFS_UPDATE_CTIME;

View File

@ -2248,10 +2248,10 @@ static int ntfs_fuse_utimens(const char *path, const struct timespec tv[2])
/* no check or update if both UTIME_OMIT */
if ((tv[0].tv_nsec != UTIME_OMIT) || (tv[1].tv_nsec != UTIME_OMIT)) {
#if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
if (ntfs_allowed_access(&security, ni, S_IWRITE)
if (ntfs_allowed_as_owner(&security, ni)
|| ((tv[0].tv_nsec == UTIME_NOW)
&& (tv[0].tv_nsec == UTIME_NOW)
&& ntfs_allowed_as_owner(&security, ni))) {
&& ntfs_allowed_access(&security, ni, S_IWRITE))) {
#endif
ntfs_time_update_flags mask = NTFS_UPDATE_CTIME;