Skip to content

Commit

Permalink
lib-smtp: server: Remove implicit smtp_server_connection_start() from…
Browse files Browse the repository at this point in the history
… smtp_server_connection_login().
  • Loading branch information
stephanbosch authored and villesavolainen committed Feb 9, 2018
1 parent 04676af commit dbd3403
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 9 deletions.
8 changes: 0 additions & 8 deletions src/lib-smtp/smtp-server-connection.c
Expand Up @@ -1139,12 +1139,6 @@ void smtp_server_connection_login(struct smtp_server_connection *conn,
const unsigned char *pdata, unsigned int pdata_len,
bool ssl_secured)
{
conn->raw_input = conn->conn.input;
conn->raw_output = conn->conn.output;

smtp_server_connection_timeout_start(conn);
smtp_server_connection_input_resume(conn);

i_assert(conn->username == NULL);

conn->set.capabilities &= ~SMTP_CAPABILITY_STARTTLS;
Expand All @@ -1157,8 +1151,6 @@ void smtp_server_connection_login(struct smtp_server_connection *conn,
if (!i_stream_add_data(conn->conn.input, pdata, pdata_len))
i_panic("Couldn't add client input to stream");
}

smtp_server_connection_ready(conn);
}

void smtp_server_connection_start(struct smtp_server_connection *conn)
Expand Down
2 changes: 1 addition & 1 deletion src/lib-smtp/smtp-server.h
Expand Up @@ -295,7 +295,7 @@ smtp_server_connection_create_from_streams(struct smtp_server *server,
void smtp_server_connection_ref(struct smtp_server_connection *conn);
bool smtp_server_connection_unref(struct smtp_server_connection **_conn);

/* Start the connection with state and data from login service */
/* Initialize the connection with state and data from login service */
void smtp_server_connection_login(struct smtp_server_connection *conn,
const char *username, const char *helo,
const unsigned char *pdata,
Expand Down
1 change: 1 addition & 0 deletions src/submission/submission-client.c
Expand Up @@ -215,6 +215,7 @@ struct client *client_create(int fd_in, int fd_out,
smtp_server_connection_login(client->conn,
client->user->username, helo,
pdata, pdata_len, user->conn.ssl_secured);
smtp_server_connection_start(client->conn);

mail_set = mail_user_set_get_storage_set(user);
if (*set->imap_urlauth_host != '\0' &&
Expand Down

0 comments on commit dbd3403

Please sign in to comment.