dovecot-2.2: sdbox: Make sure mail_attachment_fs=sis-queue isn't...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/9542732069ff
changeset: 15305:9542732069ff
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Oct 12 00:30:23 2012 +0300
description:
sdbox: Make sure mail_attachment_fs=sis-queue isn't attempted to be used.
It could be fixed, but nobody seems to have used it so far..

diffstat:

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

diffs (18 lines):

diff -r 7bc24fc1667e -r 9542732069ff src/lib-storage/index/dbox-common/dbox-storage.c
--- a/src/lib-storage/index/dbox-common/dbox-storage.c	Fri Oct 12 00:29:41 2012 +0300
+++ b/src/lib-storage/index/dbox-common/dbox-storage.c	Fri Oct 12 00:30:23 2012 +0300
@@ -99,6 +99,14 @@
 		} else {
 			name = t_strdup_until(set->mail_attachment_fs, args++);
 		}
+		if (strcmp(name, "sis-queue") == 0 &&
+		    (_storage->class_flags & MAIL_STORAGE_CLASS_FLAG_FILE_PER_MSG) != 0) {
+			/* FIXME: the deduplication part doesn't work, because
+			   sdbox renames the files.. */
+			*error_r = "mail_attachment_fs: "
+				"sis-queue not currently supported by sdbox";
+			return -1;
+		}
 		dir = mail_user_home_expand(_storage->user,
 					    set->mail_attachment_dir);
 		storage->attachment_dir = p_strdup(_storage->pool, dir);