dovecot-2.2: dbox: Log a better error if we have external attach...

dovecot at dovecot.org dovecot at dovecot.org
Fri Oct 26 11:12:41 EEST 2012


details:   http://hg.dovecot.org/dovecot-2.2/rev/26236c4e5736
changeset: 15260:26236c4e5736
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Oct 26 11:12:36 2012 +0300
description:
dbox: Log a better error if we have external attachments, but mail_attachment_dir is unset.

diffstat:

 src/lib-storage/index/dbox-common/dbox-attachment.c |  7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diffs (17 lines):

diff -r 83cdfd0bc79d -r 26236c4e5736 src/lib-storage/index/dbox-common/dbox-attachment.c
--- a/src/lib-storage/index/dbox-common/dbox-attachment.c	Fri Oct 26 11:07:43 2012 +0300
+++ b/src/lib-storage/index/dbox-common/dbox-attachment.c	Fri Oct 26 11:12:36 2012 +0300
@@ -150,6 +150,13 @@
 
 	*error_r = NULL;
 
+	if (*file->storage->attachment_dir == '\0') {
+		mail_storage_set_critical(&file->storage->storage,
+			"%s contains references to external attachments, "
+			"but mail_attachment_dir is unset", file->cur_path);
+		return -1;
+	}
+
 	t_array_init(&extrefs_arr, 16);
 	if (!dbox_attachment_parse_extref_real(ext_refs, pool_datastack_create(),
 					       &extrefs_arr)) {


More information about the dovecot-cvs mailing list