From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Thu, 23 Mar 2017 13:05:12 +0000 (+0200)
Subject: dbox: Allow ":" separator between mail_attachment_fs driver and args.
X-Git-Tag: 2.2.29.rc1~100
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2dec3731d6837dc40366643e3d3a6eb896b5ea44;p=thirdparty%2Fdovecot%2Fcore.git

dbox: Allow ":" separator between mail_attachment_fs driver and args.

The ":" separator is nowadays commonly used elsewhere for the separator,
so it should work here as well.
---

diff --git a/src/lib-storage/index/dbox-common/dbox-storage.c b/src/lib-storage/index/dbox-common/dbox-storage.c
index add063923c..9e24659dbb 100644
--- a/src/lib-storage/index/dbox-common/dbox-storage.c
+++ b/src/lib-storage/index/dbox-common/dbox-storage.c
@@ -98,7 +98,7 @@ int dbox_storage_create(struct mail_storage *_storage,
 	if (*set->mail_attachment_fs != '\0') {
 		const char *name, *args, *dir;
 
-		args = strchr(set->mail_attachment_fs, ' ');
+		args = strpbrk(set->mail_attachment_fs, ": ");
 		if (args == NULL) {
 			name = set->mail_attachment_fs;
 			args = "";