dict-ldap: dict_ldap_map_settings - Rename base_dn into base

diff --git a/src/lib-dict-backend/dict-ldap-settings.c b/src/lib-dict-backend/dict-ldap-settings.c
index 51a7141c0c2c2d5c641b47ccf95a6398211a4b32..31dcd3b89ab594b744c347cb510e2cff97bdd10e 100644 (file)
--- a/src/lib-dict-backend/dict-ldap-settings.c
+++ b/src/lib-dict-backend/dict-ldap-settings.c
@@ -47,7 +47,7 @@ static const struct setting_def dict_ldap_map_setting_defs[] = {
        DEF_STR(filter),
        DEF_STR(username_attribute),
        DEF_STR(value_attribute),
-       DEF_STR(base_dn),
+       DEF_STR(base),
        DEF_STR(scope),
        { 0, NULL, 0 }
 };

diff --git a/src/lib-dict-backend/dict-ldap-settings.h b/src/lib-dict-backend/dict-ldap-settings.h
index 40574875a2533dea288d1c428bbd29cc410c08f6..621d86fbbb5fc6b59020747d0a6b07d95676fe45 100644 (file)
--- a/src/lib-dict-backend/dict-ldap-settings.h
+++ b/src/lib-dict-backend/dict-ldap-settings.h
@@ -8,7 +8,7 @@ struct dict_ldap_map_settings {
        const char *filter;
        const char *username_attribute;
        const char *value_attribute;
-       const char *base_dn;
+       const char *base;
        const char *scope;
        int scope_val;
        unsigned int timeout;

diff --git a/src/lib-dict-backend/dict-ldap.c b/src/lib-dict-backend/dict-ldap.c
index a8772a26b8c2e11a8f73c3538480dc6b3eb4b832..621573b45069ae0b75846948d1c88ba0f722b8e5 100644 (file)
--- a/src/lib-dict-backend/dict-ldap.c
+++ b/src/lib-dict-backend/dict-ldap.c
@@ -430,7 +430,7 @@ void ldap_dict_lookup_async(struct dict *dict,
                attributes[0] = map->value_attribute;
                /* build lookup */
                i_zero(&input);
-               input.base_dn = map->base_dn;
+               input.base_dn = map->base;
                input.scope = map->scope_val;
                if (!ldap_dict_build_query(set, map, &values, strncmp(key, DICT_PATH_PRIVATE, strlen(DICT_PATH_PRIVATE))==0, query, &error)) {
                        op->res.error = error;