git.samba.org
/
metze
/
samba
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
20d40e3
)
Fix some forgotten substitute variables in provision, add check to prevent this sort...
author
Jelmer Vernooij
<jelmer@samba.org>
Fri, 1 Aug 2008 18:17:29 +0000
(20:17 +0200)
committer
Jelmer Vernooij
<jelmer@samba.org>
Fri, 1 Aug 2008 18:17:29 +0000
(20:17 +0200)
source/scripting/python/samba/provision.py
patch
|
blob
|
history
diff --git
a/source/scripting/python/samba/provision.py
b/source/scripting/python/samba/provision.py
index 0119f40c7f3c7b5f9c859cbb1aaaaa355eb4314e..33aeff2008cb9095dd0dbf768046096c636ad9f1 100644
(file)
--- a/
source/scripting/python/samba/provision.py
+++ b/
source/scripting/python/samba/provision.py
@@
-1453,6
+1453,7
@@
def load_schema(setup_path, samdb, schemadn, netbiosname, configdn, sitename):
schema_data = open(setup_path("schema.ldif"), 'r').read()
schema_data += open(setup_path("schema_samba4.ldif"), 'r').read()
schema_data = substitute_var(schema_data, {"SCHEMADN": schemadn})
+ check_all_substituted(schema_data)
prefixmap = open(setup_path("prefixMap.txt"), 'r').read()
prefixmap = b64encode(prefixmap)
@@
-1464,5
+1465,6
@@
def load_schema(setup_path, samdb, schemadn, netbiosname, configdn, sitename):
"DEFAULTSITE":sitename,
"PREFIXMAP_B64":prefixmap
})
+ check_all_substituted(head_data)
samdb.attach_schema_from_ldif(head_data, schema_data)