From: Timo Sirainen <tss@iki.fi>
Date: Mon, 8 Mar 2010 15:26:58 +0000 (+0200)
Subject: mail storage service: Fixed crashing when iterating through all users.
X-Git-Tag: 2.0.beta4~112
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=674f541b16689c0ed090dac32db94463c5af3977;p=thirdparty%2Fdovecot%2Fcore.git

mail storage service: Fixed crashing when iterating through all users.

--HG--
branch : HEAD
---

diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index 87cf1230ed..ae45d13360 100644
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -619,10 +619,10 @@ int mail_storage_service_read_settings(struct mail_storage_service_ctx *ctx,
 		set_input.remote_ip = input->remote_ip;
 	}
 	if (ctx->set_cache == NULL) {
-		ctx->set_cache_module = p_strdup(ctx->pool, input->module);
-		ctx->set_cache_service = p_strdup(ctx->pool, input->service);
+		ctx->set_cache_module = p_strdup(ctx->pool, set_input.module);
+		ctx->set_cache_service = p_strdup(ctx->pool, set_input.service);
 		ctx->set_cache = master_service_settings_cache_init(
-			ctx->service, input->module, input->service);
+			ctx->service, set_input.module, set_input.service);
 		ctx->set_cache_roots = ctx->set_roots;
 		ctx->set_cache_dyn_parsers =
 			mail_storage_get_dynamic_parsers(ctx->pool);
@@ -632,8 +632,8 @@ int mail_storage_service_read_settings(struct mail_storage_service_ctx *ctx,
 						  &ctx->set_cache_dyn_parsers);
 	}
 
-	if (null_strcmp(input->module, ctx->set_cache_module) == 0 &&
-	    null_strcmp(input->service, ctx->set_cache_service) == 0) {
+	if (null_strcmp(set_input.module, ctx->set_cache_module) == 0 &&
+	    null_strcmp(set_input.service, ctx->set_cache_service) == 0) {
 		set_input.roots = ctx->set_cache_roots;
 		set_input.dyn_parsers = ctx->set_cache_dyn_parsers;
 		set_input.dyn_parsers_parent =