s4-python: samba.provision: Require schema to be passed in - code path which handles...

diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py
index 5e7e374ab9e0da0296bbd1b791eaa692c2d78743..a44bb8ed3550086c2fe5c423839f952eed804806 100644 (file)
--- a/source4/scripting/python/samba/provision/__init__.py
+++ b/source4/scripting/python/samba/provision/__init__.py
@@ -1200,8 +1200,7 @@ def create_default_gpo(sysvolpath, dnsdomain, policyguid, policyguid_dc):
 
 
 def setup_samdb(path, session_info, provision_backend, lp, names,
-        logger, fill, serverrole,
-        am_rodc=False, schema=None):
+        logger, fill, serverrole, schema, am_rodc=False):
     """Setup a complete SAM Database.
 
     :note: This will wipe the main SAM database file!
@@ -1212,9 +1211,6 @@ def setup_samdb(path, session_info, provision_backend, lp, names,
         provision_backend=provision_backend, session_info=session_info,
         names=names, serverrole=serverrole, schema=schema)
 
-    if schema is None:
-        schema = Schema(domainsid, schemadn=names.schemadn)
-
     # Load the database, but don's load the global schema and don't connect
     # quite yet
     samdb = SamDB(session_info=session_info, url=None, auto_connect=False,