dovecot-2.0: lib-storage: mail_user_get_home(): Make sure user_r...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/811e49651662
changeset: 12290:811e49651662
user:      Timo Sirainen <tss at iki.fi>
date:      Sat Oct 16 00:34:28 2010 +0100
description:
lib-storage: mail_user_get_home(): Make sure user_r is always set.

diffstat:

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

diffs (22 lines):

diff -r 092d5ba2dcfa -r 811e49651662 src/lib-storage/mail-user.c
--- a/src/lib-storage/mail-user.c	Sat Oct 16 00:30:50 2010 +0100
+++ b/src/lib-storage/mail-user.c	Sat Oct 16 00:34:28 2010 +0100
@@ -270,6 +270,7 @@
 		*home_r = user->_home;
 		return user->_home != NULL ? 1 : 0;
 	}
+	*home_r = NULL;
 
 	if (mail_user_auth_master_conn == NULL)
 		return 0;
@@ -278,9 +279,7 @@
 	ret = auth_master_user_lookup(mail_user_auth_master_conn,
 				      user->username, &info, userdb_pool,
 				      &username, &fields);
-	if (ret < 0)
-		*home_r = NULL;
-	else {
+	if (ret >= 0) {
 		auth_user_fields_parse(fields, userdb_pool, &reply);
 		user->_home = ret == 0 ? NULL :
 			p_strdup(user->pool, reply.home);