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

diff --git a/source3/modules/vfs_acl_tdb.c b/source3/modules/vfs_acl_tdb.c
index 6364b7b9f89e7efe50b7a554b1260edf5c8bf3ad..5fc1bc03f2228465b4321bce163495c181a3356c 100644 (file)
--- 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 e486e2064db7cd80c480e2ffccb2e1d779ac6cd2..aa7aeae5f45e2b370b7b765439fe0d99e3415f1d 100644 (file)
--- 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;
 }