From: Marco Bettini <marco.bettini@open-xchange.com>
Date: Fri, 15 Mar 2024 10:17:54 +0000 (+0000)
Subject: auth: struct ldap-settings - Drop ldaprc_path
X-Git-Tag: 2.4.1~780
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb3e48281bdd86e2e42493725f9c47c7845af606;p=thirdparty%2Fdovecot%2Fcore.git

auth: struct ldap-settings - Drop ldaprc_path
---

diff --git a/src/auth/db-ldap-settings.c b/src/auth/db-ldap-settings.c
index 9b7d476984..1b7e7e2418 100644
--- a/src/auth/db-ldap-settings.c
+++ b/src/auth/db-ldap-settings.c
@@ -40,7 +40,6 @@ static const struct setting_define ldap_setting_defines[] = {
 	DEF(STR, base),
 	DEF(UINT, ldap_version),
 	DEF(STR, debug_level),
-	DEF(STR, ldaprc_path),
 	DEF(STR, user_attrs),
 	DEF(STR, user_filter),
 	DEF(STR, pass_attrs),
@@ -75,7 +74,6 @@ static const struct ldap_settings ldap_default_settings = {
 	.base = "",
 	.ldap_version = 3,
 	.debug_level = "0",
-	.ldaprc_path = "",
 	.user_attrs = "homeDirectory=home,uidNumber=uid,gidNumber=gid",
 	.user_filter = "(&(objectClass=posixAccount)(uid=%u))",
 	.pass_attrs = "uid=user,userPassword=password",
diff --git a/src/auth/db-ldap-settings.h b/src/auth/db-ldap-settings.h
index 1b6eddfd52..668266f4a7 100644
--- a/src/auth/db-ldap-settings.h
+++ b/src/auth/db-ldap-settings.h
@@ -25,7 +25,6 @@ struct ldap_settings {
 	const char *scope;
 	const char *base;
 
-	const char *ldaprc_path;
 	const char *debug_level;
 
 	const char *user_attrs;
diff --git a/src/auth/db-ldap.c b/src/auth/db-ldap.c
index 0830eb783b..f02fbc185e 100644
--- a/src/auth/db-ldap.c
+++ b/src/auth/db-ldap.c
@@ -1726,16 +1726,6 @@ struct ldap_connection *db_ldap_init(struct event *event)
 			i_fatal("LDAP: ldap_tls=yes requires ldap_version=3");
 	}
 
-	if (*conn->set->ldaprc_path != '\0') {
-		const char *str = getenv("LDAPRC");
-		if (str != NULL && strcmp(str, conn->set->ldaprc_path) != 0) {
-			i_fatal("LDAP: Multiple different ldap_ldaprc_path "
-				"settings not allowed (%s and %s)",
-				str, conn->set->ldaprc_path);
-		}
-		env_put("LDAPRC", conn->set->ldaprc_path);
-	}
-
 	conn->event = event_create(auth_event);
 	event_set_append_log_prefix(conn->event, "ldap: ");