summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2010-10-15 19:54:51 -0700
committerJeremy Allison <jra@samba.org>2010-10-16 03:36:04 +0000
commitbcdf781545ae31f9ec7caf2c60f74d27a962de6d (patch)
treedba724eb31ccbb6218c59d59f2bb0dc03cc2aed1
parent50d3baffb223999bd264cfa957003cd6189d9a8c (diff)
downloadsamba-bcdf781545ae31f9ec7caf2c60f74d27a962de6d.tar.gz
samba-bcdf781545ae31f9ec7caf2c60f74d27a962de6d.tar.bz2
samba-bcdf781545ae31f9ec7caf2c60f74d27a962de6d.zip
Ensure we have correct parameters to use Windows ACL modules.
Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Sat Oct 16 03:36:04 UTC 2010 on sn-devel-104
-rw-r--r--source3/modules/vfs_acl_tdb.c7
-rw-r--r--source3/modules/vfs_acl_xattr.c6
2 files changed, 9 insertions, 4 deletions
diff --git a/source3/modules/vfs_acl_tdb.c b/source3/modules/vfs_acl_tdb.c
index 6364b7b9f8..5fc1bc03f2 100644
--- a/source3/modules/vfs_acl_tdb.c
+++ b/source3/modules/vfs_acl_tdb.c
@@ -316,13 +316,16 @@ static int connect_acl_tdb(struct vfs_handle_struct *handle,
return -1;
}
- /* Ensure we have "inherit acls = yes" if we're
+ /* Ensure we have the parameters correct if we're
* using this module. */
DEBUG(2,("connect_acl_tdb: setting 'inherit acls = true' "
- "and 'dos filemode = true' for service %s\n",
+ "'dos filemode = true' and "
+ "'force unknown acl user = true' for service %s\n",
service ));
+
lp_do_parameter(SNUM(handle->conn), "inherit acls", "true");
lp_do_parameter(SNUM(handle->conn), "dos filemode", "true");
+ lp_do_parameter(SNUM(handle->conn), "force unknown acl user", "true");
return 0;
}
diff --git a/source3/modules/vfs_acl_xattr.c b/source3/modules/vfs_acl_xattr.c
index e486e2064d..aa7aeae5f4 100644
--- a/source3/modules/vfs_acl_xattr.c
+++ b/source3/modules/vfs_acl_xattr.c
@@ -185,14 +185,16 @@ static int connect_acl_xattr(struct vfs_handle_struct *handle,
return ret;
}
- /* Ensure we have "inherit acls = yes" if we're
+ /* Ensure we have the parameters correct if we're
* using this module. */
DEBUG(2,("connect_acl_xattr: setting 'inherit acls = true' "
- "and 'dos filemode = true' for service %s\n",
+ "'dos filemode = true' and "
+ "'force unknown acl user = true' for service %s\n",
service ));
lp_do_parameter(SNUM(handle->conn), "inherit acls", "true");
lp_do_parameter(SNUM(handle->conn), "dos filemode", "true");
+ lp_do_parameter(SNUM(handle->conn), "force unknown acl user", "true");
return 0;
}