diff options
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/scripting/python/samba/provision.py | 12 | ||||
| -rw-r--r-- | source4/scripting/python/samba/schema.py | 2 |
2 files changed, 4 insertions, 10 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index ffafa2c223..98f9298cf4 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -206,7 +206,6 @@ class ProvisionNames(object): self.domaindn = None self.configdn = None self.schemadn = None - self.sambadn = None self.ldapmanagerdn = None self.dnsdomain = None self.realm = None @@ -379,7 +378,7 @@ def provision_paths_from_lp(lp, dnsdomain): def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None, serverrole=None, rootdn=None, domaindn=None, configdn=None, - schemadn=None, serverdn=None, sitename=None, sambadn=None): + schemadn=None, serverdn=None, sitename=None): """Guess configuration settings to use.""" if hostname is None: @@ -441,8 +440,6 @@ def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None, configdn = "CN=Configuration," + rootdn if schemadn is None: schemadn = "CN=Schema," + configdn - if sambadn is None: - sambadn = "CN=Samba" if sitename is None: sitename=DEFAULTSITE @@ -452,7 +449,6 @@ def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None, names.domaindn = domaindn names.configdn = configdn names.schemadn = schemadn - names.sambadn = sambadn names.ldapmanagerdn = "CN=Manager," + rootdn names.dnsdomain = dnsdomain names.domain = domain @@ -956,8 +952,7 @@ def setup_samdb(path, setup_path, session_info, provision_backend, lp, serverrole=serverrole, schema=schema) if (schema == None): - schema = Schema(setup_path, domainsid, schemadn=names.schemadn, serverdn=names.serverdn, - sambadn=names.sambadn) + schema = Schema(setup_path, domainsid, schemadn=names.schemadn, serverdn=names.serverdn) # Load the database, but importantly, use Ldb not SamDB as we don't want to load the global schema samdb = Ldb(session_info=session_info, @@ -1236,8 +1231,7 @@ def provision(setup_dir, message, session_info, ldapi_url = "ldapi://%s" % urllib.quote(paths.s4_ldapi_path, safe="") - schema = Schema(setup_path, domainsid, schemadn=names.schemadn, serverdn=names.serverdn, - sambadn=names.sambadn) + schema = Schema(setup_path, domainsid, schemadn=names.schemadn, serverdn=names.serverdn) provision_backend = ProvisionBackend(backend_type, paths=paths, setup_path=setup_path, diff --git a/source4/scripting/python/samba/schema.py b/source4/scripting/python/samba/schema.py index 0f34c4edda..958a77d40f 100644 --- a/source4/scripting/python/samba/schema.py +++ b/source4/scripting/python/samba/schema.py @@ -50,7 +50,7 @@ def get_schema_descriptor(domain_sid): class Schema(object): def __init__(self, setup_path, domain_sid, schemadn=None, - serverdn=None, sambadn=None): + serverdn=None): """Load schema for the SamDB from the AD schema files and samba4_schema.ldif :param samdb: Load a schema into a SamDB. |