testprogs/blackbox: PY3 bulk change for python scripts use correct python

[amitay/samba.git] / python / samba / sd_utils.py

diff --git a/python/samba/sd_utils.py b/python/samba/sd_utils.py
index ded9bfc19262aa975f3b1e1c7c6476c6896b7c3d..26e80ee2f4ac6d4bc434b364055e1da96b249a3a 100644 (file)
--- a/python/samba/sd_utils.py
+++ b/python/samba/sd_utils.py
@@ -37,7 +37,11 @@ class SDUtils(object):
             or security.descriptor object
         """
         m = Message()
-        m.dn = Dn(self.ldb, object_dn)
+        if isinstance(object_dn, Dn):
+            m.dn = object_dn
+        else:
+            m.dn = Dn(self.ldb, object_dn)
+
         assert(isinstance(sd, str) or isinstance(sd, security.descriptor))
         if isinstance(sd, str):
             tmp_desc = security.descriptor.from_sddl(sd, self.domain_sid)
@@ -45,8 +49,8 @@ class SDUtils(object):
             tmp_desc = sd
 
         m["nTSecurityDescriptor"] = MessageElement(ndr_pack(tmp_desc),
-                                                       FLAG_MOD_REPLACE,
-                                                       "nTSecurityDescriptor")
+                                                   FLAG_MOD_REPLACE,
+                                                   "nTSecurityDescriptor")
         self.ldb.modify(m, controls)
 
     def read_sd_on_dn(self, object_dn, controls=None):
@@ -62,7 +66,7 @@ class SDUtils(object):
     def dacl_add_ace(self, object_dn, ace):
         """Add an ACE to an objects security descriptor
         """
-        desc = self.read_sd_on_dn(object_dn)
+        desc = self.read_sd_on_dn(object_dn, ["show_deleted:1"])
         desc_sddl = desc.as_sddl(self.domain_sid)
         if ace in desc_sddl:
             return
@@ -71,10 +75,10 @@ class SDUtils(object):
                          desc_sddl[desc_sddl.index("("):])
         else:
             desc_sddl = desc_sddl + ace
-        self.modify_sd_on_dn(object_dn, desc_sddl)
+        self.modify_sd_on_dn(object_dn, desc_sddl, ["show_deleted:1"])
 
-    def get_sd_as_sddl(self, object_dn, controls=None):
+    def get_sd_as_sddl(self, object_dn, controls=[]):
         """Return object nTSecutiryDescriptor in SDDL format
         """
-        desc = self.read_sd_on_dn(object_dn, controls=controls)
+        desc = self.read_sd_on_dn(object_dn, controls + ["show_deleted:1"])
         return desc.as_sddl(self.domain_sid)