sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-02 00:22:11 +03:00
Code Activity

s4:provision Remove am_rodc from Schema

Browse Source 
The SamDB created in the schema code isn't real enough to care if it's an
rodc or not.
This commit is contained in:
Andrew Bartlett
2010-06-21 23:18:53 +10:00
parent ebc2da10cd
commit b26125b7d3
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source4/scripting/python/samba/provision.py
View File

@ -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,

5
source4/scripting/python/samba/schema.py
View File

@ -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: