From: Timo Sirainen <tss@iki.fi>
Date: Tue, 22 Feb 2011 13:44:42 +0000 (+0200)
Subject: config: Fixed converting old auth/mail_process_size settings.
X-Git-Tag: 2.0.10~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a37c2c1ad645b6d8ea73e6d38695efdde4f3f928;p=thirdparty%2Fdovecot%2Fcore.git

config: Fixed converting old auth/mail_process_size settings.
---

diff --git a/src/config/old-set-parser.c b/src/config/old-set-parser.c
index 63ae80b8bc..f03361bb5a 100644
--- a/src/config/old-set-parser.c
+++ b/src/config/old-set-parser.c
@@ -357,7 +357,8 @@ old_settings_handle_proto(struct config_parser_context *ctx,
 		return TRUE;
 	}
 	if (strcmp(key, "login_process_size") == 0) {
-		config_apply_login_set(ctx, old_section, key, "vsz_limit", value);
+		config_apply_login_set(ctx, old_section, key, "vsz_limit",
+				       t_strconcat(value, " M", NULL));
 		return TRUE;
 	}
 	if (strcmp(key, "login_process_per_connection") == 0) {
@@ -378,7 +379,8 @@ old_settings_handle_proto(struct config_parser_context *ctx,
 		return TRUE;
 	}
 	if (strcmp(key, "login_process_size") == 0) {
-		config_apply_login_set(ctx, old_section, key, "vsz_limit", value);
+		config_apply_login_set(ctx, old_section, key, "vsz_limit",
+				       t_strconcat(value, " M", NULL));
 		return TRUE;
 	}
 
@@ -391,7 +393,8 @@ old_settings_handle_proto(struct config_parser_context *ctx,
 		return TRUE;
 	}
 	if (strcmp(key, "mail_process_size") == 0) {
-		config_apply_mail_set(ctx, old_section, key, "vsz_limit", value);
+		config_apply_mail_set(ctx, old_section, key, "vsz_limit",
+				      t_strconcat(value, " M", NULL));
 		return TRUE;
 	}
 	if (strcmp(key, "mail_drop_priv_before_exec") == 0) {
@@ -409,7 +412,8 @@ old_settings_handle_proto(struct config_parser_context *ctx,
 		return TRUE;
 	}
 	if (strcmp(key, "auth_process_size") == 0) {
-		config_apply_auth_set(ctx, key, "vsz_limit", value);
+		config_apply_auth_set(ctx, key, "vsz_limit",
+				      t_strconcat(value, " M", NULL));
 		return TRUE;
 	}
 	if (strcmp(key, "auth_user") == 0) {