1
0
mirror of https://github.com/samba-team/samba.git synced 2025-07-31 20:22:15 +03:00

s4:setup: Use ms_display_specifiers script for provision.

Changed the provisioning to use the new script to parse the Microsoft-provided
DisplaySpecifiers LDIF file.
This commit is contained in:
Andrew Kroeger
2009-09-02 03:25:22 -05:00
committed by Andrew Bartlett
parent 1a657b0413
commit fddcee6325

View File

@ -49,6 +49,7 @@ from samba.dcerpc import security
import urllib
from ldb import SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE, LdbError, timestring
from ms_schema import read_ms_schema
from ms_display_specifiers import read_ms_ldif
from signal import SIGTERM
__docformat__ = "restructuredText"
@ -963,8 +964,10 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
})
message("Setting up display specifiers")
setup_add_ldif(samdb, setup_path("display_specifiers.ldif"),
{"CONFIGDN": names.configdn})
display_specifiers_ldif = read_ms_ldif(setup_path('display-specifiers/DisplaySpecifiers-Win2k8R2.txt'))
display_specifiers_ldif = substitute_var(display_specifiers_ldif, {"CONFIGDN": names.configdn})
check_all_substituted(display_specifiers_ldif)
samdb.add_ldif(display_specifiers_ldif)
message("Adding users container")
setup_add_ldif(samdb, setup_path("provision_users_add.ldif"), {