Skip to content

Commit e7694a8

Browse files
committed
Re-add option to set referrals.
1 parent d24fe29 commit e7694a8

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

modules/ldap/util_ldap.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -325,20 +325,15 @@ static int uldap_connection_init(request_rec *r,
325325
opt.deref = ldc->deref;
326326
apr_ldap_option_set(r->pool, ldc->ld, APR_LDAP_OPT_DEREF, &opt, &(ldc->result));
327327

328-
#if 0
329328
if (ldc->ChaseReferrals != AP_LDAP_CHASEREFERRALS_SDKDEFAULT) {
330-
#if 0
331329
opt.refs = (ldc->ChaseReferrals == AP_LDAP_CHASEREFERRALS_ON) ?
332330
APR_LDAP_OPT_ON : APR_LDAP_OPT_OFF;
333331
/* Set options for rebind and referrals. */
334332
ap_log_error(APLOG_MARK, APLOG_TRACE4, 0, r->server,
335333
"LDAP: Setting referrals to %s.",
336334
((ldc->ChaseReferrals == AP_LDAP_CHASEREFERRALS_ON) ? "On" : "Off"));
337-
status = apr_ldap_option_set(ldc->ld,
335+
status = apr_ldap_option_set(r->pool, ldc->ld,
338336
APR_LDAP_OPT_REFERRALS, &opt, &(ldc->result));
339-
#else
340-
status = APR_ENOTIMPL;
341-
#endif
342337
if (status != APR_SUCCESS) {
343338
ap_log_error(APLOG_MARK, APLOG_DEBUG, status, r->server, APLOGNO(01279)
344339
"Unable to set LDAP_OPT_REFERRALS option to %s: %d.",
@@ -350,7 +345,6 @@ static int uldap_connection_init(request_rec *r,
350345
return(status);
351346
}
352347
}
353-
#endif
354348

355349
if (ldc->ChaseReferrals == AP_LDAP_CHASEREFERRALS_ON) {
356350
if (ldc->ReferralHopLimit != AP_LDAP_HOPLIMIT_UNSET) {

0 commit comments

Comments
 (0)