summaryrefslogtreecommitdiff
path: root/source4/scripting/python
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2011-11-02 16:23:06 +0100
committerJelmer Vernooij <jelmer@samba.org>2011-11-02 18:35:38 +0100
commit3ce126f352288fc4ebbd0ac12b54c77f7b79c063 (patch)
tree213bb79e24b008320827639e78e0453bae6e1866 /source4/scripting/python
parentaa882d33232745607b305aff0bf2000fc5d449ee (diff)
downloadsamba-3ce126f352288fc4ebbd0ac12b54c77f7b79c063.tar.gz
samba-3ce126f352288fc4ebbd0ac12b54c77f7b79c063.tar.bz2
samba-3ce126f352288fc4ebbd0ac12b54c77f7b79c063.zip
s4-python: samba.provision: Require schema to be passed in - code path which handles schema not being specified is broken anyway.
Diffstat (limited to 'source4/scripting/python')
-rw-r--r--source4/scripting/python/samba/provision/__init__.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py
index 5e7e374ab9..a44bb8ed35 100644
--- 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,