mirror of
https://github.com/samba-team/samba.git
synced 2024-12-27 03:21:53 +03:00
Fix some forgotten substitute variables in provision, add check to prevent this sort of regression in the future.
(This used to be commit a461118f3b
)
This commit is contained in:
parent
ee505f36dd
commit
3573420d7d
@ -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)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user