summaryrefslogtreecommitdiff
path: root/source4/scripting/python
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-08-21 12:59:16 +1000
committerAndrew Bartlett <abartlet@samba.org>2008-08-21 12:59:16 +1000
commit8237c0ba83e2b47bb7879ba68d3a50da887397b6 (patch)
tree8bd7e744edac2f2ee1cb1a0c9c9cef55f5eaeb40 /source4/scripting/python
parentfa3f3bee83821c8f2fd154f98fd97fec527d3da7 (diff)
downloadsamba-8237c0ba83e2b47bb7879ba68d3a50da887397b6.tar.gz
samba-8237c0ba83e2b47bb7879ba68d3a50da887397b6.tar.bz2
samba-8237c0ba83e2b47bb7879ba68d3a50da887397b6.zip
The index handling is now configured from the schema load, not by a
template. Andrew Bartlett (This used to be commit b36c6a21ad12fdc1b53efdc3f29cde7614b4fa9e)
Diffstat (limited to 'source4/scripting/python')
-rw-r--r--source4/scripting/python/samba/provision.py9
1 files changed, 0 insertions, 9 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index d14ce58f04..9c2a208460 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -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