dovecot-2.1: lib-storage: Set mail_user.service earlier.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.1/rev/2bf504b33d64
changeset: 14398:2bf504b33d64
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Apr 09 11:53:46 2012 +0300
description:
lib-storage: Set mail_user.service earlier.

diffstat:

 src/lib-storage/mail-user.c |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (28 lines):

diff -r 19e09ab09383 -r 2bf504b33d64 src/lib-storage/mail-user.c
--- a/src/lib-storage/mail-user.c	Mon Apr 09 09:53:13 2012 +0300
+++ b/src/lib-storage/mail-user.c	Mon Apr 09 11:53:46 2012 +0300
@@ -50,6 +50,7 @@
 	user->set_info = set_info;
 	user->unexpanded_set = settings_dup(set_info, set, pool);
 	user->set = settings_dup(set_info, set, pool);
+	user->service = master_service_get_name(master_service);
 
 	/* check settings so that the duplicated structure will again
 	   contain the parsed fields */
@@ -113,7 +114,6 @@
 
 	mail_set = mail_user_set_get_storage_set(user);
 	user->mail_debug = mail_set->mail_debug;
-	user->service = master_service_get_name(master_service);
 
 	user->initialized = TRUE;
 	hook_mail_user_created(user);
@@ -166,6 +166,8 @@
 			const struct ip_addr *local_ip,
 			const struct ip_addr *remote_ip)
 {
+	i_assert(service != NULL);
+
 	user->service = p_strdup(user->pool, service);
 	if (local_ip != NULL && local_ip->family != 0) {
 		user->local_ip = p_new(user->pool, struct ip_addr, 1);