Skip to content

Commit

Permalink
submission-login: Only send HELO domain to post-login service when it…
Browse files Browse the repository at this point in the history
… is valid.
  • Loading branch information
stephanbosch authored and villesavolainen committed Mar 13, 2018
1 parent d70971d commit f431eff
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions src/submission-login/client-authenticate.c
Expand Up @@ -255,17 +255,19 @@ int cmd_auth(void *conn_ctx, struct smtp_server_cmd_ctx *cmd,
struct submission_client *subm_client = conn_ctx;
struct client *client = &subm_client->common;
struct smtp_server_helo_data *helo;
char *prefix;
const char *prefix = "";

i_assert(subm_client->pending_auth == NULL);

helo = smtp_server_connection_get_helo_data(subm_client->conn);

prefix = i_strdup(helo->domain == NULL ? "" : helo->domain);
if (helo->domain_valid) {
i_assert(helo->domain != NULL);
prefix = helo->domain;
}

/* pass ehlo parameter to post-login service upon successful login */
i_free(client->master_data_prefix);
client->master_data_prefix = (void *)prefix;
client->master_data_prefix = (void *)i_strdup(prefix);
client->master_data_prefix_len = strlen(prefix) + 1;

subm_client->pending_auth = cmd;
Expand Down

0 comments on commit f431eff

Please sign in to comment.