# HG changeset patch
# User Timo Sirainen <tss@iki.fi>
# Date 1173880745 -7200
# Node ID afcb29d8faffaaac67fd4dfd876e86cad8e2d30d
# Parent  70fea9bab83737ff38ae6dce773164d72bec94c4
Don't expand %variables in extra fields, let dovecot master do that.

diff -r 70fea9bab837 -r afcb29d8faff src/auth/userdb-passwd-file.c
--- a/src/auth/userdb-passwd-file.c	Wed Mar 14 15:49:21 2007 +0200
+++ b/src/auth/userdb-passwd-file.c	Wed Mar 14 15:59:05 2007 +0200
@@ -27,8 +27,6 @@
 		(struct passwd_file_userdb_module *)_module;
 	struct auth_stream_reply *reply;
 	struct passwd_user *pu;
-        const struct var_expand_table *table;
-	string_t *str;
 	const char *key, *value;
 	char **p;
 
@@ -48,21 +46,14 @@
 
 	if (pu->extra_fields != NULL) {
 		t_push();
-		str = t_str_new(512);
-		table = auth_request_get_var_expand_table(auth_request, NULL);
-
 		for (p = pu->extra_fields; *p != NULL; p++) {
 			if (strncmp(*p, "userdb_", 7) != 0)
 				continue;
 
 			key = *p + 7;
 			value = strchr(key, '=');
-			if (value != NULL) {
-				key = t_strdup_until(key, value);
-				str_truncate(str, 0);
-				var_expand(str, value + 1, table);
-				value = str_c(str);
-			}
+			if (value != NULL)
+				key = t_strdup_until(key, value++);
 			auth_stream_reply_add(reply, key, value);
 		}
 		t_pop();