From: Timo Sirainen <tss@iki.fi>
Date: Thu, 2 Feb 2012 13:45:30 +0000 (+0200)
Subject: auth: Get LDAP attribute names automatically from template's %{ldap:attr} variables.
X-Git-Tag: 2.1.rc6~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63cf2e557bdd9dd8bb4e2ecb84763ef884231f18;p=thirdparty%2Fdovecot%2Fcore.git

auth: Get LDAP attribute names automatically from template's %{ldap:attr} variables.
---

diff --git a/src/auth/db-ldap.c b/src/auth/db-ldap.c
index 5f056ca0fd..c58f37c6cf 100644
--- a/src/auth/db-ldap.c
+++ b/src/auth/db-ldap.c
@@ -977,25 +977,48 @@ static void db_ldap_conn_close(struct ldap_connection *conn)
 	}
 }
 
+struct ldap_field_find_context {
+	ARRAY_TYPE(string) attr_names;
+	pool_t pool;
+};
+
+static const char *
+db_ldap_field_find(const char *data, void *context)
+{
+	struct ldap_field_find_context *ctx = context;
+	char *ldap_attr;
+
+	if (*data != '\0') {
+		ldap_attr = p_strdup(ctx->pool, data);
+		array_append(&ctx->attr_names, &ldap_attr, 1);
+	}
+	return NULL;
+}
+
 void db_ldap_set_attrs(struct ldap_connection *conn, const char *attrlist,
 		       char ***attr_names_r, ARRAY_TYPE(ldap_field) *attr_map,
 		       const char *skip_attr)
 {
+	static struct var_expand_func_table var_funcs_table[] = {
+		{ "ldap", db_ldap_field_find },
+		{ NULL, NULL }
+	};
+	struct ldap_field_find_context ctx;
 	struct ldap_field *field;
+	string_t *tmp_str;
 	const char *const *attr, *attr_data, *p;
 	char *ldap_attr, *name, *templ;
-	unsigned int i, j, size;
+	unsigned int i;
 
 	if (*attrlist == '\0')
 		return;
 
 	attr = t_strsplit_spaces(attrlist, ",");
 
-	/* @UNSAFE */
-	for (size = 0; attr[size] != NULL; size++) ;
-	*attr_names_r = p_new(conn->pool, char *, size + 1);
-
-	for (i = j = 0; i < size; i++) {
+	tmp_str = t_str_new(128);
+	ctx.pool = conn->pool;
+	p_array_init(&ctx.attr_names, conn->pool, 16);
+	for (i = 0; attr[i] != NULL; i++) {
 		/* allow spaces here so "foo=1, bar=2" works */
 		attr_data = attr[i];
 		while (*attr_data == ' ') attr_data++;
@@ -1011,8 +1034,12 @@ void db_ldap_set_attrs(struct ldap_connection *conn, const char *attrlist,
 		templ = strchr(name, '=');
 		if (templ == NULL)
 			templ = "";
-		else
+		else {
 			*templ++ = '\0';
+			str_truncate(tmp_str, 0);
+			var_expand_with_funcs(tmp_str, templ, NULL,
+					      var_funcs_table, &ctx);
+		}
 
 		if (*name == '\0')
 			i_error("ldap: Invalid attrs entry: %s", attr_data);
@@ -1022,9 +1049,11 @@ void db_ldap_set_attrs(struct ldap_connection *conn, const char *attrlist,
 			field->value = templ;
 			field->ldap_attr_name = ldap_attr;
 			if (*ldap_attr != '\0')
-				(*attr_names_r)[j++] = ldap_attr;
+				array_append(&ctx.attr_names, &ldap_attr, 1);
 		}
 	}
+	(void)array_append_space(&ctx.attr_names);
+	*attr_names_r = array_idx_modifiable(&ctx.attr_names, 0);
 }
 
 static struct var_expand_table *