dovecot-2.0: deliver_log_format: Increased max. message-id lengt...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/62256701a326
changeset: 11185:62256701a326
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Apr 23 10:09:57 2010 +0300
description:
deliver_log_format: Increased max. message-id length to 200 chars.

diffstat:

 src/lib-lda/mail-deliver.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r 8818db00d347 -r 62256701a326 src/lib-lda/mail-deliver.c
--- a/src/lib-lda/mail-deliver.c	Wed Apr 21 19:58:53 2010 +0300
+++ b/src/lib-lda/mail-deliver.c	Fri Apr 23 10:09:57 2010 +0300
@@ -46,21 +46,23 @@
 	};
 	struct var_expand_table *tab;
 	uoff_t size;
-	unsigned int i;
 
 	tab = t_malloc(sizeof(static_tab));
 	memcpy(tab, static_tab, sizeof(static_tab));
 
 	tab[0].value = message;
 	(void)mail_get_first_header(ctx->src_mail, "Message-ID", &tab[1].value);
+	tab[1].value = str_sanitize(tab[1].value, 200);
+
 	(void)mail_get_first_header_utf8(ctx->src_mail, "Subject", &tab[2].value);
-	tab[3].value = mail_deliver_get_address(ctx, "From");
+	tab[2].value = str_sanitize(tab[2].value, 80);
+
+	tab[3].value = str_sanitize(mail_deliver_get_address(ctx, "From"), 80);
+
 	if (mail_get_physical_size(ctx->src_mail, &size) == 0)
 		tab[4].value = dec2str(size);
 	if (mail_get_virtual_size(ctx->src_mail, &size) == 0)
 		tab[5].value = dec2str(size);
-	for (i = 1; tab[i].key != '\0'; i++)
-		tab[i].value = str_sanitize(tab[i].value, 80);
 	return tab;
 }