recipient_delimiter: Allow multi-character delimiters.

--HG--
branch : HEAD

diff --git a/src/lib-lda/lda-settings.c b/src/lib-lda/lda-settings.c
index 2311fddccbc9be93835833ef8c98388483333aae..e4f8d9ae434c07b963f7abc9b234f0ce38e81a46 100644 (file)
--- a/src/lib-lda/lda-settings.c
+++ b/src/lib-lda/lda-settings.c
@@ -83,10 +83,5 @@ static bool lda_settings_check(void *_set, pool_t pool ATTR_UNUSED,
                i_assert(my_hostname != NULL);
                set->hostname = my_hostname;
        }
-       if (*set->recipient_delimiter != '\0' &&
-           set->recipient_delimiter[1] != '\0') {
-               *error_r = "recipient_delimiter must one character long";
-               return FALSE;
-       }
        return TRUE;
 }

diff --git a/src/lmtp/commands.c b/src/lmtp/commands.c
index 956b8e267bb8c19171fea78c7d0c3bc4453fadb5..4088c82a77ea04f53a77aa333ee5b8d4c549c960 100644 (file)
--- a/src/lmtp/commands.c
+++ b/src/lmtp/commands.c
@@ -313,7 +313,7 @@ static void rcpt_address_parse(struct client *client, const char *address,
        if (*client->set->recipient_delimiter == '\0')
                return;
 
-       p = strchr(address, *client->set->recipient_delimiter);
+       p = strstr(address, client->set->recipient_delimiter);
        if (p != NULL) {
                /* user+detail@domain */
                *username_r = t_strdup_until(*username_r, p);