From: Jelmer Vernooij Date: Fri, 1 Aug 2008 18:17:29 +0000 (+0200) Subject: Fix some forgotten substitute variables in provision, add check to prevent this sort... X-Git-Tag: samba-4.0.0alpha6~801^3~96 X-Git-Url: http://git.samba.org/samba.git/?p=kai%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=3573420d7d108d796e0b424c131061dc74c23033 Fix some forgotten substitute variables in provision, add check to prevent this sort of regression in the future. (This used to be commit a461118f3b668779f907c4d77cebe1e76fa4e39f) --- diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index 0119f40c7f3..33aeff2008c 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)