From: Jakob Haufe <sur5r@sur5r.net>
Date: Sun, 25 May 2025 13:04:50 +0000 (+0200)
Subject: [PATCH] Fix LDAP SASL auth support
X-Git-Tag: archive/raspbian/1%2.4.1+dfsg1-6+rpi1^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=071aa3db7fa18b8df180d5d147592bcda83c1447;p=dovecot.git

[PATCH] Fix LDAP SASL auth support

961275fdb54878fdfa4ee1b9f1a4f00e82bf4a83 moved code without creating a
way to have HAVE_LDAP_SASL defined there.

Copy the preprocessor block from src/auth/db-ldap.c to fix this.

Gbp-Pq: Name bug1106784_Fix-LDAP-SASL-auth-support.patch
---

diff --git a/src/auth/db-ldap-settings.c b/src/auth/db-ldap-settings.c
index 6c8feb3..9245fca 100644
--- a/src/auth/db-ldap-settings.c
+++ b/src/auth/db-ldap-settings.c
@@ -137,6 +137,18 @@ const struct setting_parser_info ldap_post_setting_parser_info = {
 
 /* <settings checks> */
 
+#define HAVE_LDAP_SASL
+#ifdef HAVE_SASL_SASL_H
+#  include <sasl/sasl.h>
+#elif defined (HAVE_SASL_H)
+#  include <sasl.h>
+#else
+#  undef HAVE_LDAP_SASL
+#endif
+#if !defined(SASL_VERSION_MAJOR) || SASL_VERSION_MAJOR < 2
+#  undef HAVE_LDAP_SASL
+#endif
+
 static int ldap_parse_deref(const char *str, int *ref_r)
 {
 	if (strcasecmp(str, "never") == 0)