summaryrefslogtreecommitdiff
path: root/source3/modules
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2009-11-11 18:35:18 -0800
committerJeremy Allison <jra@samba.org>2009-11-11 18:35:18 -0800
commita8769e667514f83a45ee3e825d21a351987d0210 (patch)
tree41884f33c324380f3637420eb1ff5bf8151406d0 /source3/modules
parent8995d3d813978a00b50f33943c60784ddfe308bf (diff)
downloadsamba-a8769e667514f83a45ee3e825d21a351987d0210.tar.gz
samba-a8769e667514f83a45ee3e825d21a351987d0210.tar.bz2
samba-a8769e667514f83a45ee3e825d21a351987d0210.zip
Second part of bugfix for 6865 - acl_xattr module: Has dependency that inherit acls = yes or xattrs are removed.
We also need dos filemode = true set as well. Jeremy.
Diffstat (limited to 'source3/modules')
-rw-r--r--source3/modules/vfs_acl_tdb.c6
-rw-r--r--source3/modules/vfs_acl_xattr.c8
2 files changed, 10 insertions, 4 deletions
diff --git a/source3/modules/vfs_acl_tdb.c b/source3/modules/vfs_acl_tdb.c
index 3d06e520e8..db3881e1e7 100644
--- a/source3/modules/vfs_acl_tdb.c
+++ b/source3/modules/vfs_acl_tdb.c
@@ -384,9 +384,11 @@ static int connect_acl_tdb(struct vfs_handle_struct *handle,
/* Ensure we have "inherit acls = yes" if we're
* using this module. */
- DEBUG(2,("connect_acl_tdb: setting 'inherit acls = true' for service %s\n",
+ DEBUG(2,("connect_acl_tdb: setting 'inherit acls = true' "
+ "and 'dos filemode = true' for service %s\n",
service ));
- set_inherit_acls(SNUM(handle->conn));
+ lp_do_parameter(SNUM(handle->conn), "inherit acls", "true");
+ lp_do_parameter(SNUM(handle->conn), "dos filemode", "true");
return 0;
}
diff --git a/source3/modules/vfs_acl_xattr.c b/source3/modules/vfs_acl_xattr.c
index 11ca8902c0..962d1b7b09 100644
--- a/source3/modules/vfs_acl_xattr.c
+++ b/source3/modules/vfs_acl_xattr.c
@@ -214,9 +214,13 @@ static int connect_acl_xattr(struct vfs_handle_struct *handle,
{
/* Ensure we have "inherit acls = yes" if we're
* using this module. */
- DEBUG(2,("connect_acl_xattr: setting 'inherit acls = true' for service %s\n",
+ DEBUG(2,("connect_acl_xattr: setting 'inherit acls = true' "
+ "and 'dos filemode = true' for service %s\n",
service ));
- set_inherit_acls(SNUM(handle->conn));
+
+ lp_do_parameter(SNUM(handle->conn), "inherit acls", "true");
+ lp_do_parameter(SNUM(handle->conn), "dos filemode", "true");
+
return 0;
}