Mercurial > dovecot > original-hg > dovecot-1.2

changeset 3306:aebed9a9edac HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
If both userdb and passdb used LDAP the later one was overriding first one's attribute names.
author Timo Sirainen <tss@iki.fi>
date Sun, 17 Apr 2005 19:52:00 +0300
parents cccb5c6ba946
children 38754475d3b6
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, 29 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/src/auth/db-ldap.c	Sun Apr 17 19:37:37 2005 +0300
+++ b/src/auth/db-ldap.c	Sun Apr 17 19:52:00 2005 +0300
@@ -269,6 +269,7 @@
 }
 
 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 *const *attr;
@@ -283,7 +284,7 @@
 
 	/* @UNSAFE */
 	for (size = 0; attr[size] != NULL; size++) ;
-	conn->attr_names = p_new(conn->pool, char *, size + 1);
+	*attr_names_r = p_new(conn->pool, char *, size + 1);
 
 	for (i = 0; i < size; i++) {
 		p = strchr(attr[i], '=');
@@ -296,9 +297,9 @@
 			value = p_strdup(conn->pool, p + 1);
 		}
 
-		conn->attr_names[i] = name;
+		(*attr_names_r)[i] = name;
 		if (*name != '\0')
-			hash_insert(conn->attr_map, name, value);
+			hash_insert(attr_map, name, value);
 
 		if (*default_attr_map != NULL)
 			default_attr_map++;
@@ -372,8 +373,6 @@
 
 	conn->refcount = 1;
 	conn->requests = hash_create(default_pool, pool, 0, NULL, NULL);
-	conn->attr_map = hash_create(default_pool, pool, 0, str_hash,
-				     (hash_cmp_callback_t *)strcmp);
 
 	conn->config_path = p_strdup(pool, config_path);
 	conn->set = default_ldap_settings;
@@ -400,7 +399,10 @@
 	ldap_conn_close(conn);
 
 	hash_destroy(conn->requests);
-	hash_destroy(conn->attr_map);
+	if (conn->pass_attr_map != NULL)
+		hash_destroy(conn->pass_attr_map);
+	if (conn->user_attr_map != NULL)
+		hash_destroy(conn->user_attr_map);
 	pool_unref(conn->pool);
 }
 
--- a/src/auth/db-ldap.h	Sun Apr 17 19:37:37 2005 +0300
+++ b/src/auth/db-ldap.h	Sun Apr 17 19:52:00 2005 +0300
@@ -45,8 +45,8 @@
 	struct io *io;
 	struct hash_table *requests;
 
-	char **attr_names;
-	struct hash_table *attr_map;
+	char **pass_attr_names, **user_attr_names;
+	struct hash_table *pass_attr_map, *user_attr_map;
 
 	unsigned int connected:1;
 };
@@ -61,6 +61,7 @@
 		    struct ldap_request *request);
 
 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[]);
 
 struct ldap_connection *db_ldap_init(const char *config_path);
--- a/src/auth/passdb-ldap.c	Sun Apr 17 19:37:37 2005 +0300
+++ b/src/auth/passdb-ldap.c	Sun Apr 17 19:52:00 2005 +0300
@@ -49,7 +49,7 @@
 
 	attr = ldap_first_attribute(conn->ld, entry, &ber);
 	while (attr != NULL) {
-		name = hash_lookup(passdb_ldap_conn->attr_map, attr);
+		name = hash_lookup(passdb_ldap_conn->pass_attr_map, attr);
 		vals = ldap_get_values(conn->ld, entry, attr);
 
 		if (name != NULL && vals != NULL) {
@@ -157,7 +157,7 @@
 {
 	struct ldap_connection *conn = passdb_ldap_conn;
         const struct var_expand_table *vars;
-	const char **attr_names = (const char **)conn->attr_names;
+	const char **attr_names = (const char **)conn->pass_attr_names;
 	const char *filter, *base;
 	string_t *str;
 
@@ -181,7 +181,7 @@
 			       t_strarray_join(attr_names, ","));
 
 	db_ldap_search(conn, base, conn->set.ldap_scope,
-		       filter, passdb_ldap_conn->attr_names,
+		       filter, passdb_ldap_conn->pass_attr_names,
 		       ldap_request);
 }
 
@@ -215,8 +215,13 @@
 static void passdb_ldap_preinit(const char *args)
 {
 	passdb_ldap_conn = db_ldap_init(args);
+	passdb_ldap_conn->pass_attr_map =
+		hash_create(default_pool, passdb_ldap_conn->pool, 0, str_hash,
+			    (hash_cmp_callback_t *)strcmp);
 
 	db_ldap_set_attrs(passdb_ldap_conn, passdb_ldap_conn->set.pass_attrs,
+                          &passdb_ldap_conn->pass_attr_names,
+			  passdb_ldap_conn->pass_attr_map,
 			  default_attr_map);
 	passdb_ldap.cache_key = passdb_ldap_cache_key =
 		auth_cache_parse_key(passdb_ldap_conn->set.pass_filter);
--- a/src/auth/userdb-ldap.c	Sun Apr 17 19:37:37 2005 +0300
+++ b/src/auth/userdb-ldap.c	Sun Apr 17 19:52:00 2005 +0300
@@ -81,7 +81,7 @@
 
 	attr = ldap_first_attribute(conn->ld, entry, &ber);
 	while (attr != NULL) {
-		name = hash_lookup(userdb_ldap_conn->attr_map, attr);
+		name = hash_lookup(userdb_ldap_conn->user_attr_map, attr);
 		vals = ldap_get_values(conn->ld, entry, attr);
 
 		if (name != NULL && vals != NULL && vals[0] != NULL) {
@@ -166,7 +166,8 @@
 {
 	struct ldap_connection *conn = userdb_ldap_conn;
         const struct var_expand_table *vars;
-	const char **attr_names = (const char **)userdb_ldap_conn->attr_names;
+	const char **attr_names =
+		(const char **)userdb_ldap_conn->user_attr_names;
 	struct userdb_ldap_request *request;
 	const char *filter, *base;
 	string_t *str;
@@ -192,14 +193,20 @@
 			       t_strarray_join(attr_names, ","));
 
 	db_ldap_search(conn, base, conn->set.ldap_scope,
-		       filter, userdb_ldap_conn->attr_names,
+		       filter, userdb_ldap_conn->user_attr_names,
 		       &request->request);
 }
 
 static void userdb_ldap_preinit(const char *args)
 {
 	userdb_ldap_conn = db_ldap_init(args);
+	userdb_ldap_conn->user_attr_map =
+		hash_create(default_pool, userdb_ldap_conn->pool, 0, str_hash,
+			    (hash_cmp_callback_t *)strcmp);
+
 	db_ldap_set_attrs(userdb_ldap_conn, userdb_ldap_conn->set.user_attrs,
+                          &userdb_ldap_conn->user_attr_names,
+			  userdb_ldap_conn->user_attr_map,
 			  default_attr_map);
 }