summaryrefslogtreecommitdiff
path: root/source3/modules
diff options
context:
space:
mode:
authorZack Kirsch <zack.kirsch@isilon.com>2009-02-17 21:03:33 -0800
committerTim Prouty <tprouty@samba.org>2009-02-19 00:15:44 -0800
commit96b3242f124d60fd8d8b6f5a34b57c26c42dfd14 (patch)
treef8254a9c30016d6d2ef96a340086ae98ded689cb /source3/modules
parent59d21afa83b3d7cb996500f3ce2b1317f4c471c7 (diff)
downloadsamba-96b3242f124d60fd8d8b6f5a34b57c26c42dfd14.tar.gz
samba-96b3242f124d60fd8d8b6f5a34b57c26c42dfd14.tar.bz2
samba-96b3242f124d60fd8d8b6f5a34b57c26c42dfd14.zip
s3 OneFS: Fixes "inherit permissions" and "nt acl support" for Onefs.
Diffstat (limited to 'source3/modules')
-rw-r--r--source3/modules/onefs_system.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/source3/modules/onefs_system.c b/source3/modules/onefs_system.c
index b17cfe9b11..6f93d9ff97 100644
--- a/source3/modules/onefs_system.c
+++ b/source3/modules/onefs_system.c
@@ -93,6 +93,7 @@ int onefs_sys_create_file(connection_struct *conn,
int secinfo = 0;
int ret_fd = -1;
uint32_t onefs_dos_attributes;
+ struct ifs_createfile_flags cf_flags = CF_FLAGS_NONE;
/* Setup security descriptor and get secinfo. */
if (sd != NULL) {
@@ -143,10 +144,19 @@ int onefs_sys_create_file(connection_struct *conn,
smlock_dump(10, psml);
+ /**
+ * Deal with kernel creating Default ACLs. (Isilon bug 47447.)
+ *
+ * 1) "nt acl support = no", default_acl = no
+ * 2) "inherit permissions = yes", default_acl = no
+ */
+ if (lp_nt_acl_support(SNUM(conn)) && !lp_inherit_perms(SNUM(conn)))
+ cf_flags = cf_flags_or(cf_flags, CF_FLAGS_DEFAULT_ACL);
+
ret_fd = ifs_createfile(base_fd, path,
(enum ifs_ace_rights)open_access_mask, flags & ~O_ACCMODE, mode,
onefs_oplock, id, psml, secinfo, pifs_sd, onefs_dos_attributes,
- &onefs_granted_oplock);
+ cf_flags, &onefs_granted_oplock);
DEBUG(10,("onefs_sys_create_file(%s): ret_fd = %d, "
"onefs_granted_oplock = %s\n",