sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-04 17:47:26 +03:00
Code

Fix LDAP backend with python provision

Browse Source 
The backend databases were still hard-coded as 'users.ldb' etc.

Andrew Bartlett
(This used to be commit 3c5f6cc739b4a8787ce4cc5dc16ffd3027cc4a57)
This commit is contained in:
Andrew Bartlett 2008-02-08 12:48:11 +11:00
parent cd5c3f5842
commit d2ea79d1d6
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -323,9 +323,9 @@ def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info,
configdn_ldb = "configuration.ldb" configdn_ldb = "configuration.ldb"
if ldap_backend is not None: if ldap_backend is not None:
configdn_ldb = ldap_backend configdn_ldb = ldap_backend
schema_ldb = "schema.ldb" schemadn_ldb = "schema.ldb"
if ldap_backend is not None: if ldap_backend is not None:
schema_ldb = ldap_backend schemadn_ldb = ldap_backend
if ldap_backend_type == "fedora-ds": if ldap_backend_type == "fedora-ds":
backend_modules = ["nsuniqueid","paged_searches"] backend_modules = ["nsuniqueid","paged_searches"]
@ -336,23 +336,31 @@ def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info,
else: else:
backend_modules = ["objectguid"] backend_modules = ["objectguid"]
setup_add_ldif(samdb, setup_path("provision_partitions.ldif"), { samdb.transaction_start()
"SCHEMADN": schemadn, try:
"SCHEMADN_LDB": "schema.ldb", setup_add_ldif(samdb, setup_path("provision_partitions.ldif"), {
"SCHEMADN_MOD2": ",objectguid", "SCHEMADN": schemadn,
"CONFIGDN": configdn, "SCHEMADN_LDB": schemadn_ldb,
"CONFIGDN_LDB": "configuration.ldb", "SCHEMADN_MOD2": ",objectguid",
"DOMAINDN": domaindn, "CONFIGDN": configdn,
"DOMAINDN_LDB": "users.ldb", "CONFIGDN_LDB": configdn_ldb,
"SCHEMADN_MOD": "schema_fsmo,instancetype", "DOMAINDN": domaindn,
"CONFIGDN_MOD": "naming_fsmo,instancetype", "DOMAINDN_LDB": domaindn_ldb,
"DOMAINDN_MOD": "pdc_fsmo,password_hash,instancetype", "SCHEMADN_MOD": "schema_fsmo,instancetype",
"MODULES_LIST": ",".join(modules_list), "CONFIGDN_MOD": "naming_fsmo,instancetype",
"TDB_MODULES_LIST": ","+",".join(tdb_modules_list), "DOMAINDN_MOD": "pdc_fsmo,password_hash,instancetype",
"MODULES_LIST2": ",".join(modules_list2), "MODULES_LIST": ",".join(modules_list),
"BACKEND_MOD": ",".join(backend_modules), "TDB_MODULES_LIST": ","+",".join(tdb_modules_list),
"MODULES_LIST2": ",".join(modules_list2),
"BACKEND_MOD": ",".join(backend_modules),
}) })
except:
samdb.transaction_cancel()
raise
samdb.transaction_commit()
samdb = SamDB(samdb_path, session_info=session_info, samdb = SamDB(samdb_path, session_info=session_info,
credentials=credentials, lp=lp) credentials=credentials, lp=lp)
@ -680,7 +688,7 @@ FILL_NT4SYNC = "NT4SYNC"
FILL_DRS = "DRS" FILL_DRS = "DRS"
def provision(lp, setup_dir, message, paths, session_info, def provision(lp, setup_dir, message, paths, session_info,
credentials, ldapbackend, samdb_fill=FILL_FULL, realm=None, rootdn=None, credentials, samdb_fill=FILL_FULL, realm=None, rootdn=None,
domain=None, hostname=None, hostip=None, domainsid=None, domain=None, hostname=None, hostip=None, domainsid=None,
hostguid=None, adminpass=None, krbtgtpass=None, domainguid=None, hostguid=None, adminpass=None, krbtgtpass=None, domainguid=None,
policyguid=None, invocationid=None, machinepass=None, policyguid=None, invocationid=None, machinepass=None,