Mercurial > dovecot > original-hg > dovecot-1.2
diff src/auth/db-ldap.c @ 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 |
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(); }