auth: struct ldap_settings - Fix ldap_ldap_version -> ldap_version

diff --git a/src/auth/db-ldap-settings.c b/src/auth/db-ldap-settings.c
index 1b7e7e2418037d0baa06964b36ec377c4799aae0..af37205f4b4ab326c9d4f17219e7d804253c11ca 100644 (file)
--- a/src/auth/db-ldap-settings.c
+++ b/src/auth/db-ldap-settings.c
@@ -38,7 +38,7 @@ static const struct setting_define ldap_setting_defines[] = {
        DEF(STR, deref),
        DEF(STR, scope),
        DEF(STR, base),
-       DEF(UINT, ldap_version),
+       DEF(UINT, version),
        DEF(STR, debug_level),
        DEF(STR, user_attrs),
        DEF(STR, user_filter),
@@ -72,7 +72,7 @@ static const struct ldap_settings ldap_default_settings = {
        .deref = "never",
        .scope = "subtree",
        .base = "",
-       .ldap_version = 3,
+       .version = 3,
        .debug_level = "0",
        .user_attrs = "homeDirectory=home,uidNumber=uid,gidNumber=gid",
        .user_filter = "(&(objectClass=posixAccount)(uid=%u))",

diff --git a/src/auth/db-ldap-settings.h b/src/auth/db-ldap-settings.h
index 668266f4a7b19805e7dc6e924cdf20abfff6815d..1bdb51afc5d2d9d5814e1b06d9eb411ba597d017 100644 (file)
--- a/src/auth/db-ldap-settings.h
+++ b/src/auth/db-ldap-settings.h
@@ -36,7 +36,7 @@ struct ldap_settings {
 
        const char *default_pass_scheme;
 
-       unsigned int ldap_version;
+       unsigned int version;
 
        int ldap_deref;
        int ldap_scope;

diff --git a/src/auth/db-ldap.c b/src/auth/db-ldap.c
index f02fbc185e824c0b4ffdd2110bfa58f06e751483..f6a758967ec225a3bd94a539698c3efb84cfd9d0 100644 (file)
--- a/src/auth/db-ldap.c
+++ b/src/auth/db-ldap.c
@@ -894,9 +894,9 @@ static void db_ldap_set_options(struct ldap_connection *conn)
        }
 #endif
 
-       unsigned int ldap_version = conn->set->ldap_version;
-       db_ldap_set_opt(conn->ld, LDAP_OPT_PROTOCOL_VERSION, &ldap_version,
-                       "protocol_version", dec2str(ldap_version));
+       db_ldap_set_opt(conn->ld, LDAP_OPT_PROTOCOL_VERSION,
+                       &conn->set->version,
+                       "protocol_version", dec2str(conn->set->version));
        db_ldap_set_tls_options(conn);
 }
 
@@ -1719,7 +1719,7 @@ struct ldap_connection *db_ldap_init(struct event *event)
        if (conn->set->sasl_bind)
                i_fatal("LDAP: ldap_sasl_bind=yes but no SASL support compiled in");
 #endif
-       if (conn->set->ldap_version < 3) {
+       if (conn->set->version < 3) {
                if (conn->set->sasl_bind)
                        i_fatal("LDAP: ldap_sasl_bind=yes requires ldap_version=3");
                if (conn->set->tls)