configure: Remove ldap_start_tls_s() check - it should nowadays always exist

diff --git a/m4/want_ldap.m4 b/m4/want_ldap.m4
index 5af97cb2ef768306e3044bacce51faa760fac9f7..f0fb239921a5055ffc2994373a0a935e94a3fcf0 100644 (file)
--- a/m4/want_ldap.m4
+++ b/m4/want_ldap.m4
@@ -49,9 +49,6 @@ AC_DEFUN([DOVECOT_WANT_LDAP], [
       ])
     ], $LDAP_LIBS)
 
-    AC_CHECK_LIB(ldap, ldap_start_tls_s, [
-      AC_DEFINE(LDAP_HAVE_START_TLS_S,, [Define if you have ldap_start_tls_s])
-    ],, $LDAP_LIBS)
     AC_DEFINE(USERDB_LDAP,, [Build with LDAP support])
     AC_DEFINE(PASSDB_LDAP,, [Build with LDAP support])
     AC_CHECK_HEADERS(sasl.h sasl/sasl.h)

diff --git a/src/auth/db-ldap-settings.c b/src/auth/db-ldap-settings.c
index 1a0e22ac90722d6033d674fd01a4398f65856f4e..8ff5affaa139fc268489404c03a22de27a493569 100644 (file)
--- a/src/auth/db-ldap-settings.c
+++ b/src/auth/db-ldap-settings.c
@@ -158,13 +158,6 @@ static bool ldap_setting_check(void *_set, pool_t pool ATTR_UNUSED,
                return FALSE;
        }
 
-#ifndef LDAP_HAVE_START_TLS_S
-       if (set->starttls) {
-               *error_r = "ldap_starttls=yes, but your LDAP library doesn't support TLS";
-               return FALSE;
-       }
-#endif
-
 #ifndef HAVE_LDAP_SASL
        if (!array_is_empty(&set->auth_sasl_mechanisms)) {
                *error_r = "ldap_auth_sasl_mechanism set, but no SASL support compiled in";

diff --git a/src/auth/db-ldap.c b/src/auth/db-ldap.c
index c7add80138bf5625e5d3c54ab731cddbf7a6e2e1..cb70e6d6c5c9ec66dc8a9ac767b0749d63d382f4 100644 (file)
--- a/src/auth/db-ldap.c
+++ b/src/auth/db-ldap.c
@@ -949,7 +949,6 @@ int db_ldap_connect(struct ldap_connection *conn)
                db_ldap_init_ld(conn);
 
        if (conn->set->starttls) {
-#ifdef LDAP_HAVE_START_TLS_S
                ret = ldap_start_tls_s(conn->ld, NULL, NULL);
                if (ret != LDAP_SUCCESS) {
                        if (ret == LDAP_OPERATIONS_ERROR &&
@@ -962,9 +961,6 @@ int db_ldap_connect(struct ldap_connection *conn)
                                ldap_err2string(ret));
                        return -1;
                }
-#else
-               i_unreached(); /* already checked at init */
-#endif
        }
 
        if (db_ldap_bind(conn) < 0)