Mercurial > dovecot > original-hg > dovecot-1.2
changeset 6148:668a768fc8fd HEAD
Removed deprecated pass_attrs and user_attrs configuration method.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Wed, 25 Jul 2007 09:11:43 +0300 |
parents | 45a12a1bd299 |
children | a744ae38a9e1 |
files | src/auth/db-ldap.c src/auth/db-ldap.h src/auth/passdb-ldap.c src/auth/userdb-ldap.c |
diffstat | 4 files changed, 5 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/src/auth/db-ldap.c Wed Jul 25 09:04:40 2007 +0300 +++ b/src/auth/db-ldap.c Wed Jul 25 09:11:43 2007 +0300 @@ -619,7 +619,6 @@ void db_ldap_set_attrs(struct ldap_connection *conn, const char *attrlist, char ***attr_names_r, struct hash_table *attr_map, - const char *const default_attr_map[], const char *skip_attr) { const char *const *attr; @@ -638,11 +637,9 @@ for (i = j = 0; i < size; i++) { p = strchr(attr[i], '='); - if (p == NULL) { - name = p_strdup(conn->pool, attr[i]); - value = *default_attr_map == NULL ? name : - p_strdup(conn->pool, *default_attr_map); - } else { + if (p == NULL) + name = value = p_strdup(conn->pool, attr[i]); + else { name = p_strdup_until(conn->pool, attr[i], p); value = p_strdup(conn->pool, p + 1); } @@ -652,9 +649,6 @@ hash_insert(attr_map, name, value); (*attr_names_r)[j++] = name; } - - if (*default_attr_map != NULL) - default_attr_map++; } t_pop(); }
--- a/src/auth/db-ldap.h Wed Jul 25 09:04:40 2007 +0300 +++ b/src/auth/db-ldap.h Wed Jul 25 09:11:43 2007 +0300 @@ -99,7 +99,6 @@ void db_ldap_set_attrs(struct ldap_connection *conn, const char *attrlist, char ***attr_names_r, struct hash_table *attr_map, - const char *const default_attr_map[], const char *skip_attr); struct ldap_connection *db_ldap_init(const char *config_path);
--- a/src/auth/passdb-ldap.c Wed Jul 25 09:04:40 2007 +0300 +++ b/src/auth/passdb-ldap.c Wed Jul 25 09:11:43 2007 +0300 @@ -15,10 +15,6 @@ #include <ldap.h> #include <stdlib.h> -static const char *default_attr_map[] = { - "user", "password", NULL -}; - struct ldap_passdb_module { struct passdb_module module; @@ -434,7 +430,7 @@ if (conn->set.auth_bind_userdn != NULL) conn->set.auth_bind = TRUE; db_ldap_set_attrs(conn, conn->set.pass_attrs, &conn->pass_attr_names, - conn->pass_attr_map, default_attr_map, + conn->pass_attr_map, conn->set.auth_bind ? "password" : NULL); module->module.cache_key = auth_cache_parse_key(auth_passdb->auth->pool,
--- a/src/auth/userdb-ldap.c Wed Jul 25 09:04:40 2007 +0300 +++ b/src/auth/userdb-ldap.c Wed Jul 25 09:11:43 2007 +0300 @@ -26,10 +26,6 @@ userdb_callback_t *userdb_callback; }; -static const char *default_attr_map[] = { - "", "home", "mail", "system_user", "uid", "gid", NULL -}; - static void ldap_query_get_result(struct ldap_connection *conn, LDAPMessage *entry, struct auth_request *auth_request) @@ -141,7 +137,7 @@ (hash_cmp_callback_t *)strcmp); db_ldap_set_attrs(conn, conn->set.user_attrs, &conn->user_attr_names, - conn->user_attr_map, default_attr_map, NULL); + conn->user_attr_map, NULL); module->module.cache_key = auth_cache_parse_key(auth_userdb->auth->pool, conn->set.user_filter);