[1878] in Moira Commits
/svn/moira r4020 - trunk/moira/incremental/ldap
daemon@ATHENA.MIT.EDU (Garry Zacheiss)
Thu Sep 2 09:46:17 2010
Date: Thu, 2 Sep 2010 09:46:10 -0400
From: Garry Zacheiss <zacheiss@MIT.EDU>
Message-Id: <201009021346.o82DkAtN015036@drugstore.mit.edu>
To: moira-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: zacheiss
Date: 2010-09-02 09:46:09 -0400 (Thu, 02 Sep 2010)
New Revision: 4020
Modified:
trunk/moira/incremental/ldap/winad.c
Log:
Disable encryption; work around race condition.
Modified: trunk/moira/incremental/ldap/winad.c
===================================================================
--- trunk/moira/incremental/ldap/winad.c 2010-09-01 22:25:46 UTC (rev 4019)
+++ trunk/moira/incremental/ldap/winad.c 2010-09-02 13:46:09 UTC (rev 4020)
@@ -4399,7 +4399,7 @@
n = 0;
ADD_ATTR("mitMoiraIMAPAddress", mit_moira_imap_address_v,
- LDAP_MOD_REPLACE);
+ LDAP_MOD_REPLACE);
mods[n] = NULL;
rc = ldap_modify_s(ldap_handle, distinguished_name, mods);
@@ -4411,8 +4411,8 @@
"Unable to set the mitMoiraIMAPAddress for %s : %s",
user_name, ldap_err2string(rc));
- }
-
+ }
+
argv[0] = user_name;
if (!(rc = mr_query("get_pobox", 1, argv, save_query_info, save_argv)))
@@ -9172,7 +9172,7 @@
int rc;
int i;
int mdbbl_count;
- int rangeStep = 100;
+ int rangeStep = 1500;
int rangeLow = 0;
int rangeHigh = rangeLow + (rangeStep - 1);
int isLast = 0;
@@ -9522,6 +9522,7 @@
ULONG rc;
int Max_wait_time = 1000;
int Max_size_limit = LDAP_NO_LIMIT;
+ sasl_ssf_t max_ssf = 0;
LDAPControl **ctrls = NULL;
if (strlen(ldap_domain) == 0)
@@ -9556,6 +9557,8 @@
(void *)&Max_size_limit);
rc = ldap_set_option((*ldap_handle), LDAP_OPT_REFERRALS,
LDAP_OPT_OFF);
+ rc = ldap_set_option((*ldap_handle), LDAP_OPT_X_SASL_SSF_MAX,
+ &max_ssf);
rc = ldap_sasl_interactive_bind_ext_s((*ldap_handle), "", sasl_mech,
NULL, NULL, sasl_flags,
