From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 13 Nov 2012 13:23:10 +0000 (+0100)
Subject: Revert "HACK sec_destrictor"
X-Git-Url: http://git.samba.org/?p=metze%2Fsamba%2Fwip.git;a=commitdiff_plain;h=1ab91398f4bd52028ee497dceef0e97e772116a0

Revert "HACK sec_destrictor"

This reverts commit b5a487fc341c0e849dd130c6ced60aee755c9b98.
---

diff --git a/source4/dsdb/tests/python/sec_descriptor.py b/source4/dsdb/tests/python/sec_descriptor.py
index 6851b0ef3909..c49b3b07c3ee 100755
--- a/source4/dsdb/tests/python/sec_descriptor.py
+++ b/source4/dsdb/tests/python/sec_descriptor.py
@@ -1708,23 +1708,14 @@ class SdFlagsDescriptorTests(DescriptorTests):
         """
         ou_dn = "OU=test_sdflags_ou," + self.base_dn
         self.ldb_admin.create_ou(ou_dn)
-        self.sd_utils.modify_sd_on_dn(ou_dn, self.test_descr, controls=["sd_flags:1:%d" % (SECINFO_OWNER)])
+        self.sd_utils.modify_sd_on_dn(ou_dn, "O:BAG:BA", controls=["sd_flags:1:%d" % (SECINFO_OWNER)])
         desc_sddl = self.sd_utils.get_sd_as_sddl(ou_dn)
         # make sure we have modified the owner
-        self.assertTrue("O:AU" in desc_sddl)
+        self.assertTrue("BA" in desc_sddl)
         # make sure nothing else has been modified
         self.assertFalse("G:AU" in desc_sddl)
         self.assertFalse("D:(D;;CC;;;LG)" in desc_sddl)
-        self.assertFalse("S:(OU;;WP;;;AU)" in desc_sddl)
-
-        self.sd_utils.modify_sd_on_dn(ou_dn, "O:SO", controls=["sd_flags:1:%d" % (SECINFO_OWNER)])
-        desc_sddl = self.sd_utils.get_sd_as_sddl(ou_dn)
-        # make sure we have modified the owner
-        self.assertTrue("O:SO" in desc_sddl)
-        # make sure nothing else has been modified
-        self.assertTrue("G:" in desc_sddl)
-        self.assertTrue("D:(" in desc_sddl)
-        self.assertTrue("S:(" in desc_sddl)
+        self.assertFalse("(OU;;WP;;;AU)" in desc_sddl)
 
     def test_302(self):
         """ Modify a descriptor with GROUP_SECURITY_INFORMATION set.
@@ -1741,30 +1732,12 @@ class SdFlagsDescriptorTests(DescriptorTests):
         self.assertFalse("D:(D;;CC;;;LG)" in desc_sddl)
         self.assertFalse("(OU;;WP;;;AU)" in desc_sddl)
 
-        self.sd_utils.modify_sd_on_dn(ou_dn, "G:SO", controls=["sd_flags:1:%d" % (SECINFO_GROUP)])
-        desc_sddl = self.sd_utils.get_sd_as_sddl(ou_dn)
-        # make sure we have modified the owner
-        self.assertTrue("G:SO" in desc_sddl)
-        # make sure nothing else has been modified
-        self.assertTrue("U:" in desc_sddl)
-        self.assertTrue("D:(" in desc_sddl)
-        self.assertTrue("S:(" in desc_sddl)
-
     def test_303(self):
         """ Modify a descriptor with SACL_SECURITY_INFORMATION set.
             See that only the owner has been changed.
         """
         ou_dn = "OU=test_sdflags_ou," + self.base_dn
         self.ldb_admin.create_ou(ou_dn)
-        self.sd_utils.modify_sd_on_dn(ou_dn, self.test_descr, controls=["sd_flags:1:%d" % (SECINFO_DACL)])
-        desc_sddl = self.sd_utils.get_sd_as_sddl(ou_dn)
-        # make sure we have modified the DACL
-        self.assertTrue("D:(D;;CC;;;LG)" in desc_sddl)
-        # make sure nothing else has been modified
-        self.assertFalse("O:AU" in desc_sddl)
-        self.assertFalse("G:AU" in desc_sddl)
-        self.assertFalse("S:(OU;;WP;;;AU)" in desc_sddl)
-
         self.sd_utils.modify_sd_on_dn(ou_dn, self.test_descr, controls=["sd_flags:1:%d" % (SECINFO_DACL)])
         desc_sddl = self.sd_utils.get_sd_as_sddl(ou_dn)
         # make sure we have modified the DACL