mirror of
https://github.com/samba-team/samba.git
synced 2025-07-27 07:42:04 +03:00
The index handling is now configured from the schema load, not by a
template.
Andrew Bartlett
(This used to be commit b36c6a21ad
)
This commit is contained in:
@ -745,12 +745,6 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
|
||||
samdb = SamDB(path, session_info=session_info,
|
||||
credentials=credentials, lp=lp)
|
||||
|
||||
if fill == FILL_DRS:
|
||||
# We want to finish here, but setup the index before we do so
|
||||
message("Setting up sam.ldb index")
|
||||
samdb.load_ldif_file_add(setup_path("provision_index.ldif"))
|
||||
return samdb
|
||||
|
||||
message("Pre-loading the Samba 4 and AD schema")
|
||||
samdb.set_domain_sid(domainsid)
|
||||
if serverrole == "domain controller":
|
||||
@ -886,9 +880,6 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
|
||||
domainsid=domainsid, policyguid=policyguid,
|
||||
setup_path=setup_path)
|
||||
|
||||
#We want to setup the index last, as adds are faster unindexed
|
||||
message("Setting up sam.ldb index")
|
||||
samdb.load_ldif_file_add(setup_path("provision_index.ldif"))
|
||||
except:
|
||||
samdb.transaction_cancel()
|
||||
raise
|
||||
|
Reference in New Issue
Block a user