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

Revert "HACK sec_descr"

This reverts commit cc2bb18cb53f928cb275351fe1797676c909a7ff.
---

diff --git a/source4/dsdb/tests/python/sec_descriptor.py b/source4/dsdb/tests/python/sec_descriptor.py
index c49b3b07c3ee..087ce5e2cbe2 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, "O:BAG:BA", controls=["sd_flags:1:%d" % (SECINFO_OWNER)])
+        self.sd_utils.modify_sd_on_dn(ou_dn, self.test_descr, 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("BA" in desc_sddl)
+        self.assertTrue("O:AU" 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 042ffa6fdffb..b355e18e0d31 100644
--- a/source4/libcli/ldap/ldap_bind.c
+++ b/source4/libcli/ldap/ldap_bind.c
@@ -282,7 +282,6 @@ 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);