dovecot-2.0-sslstream: recipient_delimiter: Allow multi-characte...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0-sslstream/rev/0d659ac4656d
changeset: 10305:0d659ac4656d
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Nov 10 18:35:49 2009 -0500
description:
recipient_delimiter: Allow multi-character delimiters.

diffstat:

2 files changed, 1 insertion(+), 6 deletions(-)
src/lib-lda/lda-settings.c |    5 -----
src/lmtp/commands.c        |    2 +-

diffs (26 lines):

diff -r 51160ecbacaf -r 0d659ac4656d src/lib-lda/lda-settings.c
--- a/src/lib-lda/lda-settings.c	Tue Nov 10 18:33:41 2009 -0500
+++ b/src/lib-lda/lda-settings.c	Tue Nov 10 18:35:49 2009 -0500
@@ -83,10 +83,5 @@ static bool lda_settings_check(void *_se
 		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 -r 51160ecbacaf -r 0d659ac4656d src/lmtp/commands.c
--- a/src/lmtp/commands.c	Tue Nov 10 18:33:41 2009 -0500
+++ b/src/lmtp/commands.c	Tue Nov 10 18:35:49 2009 -0500
@@ -313,7 +313,7 @@ static void rcpt_address_parse(struct cl
 	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 at domain */
 		*username_r = t_strdup_until(*username_r, p);