HACK sec_descr

diff --git a/source4/dsdb/tests/python/sec_descriptor.py b/source4/dsdb/tests/python/sec_descriptor.py
index 79cbea75f857582ae1ebaee44f228d2eccaf0195..c6c6f7b0c3b3f8e7323f05bb1678491aff94ee91 100755 (executable)
--- a/source4/dsdb/tests/python/sec_descriptor.py
+++ b/source4/dsdb/tests/python/sec_descriptor.py
@@ -1683,10 +1683,10 @@ 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)

diff --git a/source4/libcli/ldap/ldap_bind.c b/source4/libcli/ldap/ldap_bind.c
index 66fe9f5ea92b113a28f965aeb24cb2a26732ed78..c8e1024169faf2368dc54e5c924d6f3f72ab1737 100644 (file)
--- a/source4/libcli/ldap/ldap_bind.c
+++ b/source4/libcli/ldap/ldap_bind.c
@@ -321,6 +321,7 @@ try_logon_again:
        if (wrap_flags == 0) {
                cli_credentials_set_gensec_features(creds, old_gensec_features & ~(GENSEC_FEATURE_SIGN|GENSEC_FEATURE_SEAL));
        }
+               cli_credentials_set_gensec_features(creds, old_gensec_features & ~(GENSEC_FEATURE_SIGN|GENSEC_FEATURE_SEAL));
 
        /* this call also sets the gensec_want_features */
        status = gensec_set_credentials(conn->gensec, creds);