auth: struct ldap-settings - Drop ldaprc_path

diff --git a/src/auth/db-ldap-settings.c b/src/auth/db-ldap-settings.c
index 9b7d476984725461f3c5815d68f39dbf1dc7b4f7..1b7e7e2418037d0baa06964b36ec377c4799aae0 100644 (file)
--- 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 1b6eddfd52367db9c843bba1b63091bb8e6366fd..668266f4a7b19805e7dc6e924cdf20abfff6815d 100644 (file)
--- 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 0830eb783b8b19e099b8c188fa6697ba6dad0085..f02fbc185e824c0b4ffdd2110bfa58f06e751483 100644 (file)
--- 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: ");