summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2010-06-25 12:27:27 +0200
committerStefan Metzmacher <metze@samba.org>2010-06-26 09:50:54 +0200
commit89f94a43d89c9c0238f7b1d3d294175f8482adf9 (patch)
tree6ab0402ebb6b8e00fd6b63abf470a961325e9edc
parent2f7fe9db023022c03e104dcc43a39f20bf5c804b (diff)
downloadsamba-89f94a43d89c9c0238f7b1d3d294175f8482adf9.tar.gz
samba-89f94a43d89c9c0238f7b1d3d294175f8482adf9.tar.bz2
samba-89f94a43d89c9c0238f7b1d3d294175f8482adf9.zip
s4:provision: pass relax control also to modify_ldif
metze
-rw-r--r--source4/scripting/python/samba/provision.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index a3ff891e5d..f48795d363 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -344,7 +344,7 @@ def setup_add_ldif(ldb, ldif_path, subst_vars=None,controls=["relax:0"]):
ldb.add_ldif(data, controls)
-def setup_modify_ldif(ldb, ldif_path, subst_vars=None):
+def setup_modify_ldif(ldb, ldif_path, subst_vars=None,controls=["relax:0"]):
"""Modify a ldb in the private dir.
:param ldb: LDB object.
@@ -352,7 +352,7 @@ def setup_modify_ldif(ldb, ldif_path, subst_vars=None):
:param subst_vars: Optional dictionary with substitution variables.
"""
data = read_and_sub_file(ldif_path, subst_vars)
- ldb.modify_ldif(data)
+ ldb.modify_ldif(data, controls)
def setup_ldb(ldb, ldif_path, subst_vars):