lda: Assign envelope fields in mail deliver context right away.

diff --git a/src/lda/main.c b/src/lda/main.c
index 57aa76ef295355148b67fd3912fc59922dda6ede..7ba579a737f27071b314e40a008674ea5c8bc0fe 100644 (file)
--- a/src/lda/main.c
+++ b/src/lda/main.c
@@ -503,6 +503,9 @@ int main(int argc, char *argv[])
        }
        master_service_init_finish(master_service);
 
+       dinput.mail_from = mail_from;
+       dinput.rcpt_to = final_rcpt_to;
+
        i_zero(&service_input);
        service_input.module = "lda";
        service_input.service = "lda";
@@ -532,8 +535,6 @@ int main(int argc, char *argv[])
                                "userdb lookup skipped, username taken from %s",
                                user_source);
                }
-               dinput.mail_from = mail_from;
-               dinput.rcpt_to = final_rcpt_to;
 
                ret = lda_deliver(&dinput, service_user, user, path,
                                  rcpt_to, rcpt_to_source, stderr_rejection);