From 2322c3462d51ea341dd82a79646106bc2ef0fad1 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sat, 27 Oct 2012 08:14:01 +0200 Subject: [PATCH] HACK sec_descr --- source4/dsdb/tests/python/sec_descriptor.py | 4 ++-- source4/libcli/ldap/ldap_bind.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/source4/dsdb/tests/python/sec_descriptor.py b/source4/dsdb/tests/python/sec_descriptor.py index 087ce5e2cbe2..c49b3b07c3ee 100755 --- a/source4/dsdb/tests/python/sec_descriptor.py +++ b/source4/dsdb/tests/python/sec_descriptor.py @@ -1708,10 +1708,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 b355e18e0d31..042ffa6fdffb 100644 --- a/source4/libcli/ldap/ldap_bind.c +++ b/source4/libcli/ldap/ldap_bind.c @@ -282,6 +282,7 @@ try_logon_again: if (tls_enabled(conn->sock)) { 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); -- 2.34.1