From: Timo Sirainen <tss@iki.fi>
Date: Tue, 10 Nov 2009 23:35:49 +0000 (-0500)
Subject: recipient_delimiter: Allow multi-character delimiters.
X-Git-Tag: 2.0.beta1~175
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f74f4098ee674df8e207e2bc3467e40c55d3b415;p=thirdparty%2Fdovecot%2Fcore.git

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 2311fddccb..e4f8d9ae43 100644
--- 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 956b8e267b..4088c82a77 100644
--- 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);