From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Tue, 14 Jan 2025 13:08:12 +0000 (+0200)
Subject: configure: Remove ldap_start_tls_s() check - it should nowadays always exist
X-Git-Tag: 2.4.0~50
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b12b0fa4c3b35a3347d4ed6da1ecfed2c46515ee;p=thirdparty%2Fdovecot%2Fcore.git

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 5af97cb2ef..f0fb239921 100644
--- 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 1a0e22ac90..8ff5affaa1 100644
--- 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 c7add80138..cb70e6d6c5 100644
--- 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)