diff options
Diffstat (limited to 'libdiskfs/file-chmod.c')
| -rw-r--r-- | libdiskfs/file-chmod.c | 56 |
1 files changed, 31 insertions, 25 deletions
diff --git a/libdiskfs/file-chmod.c b/libdiskfs/file-chmod.c index 545b810f..5dad2c78 100644 --- a/libdiskfs/file-chmod.c +++ b/libdiskfs/file-chmod.c @@ -1,5 +1,5 @@ /* libdiskfs implementation of fs.defs: file_chmod - Copyright (C) 1992, 1993, 1994, 1996 Free Software Foundation + Copyright (C) 1992,93,94,96,97,2002 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -22,29 +22,35 @@ error_t diskfs_S_file_chmod (struct protid *cred, mode_t mode) { - mode &= ~(S_IFMT | S_ISPARE); - + mode &= ~(S_IFMT | S_ISPARE | S_ITRANS); + CHANGE_NODE_FIELD (cred, - ({ - if (!(err = diskfs_isowner (np, cred))) - { - if (!diskfs_isuid (0, cred)) - { - if (!S_ISDIR (np->dn_stat.st_mode)) - mode &= ~S_ISVTX; - if (!diskfs_groupmember (np->dn_stat.st_gid, - cred)) - mode &= ~S_ISGID; - if (!diskfs_isuid (np->dn_stat.st_uid, cred)) - mode &= ~S_ISUID; - } - mode |= (np->dn_stat.st_mode & (S_IFMT | S_ISPARE)); - err = diskfs_validate_mode_change (np, mode); - if (!err) - { - np->dn_stat.st_mode = mode; - np->dn_set_ctime = 1; - } - } - })); + ({ + if (!(err = fshelp_isowner (&np->dn_stat, cred->user))) + { + if (!idvec_contains (cred->user->uids, 0)) + { + if (!S_ISDIR (np->dn_stat.st_mode)) + mode &= ~S_ISVTX; + if (!idvec_contains (cred->user->gids, + np->dn_stat.st_gid)) + mode &= ~S_ISGID; + if (!idvec_contains (cred->user->uids, + np->dn_stat.st_uid)) + mode &= ~S_ISUID; + } + mode |= (np->dn_stat.st_mode + & (S_IFMT | S_ISPARE | S_ITRANS)); + err = diskfs_validate_mode_change (np, mode); + if (!err) + { + np->dn_stat.st_mode = mode; + np->dn_set_ctime = 1; + if (np->filemod_reqs) + diskfs_notice_filechange (np, + FILE_CHANGED_META, + 0, 0); + } + } + })); } |