summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2007-07-04 04:16:16 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:59:03 -0500
commit879e1e0ec746d9d06c3bef1c91d1d2cd6f916442 (patch)
tree3efbc2cd73aa40c73e32cb4ac4e7f99ac7ff6b9c /source4
parentb540bc85ff8140424e9e925aa73f1f1cacfbd64a (diff)
downloadsamba-879e1e0ec746d9d06c3bef1c91d1d2cd6f916442.tar.gz
samba-879e1e0ec746d9d06c3bef1c91d1d2cd6f916442.tar.bz2
samba-879e1e0ec746d9d06c3bef1c91d1d2cd6f916442.zip
r23697: use the file perm options in the posix backend
(This used to be commit 701d06ac016c69fcd9ac92b5afefa2346c9bc26f)
Diffstat (limited to 'source4')
-rw-r--r--source4/ntvfs/posix/pvfs_fileinfo.c25
-rw-r--r--source4/ntvfs/posix/vfs_posix.c13
-rw-r--r--source4/ntvfs/posix/vfs_posix.h8
3 files changed, 36 insertions, 10 deletions
diff --git a/source4/ntvfs/posix/pvfs_fileinfo.c b/source4/ntvfs/posix/pvfs_fileinfo.c
index 8226b66d1f..b244019d56 100644
--- a/source4/ntvfs/posix/pvfs_fileinfo.c
+++ b/source4/ntvfs/posix/pvfs_fileinfo.c
@@ -88,15 +88,11 @@ NTSTATUS pvfs_fill_dos_info(struct pvfs_state *pvfs, struct pvfs_filename *name,
*/
mode_t pvfs_fileperms(struct pvfs_state *pvfs, uint32_t attrib)
{
- mode_t mode = S_IRUSR;
+ mode_t mode = (S_IRUSR | S_IRGRP | S_IROTH | S_IWUSR | S_IWGRP | S_IWOTH);
- if (attrib & FILE_ATTRIBUTE_DIRECTORY) {
- mode |= S_IXUSR;
- }
-
- if (!(attrib & FILE_ATTRIBUTE_READONLY) ||
- (pvfs->flags & PVFS_FLAG_XATTR_ENABLE)) {
- mode |= S_IWUSR;
+ if (!(pvfs->flags & PVFS_FLAG_XATTR_ENABLE) &&
+ (attrib & FILE_ATTRIBUTE_READONLY)) {
+ mode &= ~(S_IWUSR | S_IWGRP | S_IWOTH);
}
if (!(pvfs->flags & PVFS_FLAG_XATTR_ENABLE)) {
@@ -104,18 +100,27 @@ mode_t pvfs_fileperms(struct pvfs_state *pvfs, uint32_t attrib)
(pvfs->flags & PVFS_FLAG_MAP_ARCHIVE)) {
mode |= S_IXUSR;
}
-
if ((attrib & FILE_ATTRIBUTE_SYSTEM) &&
(pvfs->flags & PVFS_FLAG_MAP_SYSTEM)) {
mode |= S_IXGRP;
}
-
if ((attrib & FILE_ATTRIBUTE_HIDDEN) &&
(pvfs->flags & PVFS_FLAG_MAP_HIDDEN)) {
mode |= S_IXOTH;
}
}
+ if (attrib & FILE_ATTRIBUTE_DIRECTORY) {
+ mode |= (S_IFDIR | S_IWUSR);
+ mode |= (S_IXUSR | S_IXGRP | S_IXOTH);
+ mode &= pvfs->options.dir_mask;
+ mode |= pvfs->options.force_dir_mode;
+ } else {
+ mode &= pvfs->options.create_mask;
+ mode |= pvfs->options.force_create_mode;
+ }
+
return mode;
}
+
diff --git a/source4/ntvfs/posix/vfs_posix.c b/source4/ntvfs/posix/vfs_posix.c
index c8d85b557c..2508496fac 100644
--- a/source4/ntvfs/posix/vfs_posix.c
+++ b/source4/ntvfs/posix/vfs_posix.c
@@ -60,6 +60,19 @@ static void pvfs_setup_options(struct pvfs_state *pvfs)
if (share_bool_option(scfg, PVFS_AIO, False))
pvfs->flags |= PVFS_FLAG_LINUX_AIO;
+ /* file perm options */
+ pvfs->options.create_mask = share_int_option(scfg,
+ SHARE_CREATE_MASK,
+ SHARE_CREATE_MASK_DEFAULT);
+ pvfs->options.dir_mask = share_int_option(scfg,
+ SHARE_DIR_MASK,
+ SHARE_DIR_MASK_DEFAULT);
+ pvfs->options.force_dir_mode = share_int_option(scfg,
+ SHARE_FORCE_DIR_MODE,
+ SHARE_FORCE_DIR_MODE_DEFAULT);
+ pvfs->options.force_create_mode = share_int_option(scfg,
+ SHARE_FORCE_CREATE_MODE,
+ SHARE_FORCE_CREATE_MODE_DEFAULT);
/* this must be a power of 2 */
pvfs->alloc_size_rounding = share_int_option(scfg,
PVFS_ALLOCATION_ROUNDING,
diff --git a/source4/ntvfs/posix/vfs_posix.h b/source4/ntvfs/posix/vfs_posix.h
index cff0206f61..78b63612da 100644
--- a/source4/ntvfs/posix/vfs_posix.h
+++ b/source4/ntvfs/posix/vfs_posix.h
@@ -86,6 +86,14 @@ struct pvfs_state {
/* the acl backend */
const struct pvfs_acl_ops *acl_ops;
+
+ /* non-flag share options */
+ struct {
+ mode_t dir_mask;
+ mode_t force_dir_mode;
+ mode_t create_mask;
+ mode_t force_create_mode;
+ } options;
};
/* this is the basic information needed about a file from the filesystem */