[PATCH 5/7] s4:provision - Moved helper functions into provisionutil.py.

[Endi S. Dewata]

---
 source4/scripting/python/samba/provision.py     |   26 +-----------
 source4/scripting/python/samba/provisionutil.py |   51 +++++++++++++++++++++++
 2 files changed, 52 insertions(+), 25 deletions(-)
 create mode 100644 source4/scripting/python/samba/provisionutil.py

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 02bfd26..5b7e717 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -49,6 +49,7 @@ from samba.ntacls import setntacl, dsacl2fsacl
 from samba.ndr import ndr_pack,ndr_unpack
 from samba.schema import Schema
 from ms_display_specifiers import read_ms_ldif
+from samba.provisionutil import setup_add_ldif, setup_modify_ldif
 from samba.provisionbackend import LDBBackend, ExistingBackend, FDSBackend, OpenLDAPBackend
 from provisionexceptions import ProvisioningError, InvalidNetbiosName
 
@@ -226,31 +227,6 @@ findnss_uid = lambda names: findnss(pwd.getpwnam, names)[2]
 findnss_gid = lambda names: findnss(grp.getgrnam, names)[2]
 
 
-def setup_add_ldif(ldb, ldif_path, subst_vars=None,controls=["relax:0"]):
-    """Setup a ldb in the private dir.
-    
-    :param ldb: LDB file to import data into
-    :param ldif_path: Path of the LDIF file to load
-    :param subst_vars: Optional variables to subsitute in LDIF.
-    :param nocontrols: Optional list of controls, can be None for no controls
-    """
-    assert isinstance(ldif_path, str)
-    data = read_and_sub_file(ldif_path, subst_vars)
-    ldb.add_ldif(data,controls)
-
-
-def setup_modify_ldif(ldb, ldif_path, subst_vars=None):
-    """Modify a ldb in the private dir.
-    
-    :param ldb: LDB object.
-    :param ldif_path: LDIF file path.
-    :param subst_vars: Optional dictionary with substitution variables.
-    """
-    data = read_and_sub_file(ldif_path, subst_vars)
-
-    ldb.modify_ldif(data)
-
-
 def setup_ldb(ldb, ldif_path, subst_vars):
     """Import a LDIF a file into a LDB handle, optionally substituting variables.
 
diff --git a/source4/scripting/python/samba/provisionutil.py b/source4/scripting/python/samba/provisionutil.py
new file mode 100644
index 0000000..d4aed22
--- /dev/null
+++ b/source4/scripting/python/samba/provisionutil.py
@@ -0,0 +1,51 @@
+#
+# Unix SMB/CIFS implementation.
+# backend code for provisioning a Samba4 server
+
+# Copyright (C) Jelmer Vernooij <jelmer at samba.org> 2007-2008
+# Copyright (C) Andrew Bartlett <abartlet at samba.org> 2008-2009
+# Copyright (C) Oliver Liebel <oliver at itc.li> 2008-2009
+#
+# Based on the original in EJS:
+# Copyright (C) Andrew Tridgell <tridge at samba.org> 2005
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#   
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#   
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+from samba import read_and_sub_file
+
+def setup_add_ldif(ldb, ldif_path, subst_vars=None,controls=["relax:0"]):
+    """Setup a ldb in the private dir.
+    
+    :param ldb: LDB file to import data into
+    :param ldif_path: Path of the LDIF file to load
+    :param subst_vars: Optional variables to subsitute in LDIF.
+    :param nocontrols: Optional list of controls, can be None for no controls
+    """
+    assert isinstance(ldif_path, str)
+    data = read_and_sub_file(ldif_path, subst_vars)
+    ldb.add_ldif(data,controls)
+
+
+def setup_modify_ldif(ldb, ldif_path, subst_vars=None):
+    """Modify a ldb in the private dir.
+    
+    :param ldb: LDB object.
+    :param ldif_path: LDIF file path.
+    :param subst_vars: Optional dictionary with substitution variables.
+    """
+    data = read_and_sub_file(ldif_path, subst_vars)
+
+    ldb.modify_ldif(data)
+
-- 
1.6.6


------=_Part_68415_58125355.1265837901273
Content-Type: text/x-patch;
	name=0006-s4-provision-Added-LDAP-URI-parameter.patch
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename=0006-s4-provision-Added-LDAP-URI-parameter.patch