From bce8017ca9f64ce8e3bf94312d69f97e87d3d41a Mon Sep 17 00:00:00 2001 From: Matthias Dieter Wallnöfer Date: Fri, 18 Jun 2010 22:20:22 +0200 Subject: s4:python/samba/__init__.py - now specify the "relax" control for the delete operation before the provision --- source4/scripting/python/samba/__init__.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py index d870879a1e..ce408de049 100644 --- a/source4/scripting/python/samba/__init__.py +++ b/source4/scripting/python/samba/__init__.py @@ -147,7 +147,7 @@ class Ldb(_Ldb): try: for msg in res: - self.delete(msg.dn) + self.delete(msg.dn, ["relax:0"]) except ldb.LdbError, (errno, _): if errno != ldb.ERR_NO_SUCH_OBJECT: # Ignore no such object errors @@ -170,7 +170,7 @@ class Ldb(_Ldb): "(&(|(objectclass=*)(distinguishedName=*))(!(distinguishedName=@BASEINFO)))", [], controls=["show_deleted:0"]): try: - self.delete(msg.dn) + self.delete(msg.dn, ["relax:0"]) except ldb.LdbError, (errno, _): if errno != ldb.ERR_NO_SUCH_OBJECT: # Ignore no such object errors @@ -184,7 +184,7 @@ class Ldb(_Ldb): for attr in ["@SUBCLASSES", "@MODULES", "@OPTIONS", "@PARTITION", "@KLUDGEACL"]: try: - self.delete(attr) + self.delete(attr, ["relax:0"]) except ldb.LdbError, (errno, _): if errno != ldb.ERR_NO_SUCH_OBJECT: # Ignore missing dn errors @@ -198,7 +198,7 @@ class Ldb(_Ldb): # delete the specials for attr in ["@INDEXLIST", "@ATTRIBUTES"]: try: - self.delete(attr) + self.delete(attr, ["relax:0"]) except ldb.LdbError, (errno, _): if errno != ldb.ERR_NO_SUCH_OBJECT: # Ignore missing dn errors @@ -220,7 +220,7 @@ class Ldb(_Ldb): erase_recursive(self, msg.dn) try: - self.delete(dn) + self.delete(dn, ["relax:0"]) except ldb.LdbError, (errno, _): if errno != ldb.ERR_NO_SUCH_OBJECT: # Ignore no such object errors -- cgit