sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-30 19:42:05 +03:00
Code Activity

Fix templates.ldb reprovision handling.

Browse Source 
This sets the attributes in a seperate transaction, and allows a
forced delete of the whole file.

Andrew Bartlett
(This used to be commit 423db2468b)
This commit is contained in:
Andrew Bartlett
2008-08-19 11:43:41 +10:00
parent bb80a19714
commit 47d80366be
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -617,7 +617,17 @@ def setup_templatesdb(path, setup_path, session_info, credentials, lp):
""" """
templates_ldb = SamDB(path, session_info=session_info, templates_ldb = SamDB(path, session_info=session_info,
credentials=credentials, lp=lp) credentials=credentials, lp=lp)
# Wipes the database
try:
templates_ldb.erase() templates_ldb.erase()
except:
os.unlink(path)
templates_ldb.load_ldif_file_add(setup_path("provision_templates_init.ldif"))
templates_ldb = SamDB(path, session_info=session_info,
credentials=credentials, lp=lp)
templates_ldb.load_ldif_file_add(setup_path("provision_templates.ldif")) templates_ldb.load_ldif_file_add(setup_path("provision_templates.ldif"))

10
source4/setup/provision_templates.ldif
View File

@ -2,16 +2,6 @@
# Templates to be put in templates.ldb. Not part of main samdb any more. # Templates to be put in templates.ldb. Not part of main samdb any more.
### ###
dn: @OPTIONS
checkBaseOnSearch: TRUE
dn: @INDEXLIST
@IDXATTR: cn
dn: @ATTRIBUTES
cn: CASE_INSENSITIVE
dn: CASE_INSENSITIVE
dn: CN=Templates dn: CN=Templates
objectClass: top objectClass: top
objectClass: container objectClass: container

10
source4/setup/provision_templates_init.ldif Normal file
View File

@ -0,0 +1,10 @@
dn: @OPTIONS
checkBaseOnSearch: TRUE
dn: @INDEXLIST
@IDXATTR: cn
dn: @ATTRIBUTES
cn: CASE_INSENSITIVE
dn: CASE_INSENSITIVE