From 53b9270c619c587944b7f1b60d1ca25e945df40a Mon Sep 17 00:00:00 2001
From: Matthias Bilger <matthias@bilger.info>
Date: Tue, 22 Mar 2016 15:27:36 +0100
Subject: [PATCH] Allow multiple recipient delimiter

This will allow to use multiple different recipient delimiter, e.g. `+` and `-`
---
 src/lmtp/commands.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lmtp/commands.c b/src/lmtp/commands.c
index 597ba4c373..fd48dc4235 100644
--- a/src/lmtp/commands.c
+++ b/src/lmtp/commands.c
@@ -462,7 +462,7 @@ static void rcpt_address_parse(struct client *client, const char *address,
 		return;
 
 	domain = strchr(address, '@');
-	p = strstr(address, client->unexpanded_lda_set->recipient_delimiter);
+	p = strpbrk(address, client->unexpanded_lda_set->recipient_delimiter);
 	if (p != NULL && (domain == NULL || p < domain)) {
 		/* user+detail@domain */
 		*username_r = t_strdup_until(*username_r, p);