lib-smtp: server: Moved smtp_server_connection_start() after smtp_server_connection_l...

Also fixes an indent problem in the header comment implicitly.

diff --git a/src/lib-smtp/smtp-server-connection.c b/src/lib-smtp/smtp-server-connection.c
index b5217402bfbfb01b0639981860fdd5e8337cf9c9..4531d59ab0ce879237ac24f38090836bc8699d0a 100644 (file)
--- a/src/lib-smtp/smtp-server-connection.c
+++ b/src/lib-smtp/smtp-server-connection.c
@@ -1134,18 +1134,6 @@ void smtp_server_connection_reply_immediate(
        }
 }
 
-void smtp_server_connection_start(struct smtp_server_connection *conn)
-{
-       conn->raw_input = conn->conn.input;
-       conn->raw_output = conn->conn.output;
-
-       smtp_server_connection_timeout_start(conn);
-       smtp_server_connection_input_resume(conn);
-
-       if (!conn->ssl_start)
-               smtp_server_connection_ready(conn);
-}
-
 void smtp_server_connection_login(struct smtp_server_connection *conn,
        const char *username, const char *helo,
        const unsigned char *pdata, unsigned int pdata_len,
@@ -1173,6 +1161,18 @@ void smtp_server_connection_login(struct smtp_server_connection *conn,
        smtp_server_connection_ready(conn);
 }
 
+void smtp_server_connection_start(struct smtp_server_connection *conn)
+{
+       conn->raw_input = conn->conn.input;
+       conn->raw_output = conn->conn.output;
+
+       smtp_server_connection_timeout_start(conn);
+       smtp_server_connection_input_resume(conn);
+
+       if (!conn->ssl_start)
+               smtp_server_connection_ready(conn);
+}
+
 void smtp_server_connection_close(struct smtp_server_connection **_conn,
                                  const char *reason)
 {

diff --git a/src/lib-smtp/smtp-server.h b/src/lib-smtp/smtp-server.h
index 323192395514c4085504f70c844ae8dceb1ecfbe..4bbdab6a754b4aa00c44e5468e371f72d9cc0ce7 100644 (file)
--- a/src/lib-smtp/smtp-server.h
+++ b/src/lib-smtp/smtp-server.h
@@ -295,15 +295,16 @@ 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. Establishes SSL layer immediately if instructed,
-       and sends the greeting once the connection is ready for commands. */
-void smtp_server_connection_start(struct smtp_server_connection *conn);
 /* Start 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,
                                  unsigned int pdata_len, bool ssl_secured);
 
+/* Start the connection. Establishes SSL layer immediately if instructed,
+   and sends the greeting once the connection is ready for commands. */
+void smtp_server_connection_start(struct smtp_server_connection *conn);
+
 void smtp_server_connection_input_lock(struct smtp_server_connection *conn);
 void smtp_server_connection_input_unlock(struct smtp_server_connection *conn);