sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

The index handling is now configured from the schema load, not by a

Browse Source 
template.

Andrew Bartlett
(This used to be commit b36c6a21ad)
This commit is contained in:
Andrew Bartlett
2008-08-21 12:59:16 +10:00
parent fa3f3bee83
commit 8237c0ba83
2 changed files with 0 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -745,12 +745,6 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
samdb = SamDB(path, session_info=session_info, samdb = SamDB(path, session_info=session_info,
credentials=credentials, lp=lp) 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") message("Pre-loading the Samba 4 and AD schema")
samdb.set_domain_sid(domainsid) samdb.set_domain_sid(domainsid)
if serverrole == "domain controller": if serverrole == "domain controller":
@ -886,9 +880,6 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
domainsid=domainsid, policyguid=policyguid, domainsid=domainsid, policyguid=policyguid,
setup_path=setup_path) 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: except:
samdb.transaction_cancel() samdb.transaction_cancel()
raise raise

19
source4/setup/provision_index.ldif
View File

@ -1,19 +0,0 @@
dn: @INDEXLIST
@IDXATTR: name
@IDXATTR: cn
@IDXATTR: userPrincipalName
@IDXATTR: servicePrincipalName
@IDXATTR: sAMAccountName
@IDXATTR: objectSid
@IDXATTR: objectCategory
@IDXATTR: member
@IDXATTR: uidNumber
@IDXATTR: gidNumber
@IDXATTR: unixName
@IDXATTR: privilege
@IDXATTR: nCName
@IDXATTR: lDAPDisplayName
@IDXATTR: subClassOf
@IDXATTR: dnsRoot
@IDXATTR: nETBIOSName
@IDXATTR: objectGUID