From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Wed, 27 Dec 2017 14:56:03 +0000 (+0100)
Subject: lib-smtp: server: Remove implicit smtp_server_connection_start() from smtp_server_con... 
X-Git-Tag: 2.3.9~2574
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b312949dcd641f1196dd299240dec03b46b5042;p=thirdparty%2Fdovecot%2Fcore.git

lib-smtp: server: Remove implicit smtp_server_connection_start() from smtp_server_connection_login().
---

diff --git a/src/lib-smtp/smtp-server-connection.c b/src/lib-smtp/smtp-server-connection.c
index 4531d59ab0..b45759ffec 100644
--- a/src/lib-smtp/smtp-server-connection.c
+++ b/src/lib-smtp/smtp-server-connection.c
@@ -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;
@@ -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)
diff --git a/src/lib-smtp/smtp-server.h b/src/lib-smtp/smtp-server.h
index 4bbdab6a75..99b4bf1d89 100644
--- a/src/lib-smtp/smtp-server.h
+++ b/src/lib-smtp/smtp-server.h
@@ -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,
diff --git a/src/submission/submission-client.c b/src/submission/submission-client.c
index 3c6bc66249..b7c2dfb27a 100644
--- a/src/submission/submission-client.c
+++ b/src/submission/submission-client.c
@@ -208,6 +208,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' &&