[PATCH] s4:setup: Use ms_display_specifiers script for provision.

Andrew Kroeger andrew at id10ts.net
Wed Sep 2 02:25:22 MDT 2009


Changed the provisioning to use the new script to parse the Microsoft-provided
DisplaySpecifiers LDIF file.
---
 source4/scripting/python/samba/provision.py |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 7b3ef4b..8bc812a 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"), {
-- 
1.6.0.6


--------------020105050703040300010000
Content-Type: text/plain;
 name="0005-s4-setup-Updated-comment-to-reflect-new-DisplaySpec.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename*0="0005-s4-setup-Updated-comment-to-reflect-new-DisplaySpec.pat";
 filename*1="ch"



More information about the samba-technical mailing list