summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2010-06-21 23:18:53 +1000
committerAndrew Bartlett <abartlet@samba.org>2010-06-23 20:10:05 +1000
commitb26125b7d3242895038065ddece32554436ba474 (patch)
tree948bf9171311b8d4845f679b2e40e1ca22595605
parentebc2da10cdd63e5151f9b1138f9da91b408830c9 (diff)
downloadsamba-b26125b7d3242895038065ddece32554436ba474.tar.gz
samba-b26125b7d3242895038065ddece32554436ba474.tar.bz2
samba-b26125b7d3242895038065ddece32554436ba474.zip
s4:provision Remove am_rodc from Schema
The SamDB created in the schema code isn't real enough to care if it's an rodc or not.
-rw-r--r--source4/scripting/python/samba/provision.py5
-rw-r--r--source4/scripting/python/samba/schema.py5
2 files changed, 5 insertions, 5 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 1b7cfca64d..5bd2d0bcc2 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -972,8 +972,7 @@ def setup_samdb(path, setup_path, session_info, provision_backend, lp, names,
names=names, serverrole=serverrole, schema=schema)
if schema is None:
- schema = Schema(setup_path, domainsid, schemadn=names.schemadn, serverdn=names.serverdn,
- am_rodc=am_rodc)
+ schema = Schema(setup_path, domainsid, schemadn=names.schemadn, serverdn=names.serverdn)
# 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,
@@ -1341,7 +1340,7 @@ def provision(setup_dir, logger, session_info,
ldapi_url = "ldapi://%s" % urllib.quote(paths.s4_ldapi_path, safe="")
schema = Schema(setup_path, domainsid, invocationid=invocationid, schemadn=names.schemadn,
- serverdn=names.serverdn, am_rodc=am_rodc)
+ serverdn=names.serverdn)
if backend_type == "ldb":
provision_backend = LDBBackend(backend_type,
diff --git a/source4/scripting/python/samba/schema.py b/source4/scripting/python/samba/schema.py
index c25dc195b1..a9e1122111 100644
--- a/source4/scripting/python/samba/schema.py
+++ b/source4/scripting/python/samba/schema.py
@@ -54,7 +54,7 @@ def get_schema_descriptor(domain_sid):
class Schema(object):
def __init__(self, setup_path, domain_sid, invocationid=None, schemadn=None,
- serverdn=None, files=None, override_prefixmap=None, additional_prefixmap=None, am_rodc=False):
+ serverdn=None, files=None, override_prefixmap=None, additional_prefixmap=None):
"""Load schema for the SamDB from the AD schema files and samba4_schema.ldif
:param samdb: Load a schema into a SamDB.
@@ -66,7 +66,8 @@ class Schema(object):
"""
self.schemadn = schemadn
- self.ldb = SamDB(global_schema=False, am_rodc=am_rodc)
+ # We need to have the am_rodc=False just to keep some warnings quiet - this isn't a real SAM, so it's meaningless.
+ self.ldb = SamDB(global_schema=False, am_rodc=False)
if serverdn is not None:
self.ldb.set_ntds_settings_dn("CN=NTDS Settings,%s" % serverdn)
if invocationid is not None: