diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-08-01 20:17:29 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-08-01 20:17:29 +0200 |
| commit | 3573420d7d108d796e0b424c131061dc74c23033 (patch) | |
| tree | 01616d6ece3f45a9a6e9881accbf0e05a70cacd7 /source4/scripting | |
| parent | ee505f36dddfe04a10fdc8fd8a8bd40d5fbfa218 (diff) | |
| download | samba-3573420d7d108d796e0b424c131061dc74c23033.tar.gz samba-3573420d7d108d796e0b424c131061dc74c23033.tar.bz2 samba-3573420d7d108d796e0b424c131061dc74c23033.zip | |
Fix some forgotten substitute variables in provision, add check to prevent this sort of regression in the future.
(This used to be commit a461118f3b668779f907c4d77cebe1e76fa4e39f)
Diffstat (limited to 'source4/scripting')
| -rw-r--r-- | source4/scripting/python/samba/provision.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index 0119f40c7f..33aeff2008 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/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) |