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 unused 'sambadn' parameter

Browse Source
This commit is contained in:
Andrew Bartlett
2009-11-10 15:18:01 +11:00
parent df7546ac16
commit 6437c38aeb
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -206,7 +206,6 @@ class ProvisionNames(object):
self.domaindn = None self.domaindn = None
self.configdn = None self.configdn = None
self.schemadn = None self.schemadn = None
self.sambadn = None
self.ldapmanagerdn = None self.ldapmanagerdn = None
self.dnsdomain = None self.dnsdomain = None
self.realm = 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, def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None,
serverrole=None, rootdn=None, domaindn=None, configdn=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.""" """Guess configuration settings to use."""
if hostname is None: if hostname is None:
@ -441,8 +440,6 @@ def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None,
configdn = "CN=Configuration," + rootdn configdn = "CN=Configuration," + rootdn
if schemadn is None: if schemadn is None:
schemadn = "CN=Schema," + configdn schemadn = "CN=Schema," + configdn
if sambadn is None:
sambadn = "CN=Samba"
if sitename is None: if sitename is None:
sitename=DEFAULTSITE sitename=DEFAULTSITE
@ -452,7 +449,6 @@ def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None,
names.domaindn = domaindn names.domaindn = domaindn
names.configdn = configdn names.configdn = configdn
names.schemadn = schemadn names.schemadn = schemadn
names.sambadn = sambadn
names.ldapmanagerdn = "CN=Manager," + rootdn names.ldapmanagerdn = "CN=Manager," + rootdn
names.dnsdomain = dnsdomain names.dnsdomain = dnsdomain
names.domain = domain names.domain = domain
@ -956,8 +952,7 @@ def setup_samdb(path, setup_path, session_info, provision_backend, lp,
serverrole=serverrole, schema=schema) serverrole=serverrole, schema=schema)
if (schema == None): if (schema == None):
schema = Schema(setup_path, domainsid, schemadn=names.schemadn, serverdn=names.serverdn, schema = Schema(setup_path, domainsid, schemadn=names.schemadn, serverdn=names.serverdn)
sambadn=names.sambadn)
# Load the database, but importantly, use Ldb not SamDB as we don't want to load the global schema # 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, 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="") ldapi_url = "ldapi://%s" % urllib.quote(paths.s4_ldapi_path, safe="")
schema = Schema(setup_path, domainsid, schemadn=names.schemadn, serverdn=names.serverdn, schema = Schema(setup_path, domainsid, schemadn=names.schemadn, serverdn=names.serverdn)
sambadn=names.sambadn)
provision_backend = ProvisionBackend(backend_type, provision_backend = ProvisionBackend(backend_type,
paths=paths, setup_path=setup_path, paths=paths, setup_path=setup_path,

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

@ -50,7 +50,7 @@ def get_schema_descriptor(domain_sid):
class Schema(object): class Schema(object):
def __init__(self, setup_path, domain_sid, schemadn=None, 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 """Load schema for the SamDB from the AD schema files and samba4_schema.ldif
:param samdb: Load a schema into a SamDB. :param samdb: Load a schema into a SamDB.