lib-smtp: smtp-server - Call transaction callbacks from transaction o…

…bject functions.

src/lib-smtp/smtp-server-cmd-mail.c

@@ -44,12 +44,6 @@ cmd_mail_completed(struct smtp_server_cmd_ctx *cmd,
 	/* success */
 	conn->state.trans = smtp_server_transaction_create(conn,
 		data->flags, data->path, &data->params, &data->timestamp);
-
-	if (conn->callbacks != NULL &&
-		conn->callbacks->conn_trans_start != NULL) {
-		conn->callbacks->conn_trans_start(conn->context,
-						  conn->state.trans);
-	}
 }
 
 static void

src/lib-smtp/smtp-server-connection.c

@@ -1325,14 +1325,8 @@ void smtp_server_connection_reset_state(struct smtp_server_connection *conn)
 {
 	e_debug(conn->event, "Connection state reset");
 
-	if (conn->state.trans != NULL) {
-		if (conn->callbacks != NULL &&
-			conn->callbacks->conn_trans_free != NULL) {
-			conn->callbacks->conn_trans_free(conn->context,
-							 conn->state.trans);
-		}
+	if (conn->state.trans != NULL)
 		smtp_server_transaction_free(&conn->state.trans);
-	}
 
 	/* RFC 3030, Section 2:
 	   The RSET command, when issued after the first BDAT and before the

src/lib-smtp/smtp-server-transaction.c

@@ -61,14 +61,23 @@ smtp_server_transaction_create(struct smtp_server_connection *conn,
 	trans->event = event_create(conn->event);
 	smtp_server_transaction_update_event(trans);
 
+	if (conn->callbacks != NULL &&
+	    conn->callbacks->conn_trans_start != NULL)
+		conn->callbacks->conn_trans_start(conn->context, trans);
+
 	return trans;
 }
 
 void smtp_server_transaction_free(struct smtp_server_transaction **_trans)
 {
 	struct smtp_server_transaction *trans = *_trans;
+	struct smtp_server_connection *conn = trans->conn;
 	struct smtp_server_recipient **rcptp;
 
+	if (conn->callbacks != NULL &&
+	    conn->callbacks->conn_trans_free != NULL)
+		conn->callbacks->conn_trans_free(conn->context, trans);
+
 	if (array_is_created(&trans->rcpt_to)) {
 		array_foreach_modifiable(&trans->rcpt_to, rcptp)
 			smtp_server_recipient_destroy(rcptp);