Skip to content

Commit

Permalink
lda: Cleanup - reorder code
Browse files Browse the repository at this point in the history
Makes the next commit cleaner.
  • Loading branch information
sirainen committed Jun 29, 2018
1 parent 4ff4bd0 commit eed9a6c
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/lda/main.c
Expand Up @@ -433,6 +433,14 @@ int main(int argc, char *argv[])
#ifdef SIGXFSZ
lib_signals_ignore(SIGXFSZ, TRUE);
#endif
if (*user_source != '\0') {
e_debug(ctx.rcpt_user->event,
"userdb lookup skipped, username taken from %s",
user_source);
}
ctx.mail_from = mail_from;
ctx.rcpt_to = final_rcpt_to;

var_table = mail_user_var_expand_table(ctx.rcpt_user);
smtp_set = mail_storage_service_user_get_set(service_user)[1];
lda_set = mail_storage_service_user_get_set(service_user)[2];
Expand All @@ -451,15 +459,7 @@ int main(int argc, char *argv[])
ctx.set = lda_set;
ctx.smtp_set = smtp_set;

if (*user_source != '\0') {
e_debug(ctx.rcpt_user->event,
"userdb lookup skipped, username taken from %s",
user_source);
}

ctx.src_mail = lda_raw_mail_open(&ctx, path);
ctx.mail_from = mail_from;
ctx.rcpt_to = final_rcpt_to;
lda_set_rcpt_to(&ctx, rcpt_to, user, rcpt_to_source);

if (mail_deliver(&ctx, &storage) < 0) {
Expand Down

0 comments on commit eed9a6c

Please sign in to comment.