From fddcee6325afe78d5b4598b22b3ebd1338082cb3 Mon Sep 17 00:00:00 2001 From: Andrew Kroeger Date: Wed, 2 Sep 2009 03:25:22 -0500 Subject: 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. --- source4/scripting/python/samba/provision.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'source4/scripting/python') diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index 7b3ef4b577..8bc812ac77 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -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"), { -- cgit