Fix some forgotten substitute variables in provision, add check to prevent this sort...
authorJelmer Vernooij <jelmer@samba.org>
Fri, 1 Aug 2008 18:17:29 +0000 (20:17 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 1 Aug 2008 18:17:29 +0000 (20:17 +0200)
(This used to be commit a461118f3b668779f907c4d77cebe1e76fa4e39f)

source4/scripting/python/samba/provision.py

index 0119f40c7f3c7b5f9c859cbb1aaaaa355eb4314e..33aeff2008cb9095dd0dbf768046096c636ad9f1 100644 (file)
@@ -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})
     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)
 
     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
     })
                     "DEFAULTSITE":sitename,
                     "PREFIXMAP_B64":prefixmap
     })
+    check_all_substituted(head_data)
     samdb.attach_schema_from_ldif(head_data, schema_data)
 
     samdb.attach_schema_from_ldif(head_data, schema_data)