Skip to content

Commit

Permalink
submission: relay backend: Forward a (possibly multi-line) 421 reply …
Browse files Browse the repository at this point in the history
…from relay server to the client.

Before, it substituted a generic 421 error reply, which is far less helpful.
  • Loading branch information
stephanbosch authored and villesavolainen committed Feb 12, 2019
1 parent 8b60a18 commit 88b909c
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions src/submission/submission-backend-relay.c
Expand Up @@ -49,6 +49,7 @@ backend_relay_handle_relay_reply(struct submission_backend_relay *backend,
struct smtp_reply *reply_r)
{
const char *enh_code, *msg, *log_msg = NULL;
const char *const *reply_lines;
bool result = TRUE;

*reply_r = *reply;
Expand All @@ -64,6 +65,13 @@ backend_relay_handle_relay_reply(struct submission_backend_relay *backend,
result = FALSE;
break;
case SMTP_CLIENT_COMMAND_ERROR_CONNECTION_CLOSED:
enh_code = smtp_reply_get_enh_code(reply);
log_msg = "Lost connection to relay server";
reply_lines = smtp_reply_get_text_lines_omit_prefix(reply);
msg = t_strconcat("Lost connection to relay server:\n",
t_strarray_join(reply_lines, "\n"), NULL);
result = FALSE;
break;
case SMTP_CLIENT_COMMAND_ERROR_CONNECTION_LOST:
case SMTP_CLIENT_COMMAND_ERROR_BAD_REPLY:
case SMTP_CLIENT_COMMAND_ERROR_TIMED_OUT:
Expand Down

0 comments on commit 88b909c

Please sign in to comment.