diff options
| author | Phil Pennock <pdp@exim.org> | 2016-12-31 23:22:22 -0500 |
|---|---|---|
| committer | Phil Pennock <pdp@exim.org> | 2016-12-31 23:22:22 -0500 |
| commit | 4c57a40e227ea6585cf1dd4bef37fbb15e1f7e35 (patch) | |
| tree | 89c90f326007dd3c737b68c2e70cdaab73089f48 /src | |
| parent | cd1a5fe0ed22087c6afbe585ab0206c2a4a267aa (diff) | |
| parent | b738dd0fb2b443db9219013885be38e663c63685 (diff) | |
Merge remote-tracking branch 'github/pr/50'
GitHub user @YmrDtnJu "Björn" provided a patch to fix that we called
ldap_start_tls_s on ldapi:// connections.
This is obviously a correct change, since above we've avoiding
initializing the TLS state if using ldapi.
Added documentation noting this behaviour.
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/lookups/ldap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/src/lookups/ldap.c b/src/src/lookups/ldap.c index 3db787cce..b8a326834 100644 --- a/src/src/lookups/ldap.c +++ b/src/src/lookups/ldap.c @@ -580,7 +580,7 @@ if (!lcp->bound || { DEBUG(D_lookup) debug_printf("%sbinding with user=%s password=%s\n", (lcp->bound)? "re-" : "", user, password); - if (eldap_start_tls && !lcp->is_start_tls_called) + if (eldap_start_tls && !lcp->is_start_tls_called && !ldapi) { #if defined(LDAP_OPT_X_TLS) && !defined(LDAP_LIB_SOLARIS) /* The Oracle LDAP libraries (LDAP_LIB_TYPE=SOLARIS) don't support this. |