From 117d14f108cded28ac2868d5040f633856cca923 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 22 Oct 2010 16:14:28 -0700 Subject: [PATCH] Ensure we have correct parameters to use Windows ACL modules. --- source3/modules/vfs_acl_tdb.c | 7 +++++-- source3/modules/vfs_acl_xattr.c | 12 +++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/source3/modules/vfs_acl_tdb.c b/source3/modules/vfs_acl_tdb.c index 1dbb3bea803..b26208c377d 100644 --- a/source3/modules/vfs_acl_tdb.c +++ b/source3/modules/vfs_acl_tdb.c @@ -315,13 +315,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 e486e2064db..46e282d349d 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 - * using this module. */ - DEBUG(2,("connect_acl_xattr: setting 'inherit acls = true' " - "and 'dos filemode = true' for service %s\n", - service )); + /* Ensure we have the parameters correct if we're + * using this module. */ + DEBUG(2,("connect_acl_xattr: setting 'inherit acls = true' " + "'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; } -- 2.34.1