Re-add 'db' subdirectory for LDAP backend provision

Andrew Bartlett
(This used to be commit 19890c0d15adf4f099365f276a4bfdd3f4de52b6)

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 45965a24297ee6bb76806ce15e38b069c919fc68..0e8840646cd652e553e188c9eaf734943e8087ee 100644 (file)
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1242,9 +1242,9 @@ refint_attributes""" + refint_attributes + "\n";
         setup_file(setup_path("modules.conf"), paths.modulesconf,
                    {"REALM": names.realm})
         
-        setup_db_config(setup_path, os.path.join(paths.ldapdir, "user"))
-        setup_db_config(setup_path, os.path.join(paths.ldapdir, "config"))
-        setup_db_config(setup_path, os.path.join(paths.ldapdir, "schema"))
+        setup_db_config(setup_path, os.path.join(paths.ldapdir, os.path.join("db", "user")))
+        setup_db_config(setup_path, os.path.join(paths.ldapdir, os.path.join("db", "config")))
+        setup_db_config(setup_path, os.path.join(paths.ldapdir, os.path.join("db", "schema")))
         mapping = "schema-map-openldap-2.3"
         backend_schema = "backend-schema.schema"