diff options
author | Steve French <sfrench@us.ibm.com> | 2007-06-08 10:55:14 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2007-06-08 10:55:14 -0400 |
commit | 3ce53fc4c57603d99c330a6ee2fe96d94f2d350f (patch) | |
tree | 54a5e999cc6044669139fb5e3a7cc0a1db31e86f /fs/cifs/inode.c | |
parent | 100c1ddc98e070c1b595d6bad329fb57bc57313c (diff) |
[CIFS] CIFS should honour umask
This patch makes CIFS honour a process' umask like other filesystems.
Of course the server is still free to munge the permissions if it wants
to; but the client will send the "right" permissions to begin with.
A few caveats:
1) It only applies to filesystems that have CAP_UNIX (aka support unix
extensions)
2) It applies the correct mode to the follow up CIFSSMBUnixSetPerms()
after remote creation
When mode to CIFS/NTFS ACL mapping is complete we can do the
same thing for that case for servers which do not
support the Unix Extensions.
Signed-off-by: Matt Keenen <matt@opcode-solutions.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/inode.c')
-rw-r--r-- | fs/cifs/inode.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index 3e87dad3367c..f0ff12b3f398 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c | |||
@@ -986,7 +986,8 @@ mkdir_get_info: | |||
986 | * failed to get it from the server or was set bogus */ | 986 | * failed to get it from the server or was set bogus */ |
987 | if ((direntry->d_inode) && (direntry->d_inode->i_nlink < 2)) | 987 | if ((direntry->d_inode) && (direntry->d_inode->i_nlink < 2)) |
988 | direntry->d_inode->i_nlink = 2; | 988 | direntry->d_inode->i_nlink = 2; |
989 | if (cifs_sb->tcon->ses->capabilities & CAP_UNIX) | 989 | if (cifs_sb->tcon->ses->capabilities & CAP_UNIX) { |
990 | mode &= ~current->fs->umask; | ||
990 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID) { | 991 | if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID) { |
991 | CIFSSMBUnixSetPerms(xid, pTcon, full_path, | 992 | CIFSSMBUnixSetPerms(xid, pTcon, full_path, |
992 | mode, | 993 | mode, |
@@ -1004,7 +1005,7 @@ mkdir_get_info: | |||
1004 | cifs_sb->mnt_cifs_flags & | 1005 | cifs_sb->mnt_cifs_flags & |
1005 | CIFS_MOUNT_MAP_SPECIAL_CHR); | 1006 | CIFS_MOUNT_MAP_SPECIAL_CHR); |
1006 | } | 1007 | } |
1007 | else { | 1008 | } else { |
1008 | /* BB to be implemented via Windows secrty descriptors | 1009 | /* BB to be implemented via Windows secrty descriptors |
1009 | eg CIFSSMBWinSetPerms(xid, pTcon, full_path, mode, | 1010 | eg CIFSSMBWinSetPerms(xid, pTcon, full_path, mode, |
1010 | -1, -1, local_nls); */ | 1011 | -1, -1, local_nls); */ |