auth: struct ldap_settings - Rename tls into starttls

diff --git a/src/auth/db-ldap-settings.c b/src/auth/db-ldap-settings.c
index af37205f4b4ab326c9d4f17219e7d804253c11ca..6c682708871a417f592b5bfafeb80410fdefbf32 100644 (file)
--- a/src/auth/db-ldap-settings.c
+++ b/src/auth/db-ldap-settings.c
@@ -24,7 +24,7 @@ static const struct setting_define ldap_setting_defines[] = {
        DEF(STR, dnpass),
        DEF(BOOL, auth_bind),
        DEF(STR, auth_bind_userdn),
-       DEF(BOOL, tls),
+       DEF(BOOL, starttls),
        DEF(BOOL, sasl_bind),
        DEF(STR, sasl_mech),
        DEF(STR, sasl_realm),
@@ -58,7 +58,7 @@ static const struct ldap_settings ldap_default_settings = {
        .dnpass = "",
        .auth_bind = FALSE,
        .auth_bind_userdn = "",
-       .tls = FALSE,
+       .starttls = FALSE,
        .sasl_bind = FALSE,
        .sasl_mech = "",
        .sasl_realm = "",

diff --git a/src/auth/db-ldap-settings.h b/src/auth/db-ldap-settings.h
index 1bdb51afc5d2d9d5814e1b06d9eb411ba597d017..9bdb01e2734b78726d67fb4cff0dc340516c1d3f 100644 (file)
--- a/src/auth/db-ldap-settings.h
+++ b/src/auth/db-ldap-settings.h
@@ -46,7 +46,7 @@ struct ldap_settings {
        gid_t gid;
 
        bool auth_bind;
-       bool tls;
+       bool starttls;
        bool sasl_bind;
        bool blocking;
 };

diff --git a/src/auth/db-ldap.c b/src/auth/db-ldap.c
index 93dc8e1a901e0f9bc8935bcc9cb990d4bd9e8160..c6124f67df5aeb542246832951515954f1d87876 100644 (file)
--- a/src/auth/db-ldap.c
+++ b/src/auth/db-ldap.c
@@ -942,14 +942,14 @@ int db_ldap_connect(struct ldap_connection *conn)
        if (conn->ld == NULL)
                db_ldap_init_ld(conn);
 
-       if (conn->set->tls) {
+       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 &&
                            conn->set->uris != NULL &&
                            str_begins_with(conn->set->uris, "ldaps:")) {
-                               i_fatal("LDAP: Don't use both tls=yes and ldaps URI");
+                               i_fatal("LDAP: Don't use both ldap_starttls=yes and ldaps URI");
                        }
                        e_error(conn->event, "ldap_start_tls_s() failed: %s",
                                ldap_err2string(ret));
@@ -1712,8 +1712,8 @@ struct ldap_connection *db_ldap_init(struct event *event)
        }
 #endif
 #ifndef LDAP_HAVE_START_TLS_S
-       if (conn->set->tls)
-               i_fatal("LDAP: ldap_tls=yes, but your LDAP library doesn't support TLS");
+       if (conn->set->starttls)
+               i_fatal("LDAP: ldap_starttls=yes, but your LDAP library doesn't support TLS");
 #endif
 #ifndef HAVE_LDAP_SASL
        if (conn->set->sasl_bind)
@@ -1722,8 +1722,8 @@ struct ldap_connection *db_ldap_init(struct event *event)
        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)
-                       i_fatal("LDAP: ldap_tls=yes requires ldap_version=3");
+               if (conn->set->starttls)
+                       i_fatal("LDAP: ldap_starttls=yes requires ldap_version=3");
        }
 
        conn->event = event_create(auth_event);