lib-ldap: ldap_client_settings - Rename uri into uris

diff --git a/src/lib-dict-backend/dict-ldap.c b/src/lib-dict-backend/dict-ldap.c
index d232bdb016e6e910e4d8244588e003076e9c0729..0f578de074760a63da212413340c333d83f3fb0d 100644 (file)
--- a/src/lib-dict-backend/dict-ldap.c
+++ b/src/lib-dict-backend/dict-ldap.c
@@ -123,7 +123,7 @@ int dict_ldap_connect(struct ldap_dict *dict, const char **error_r)
 {
        struct ldap_client_settings set;
        i_zero(&set);
-       set.uri = dict->set->uri;
+       set.uris = dict->set->uri;
        set.auth_dn = dict->set->bind_dn;
        set.auth_dn_password = dict->set->password;
        set.timeout_secs = dict->set->timeout;

diff --git a/src/lib-ldap/ldap-client.h b/src/lib-ldap/ldap-client.h
index 4e02f99d157a89f58ce4d04ee87ce1564d005167..9f689d4d05c5fe1fe45dd6677626c04dc6866788 100644 (file)
--- a/src/lib-ldap/ldap-client.h
+++ b/src/lib-ldap/ldap-client.h
@@ -21,7 +21,7 @@ typedef void ldap_result_callback_t(struct ldap_result *result, void *context);
 struct ldap_client_settings {
        /* NOTE: when adding here, remember to update
           ldap_connection_have_settings() and ldap_connection_init() */
-       const char *uri;
+       const char *uris;
        const char *auth_dn;
        const char *auth_dn_password;
 

diff --git a/src/lib-ldap/ldap-connection.c b/src/lib-ldap/ldap-connection.c
index 1f56d6ea2863ae2f306500895acad1b3a0462138..88d6f4b22a62ad5eb1a5745136244277b85a8054 100644 (file)
--- a/src/lib-ldap/ldap-connection.c
+++ b/src/lib-ldap/ldap-connection.c
@@ -43,10 +43,10 @@ int ldap_connection_setup(struct ldap_connection *conn, const char **error_r)
 {
        int ret, opt;
 
-       ret = ldap_initialize(&conn->conn, conn->set.uri);
+       ret = ldap_initialize(&conn->conn, conn->set.uris);
        if (ret != LDAP_SUCCESS) {
-               *error_r = t_strdup_printf("ldap_initialize(uri=%s) failed: %s",
-                                          conn->set.uri, ldap_err2string(ret));
+               *error_r = t_strdup_printf("ldap_initialize(uris=%s) failed: %s",
+                                          conn->set.uris, ldap_err2string(ret));
                return -1;
        }
 
@@ -119,7 +119,7 @@ bool ldap_connection_have_settings(struct ldap_connection *conn,
 {
        const struct ldap_client_settings *conn_set = &conn->set;
 
-       if (strcmp(conn_set->uri, set->uri) != 0)
+       if (strcmp(conn_set->uris, set->uris) != 0)
                return FALSE;
        if (null_strcmp(conn_set->auth_dn, set->auth_dn) != 0)
                return FALSE;
@@ -157,12 +157,12 @@ int ldap_connection_init(struct ldap_client *client,
                         const struct ldap_client_settings *set,
                         struct ldap_connection **conn_r, const char **error_r)
 {
-       i_assert(set->uri != NULL);
+       i_assert(set->uris != NULL);
 
        if (set->require_ssl &&
            !set->starttls &&
-           strncmp("ldaps://",set->uri,8) != 0) {
-               *error_r = t_strdup_printf("ldap_connection_init(uri=%s) failed: %s", set->uri,
+           strncmp("ldaps://",set->uris,8) != 0) {
+               *error_r = t_strdup_printf("ldap_connection_init(uris=%s) failed: %s", set->uris,
                        "uri does not start with ldaps and ssl required without start TLS");
                return -1;
        }
@@ -175,7 +175,7 @@ int ldap_connection_init(struct ldap_client *client,
        conn->client = client;
        conn->set = *set;
        /* deep copy relevant strings */
-       conn->set.uri = p_strdup(pool, set->uri);
+       conn->set.uris = p_strdup(pool, set->uris);
        conn->set.auth_dn = p_strdup(pool, set->auth_dn);
        if (*set->auth_dn_password != '\0') {
                conn->set.auth_dn_password = p_strdup(pool, set->auth_dn_password);
@@ -371,14 +371,14 @@ ldap_connection_connect_parse(struct ldap_connection *conn,
                }
                if (ret != 0) {
                        ldap_connection_result_failure(conn, req, ret, t_strdup_printf(
-                               "ldap_start_tls(uri=%s) failed: %s",
-                               conn->set.uri, ldap_err2string(ret)));
+                               "ldap_start_tls(uris=%s) failed: %s",
+                               conn->set.uris, ldap_err2string(ret)));
                        return ret;
                } else if (result_err != 0) {
                        if (conn->set.require_ssl) {
                                ldap_connection_result_failure(conn, req, result_err, t_strdup_printf(
-                                       "ldap_start_tls(uri=%s) failed: %s",
-                                       conn->set.uri, result_errmsg));
+                                       "ldap_start_tls(uris=%s) failed: %s",
+                                       conn->set.uris, result_errmsg));
                                ldap_memfree(result_errmsg);
                                return LDAP_INVALID_CREDENTIALS; /* make sure it disconnects */
                        }
@@ -390,16 +390,16 @@ ldap_connection_connect_parse(struct ldap_connection *conn,
                                if (ret != 0) {
                                        // if this fails we have to abort
                                        ldap_connection_result_failure(conn, req, ret, t_strdup_printf(
-                                               "ldap_start_tls(uri=%s) failed: %s",
-                                               conn->set.uri, ldap_err2string(ret)));
+                                               "ldap_start_tls(uris=%s) failed: %s",
+                                               conn->set.uris, ldap_err2string(ret)));
                                        return LDAP_INVALID_CREDENTIALS;
                                }
                        }
                        if (ret != LDAP_SUCCESS) {
                                if (conn->set.require_ssl) {
                                        ldap_connection_result_failure(conn, req, ret, t_strdup_printf(
-                                               "ldap_start_tls(uri=%s) failed: %s",
-                                               conn->set.uri, ldap_err2string(ret)));
+                                               "ldap_start_tls(uris=%s) failed: %s",
+                                               conn->set.uris, ldap_err2string(ret)));
                                        return LDAP_UNAVAILABLE;
                                }
                        } else {
@@ -504,12 +504,12 @@ ldap_connect_next_message(struct ldap_connection *conn,
        switch(conn->state) {
        case LDAP_STATE_DISCONNECT:
                /* if we should not disable SSL, and the URI is not ldaps:// */
-               if (!conn->set.starttls || strstr(conn->set.uri, "ldaps://") == NULL) {
+               if (!conn->set.starttls || strstr(conn->set.uris, "ldaps://") == NULL) {
                        ret = ldap_start_tls(conn->conn, NULL, NULL, &req->msgid);
                        if (ret != LDAP_SUCCESS) {
                                ldap_connection_result_failure(conn, req, ret, t_strdup_printf(
-                                       "ldap_start_tls(uri=%s) failed: %s",
-                                       conn->set.uri, ldap_err2string(ret)));
+                                       "ldap_start_tls(uris=%s) failed: %s",
+                                       conn->set.uris, ldap_err2string(ret)));
                                return ret;
                        }
                        conn->state = LDAP_STATE_TLS;
@@ -527,8 +527,8 @@ ldap_connect_next_message(struct ldap_connection *conn,
                        &req->msgid);
                if (ret != LDAP_SUCCESS) {
                        ldap_connection_result_failure(conn, req, ret, t_strdup_printf(
-                               "ldap_sasl_bind(uri=%s, dn=%s) failed: %s",
-                               conn->set.uri, conn->set.auth_dn, ldap_err2string(ret)));
+                               "ldap_sasl_bind(uris=%s, dn=%s) failed: %s",
+                               conn->set.uris, conn->set.auth_dn, ldap_err2string(ret)));
                        return ret;
                }
                break;