dovecot-2.2: lmtp: After successful proxying RCPT TO, the second...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/6908b8875720
changeset: 15150:6908b8875720
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Sep 21 09:26:10 2012 +0200
description:
lmtp: After successful proxying RCPT TO, the second one to nonexistent user gave tempfail error.
Instead of "unknown user" it gave "Can't handle mixed proxy/non-proxy
destinations".

diffstat:

 src/lmtp/commands.c |  19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

diffs (36 lines):

diff -r 2efd5eb7966d -r 6908b8875720 src/lmtp/commands.c
--- a/src/lmtp/commands.c	Fri Sep 21 09:23:58 2012 +0200
+++ b/src/lmtp/commands.c	Fri Sep 21 09:26:10 2012 +0200
@@ -479,16 +479,6 @@
 			return 0;
 	}
 
-	if (client->proxy != NULL) {
-		/* NOTE: if this restriction is ever removed, we'll also need
-		   to send different message bodies to local and proxy
-		   (with and without Return-Path: header) */
-		client_send_line(client, "451 4.3.0 <%s> "
-			"Can't handle mixed proxy/non-proxy destinations",
-			address);
-		return 0;
-	}
-
 	memset(&input, 0, sizeof(input));
 	input.module = input.service = "lmtp";
 	input.username = username;
@@ -512,6 +502,15 @@
 				 address, username);
 		return 0;
 	}
+	if (client->proxy != NULL) {
+		/* NOTE: if this restriction is ever removed, we'll also need
+		   to send different message bodies to local and proxy
+		   (with and without Return-Path: header) */
+		client_send_line(client, "451 4.3.0 <%s> "
+			"Can't handle mixed proxy/non-proxy destinations",
+			address);
+		return 0;
+	}
 
 	lmtp_address_translate(client, &address);