Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial

Conflicts:

	source/scripting/python/samba/provision.py

diff --cc source/scripting/python/samba/provision.py
index bcadcca58312f354603841a7822e3028e2eccd73,9a44983d8e8cfc3f4233e7d2a37ba059dca5e297..0c16ab3bfefbccc7f4c730abde4fde279491319e
--- 1/source/scripting/python/samba/provision.py
--- 2/source/scripting/python/samba/provision.py
+++ b/source/scripting/python/samba/provision.py
@@@ -319,14 -319,14 +319,16 @@@ def setup_samdb_partitions(samdb_path, 
   
      domaindn_ldb = "users.ldb"
      if ldap_backend is not None:
 -      domaindn_ldb = ldap_backend
 +        domaindn_ldb = ldap_backend
      configdn_ldb = "configuration.ldb"
      if ldap_backend is not None:
 -      configdn_ldb = ldap_backend
 +        configdn_ldb = ldap_backend
-     schema_ldb = "schema.ldb"
+     schemadn_ldb = "schema.ldb"
      if ldap_backend is not None:
 +        schema_ldb = ldap_backend
 +    
+       schemadn_ldb = ldap_backend
+       
      if ldap_backend_type == "fedora-ds":
          backend_modules = ["nsuniqueid","paged_searches"]
      elif ldap_backend_type == "openldap":