diff options
| author | Julian Pullen <Julian.Pullen@Sun.COM> | 2009-10-02 14:03:51 +0100 |
|---|---|---|
| committer | Julian Pullen <Julian.Pullen@Sun.COM> | 2009-10-02 14:03:51 +0100 |
| commit | bd42852645f5ef79a1729096abd7405b72e159f7 (patch) | |
| tree | 1d6db1b755d015daddd13398a57003494ae01a29 /usr/src/lib/libadutils/common/addisc.c | |
| parent | d5c74c206594778658b2f1e87129ed10e879d953 (diff) | |
| download | illumos-joyent-bd42852645f5ef79a1729096abd7405b72e159f7.tar.gz | |
6822695 libadutils does not setup the mutlti threading routines for using LDAP (libldap5)
Diffstat (limited to 'usr/src/lib/libadutils/common/addisc.c')
| -rw-r--r-- | usr/src/lib/libadutils/common/addisc.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/usr/src/lib/libadutils/common/addisc.c b/usr/src/lib/libadutils/common/addisc.c index f98461554d..7a9805bc68 100644 --- a/usr/src/lib/libadutils/common/addisc.c +++ b/usr/src/lib/libadutils/common/addisc.c @@ -834,7 +834,6 @@ ldap_lookup_init(idmap_ad_disc_ds_t *ds) ldversion = LDAP_VERSION3; (void) ldap_set_option(ld, LDAP_OPT_PROTOCOL_VERSION, &ldversion); - (void) ldap_set_option(ld, LDAP_OPT_REFERRALS, LDAP_OPT_OFF); (void) ldap_set_option(ld, LDAP_OPT_TIMELIMIT, &zero); @@ -845,6 +844,14 @@ ldap_lookup_init(idmap_ad_disc_ds_t *ds) (void) ldap_set_option(ld, LDAP_OPT_RESTART, LDAP_OPT_ON); + rc = adutils_set_thread_functions(ld); + if (rc != LDAP_SUCCESS) { + /* Error has already been logged */ + (void) ldap_unbind(ld); + ld = NULL; + continue; + } + rc = ldap_sasl_interactive_bind_s(ld, "" /* binddn */, saslmech, NULL, NULL, saslflags, &saslcallback, NULL /* defaults */); |