# HG changeset patch
# User Timo Sirainen <tss@iki.fi>
# Date 1275933683 -3600
# Node ID a3e4af3df83db72ee2c2151a83a840ce77a704b1
# Parent  40fc39475d02f41b11374c7173f6c510f9401beb
auth: Fixed prefetch userdb interaction with passdb changing username.

diff -r 40fc39475d02 -r a3e4af3df83d src/auth/auth-request.c
--- a/src/auth/auth-request.c	Tue Jun 01 17:08:13 2010 +0100
+++ b/src/auth/auth-request.c	Mon Jun 07 19:01:23 2010 +0100
@@ -23,6 +23,8 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 
+static void auth_request_userdb_reply_update_user(struct auth_request *request);
+
 struct auth_request *
 auth_request_new(struct auth *auth, const struct mech_module *mech,
 		 mech_callback_t *callback, void *context)
@@ -1025,6 +1027,10 @@
 				request->user, value);
 			request->user = p_strdup(request->pool, value);
 		}
+
+		if (request->userdb_reply != NULL)
+			auth_request_userdb_reply_update_user(request);
+
 		/* restore the original value so it gets saved correctly to
 		   cache. */
 		value = orig_value;
@@ -1101,6 +1107,20 @@
 	auth_stream_reply_add(request->userdb_reply, NULL, request->user);
 }
 
+static void auth_request_userdb_reply_update_user(struct auth_request *request)
+{
+	const char *str, *p;
+
+	str = t_strdup(auth_stream_reply_export(request->userdb_reply));
+
+	auth_stream_reply_reset(request->userdb_reply);
+	auth_stream_reply_add(request->userdb_reply, NULL, request->user);
+
+	p = strchr(str, '\t');
+	if (p != NULL)
+		auth_stream_reply_import(request->userdb_reply, p + 1);
+}
+
 static void
 auth_request_change_userdb_user(struct auth_request *request, const char *user)
 {