From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Wed, 4 Apr 2018 22:34:49 +0000 (+0200)
Subject: lib-smtp: server: Fix error message logged for errors occurring in data wrapper strea... 
X-Git-Tag: 2.3.2.rc1~99
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=18d4bda11663bfdf8c06a39ff505dace77e134b8;p=thirdparty%2Fdovecot%2Fcore.git

lib-smtp: server: Fix error message logged for errors occurring in data wrapper stream during DATA transfer.

Used the connection stream rather than the data stream to obtain the error.
Obviously, there is no error on the low-level connection when there is a data
istream (e.g. message size) error.
---

diff --git a/src/lib-smtp/smtp-server-cmd-data.c b/src/lib-smtp/smtp-server-cmd-data.c
index 4c95fb28e6..674416609c 100644
--- a/src/lib-smtp/smtp-server-cmd-data.c
+++ b/src/lib-smtp/smtp-server-cmd-data.c
@@ -174,7 +174,8 @@ static void cmd_data_input_error(struct smtp_server_cmd_ctx *cmd)
 	struct smtp_server_connection *conn = cmd->conn;
 	struct smtp_server_command *command = cmd->cmd;
 	struct cmd_data_context *data_cmd = command->data;
-	unsigned int stream_errno = conn->state.data_input->stream_errno;
+	struct istream *data_input = conn->state.data_input;
+	unsigned int stream_errno = data_input->stream_errno;
 
 	conn->state.data_failed = TRUE;
 
@@ -190,8 +191,8 @@ static void cmd_data_input_error(struct smtp_server_cmd_ctx *cmd)
 		smtp_server_connection_error(conn,
 			"Connection lost during data transfer: "
 			"read(%s) failed: %s",
-			i_stream_get_name(conn->conn.input),
-			i_stream_get_error(conn->conn.input));
+			i_stream_get_name(data_input),
+			i_stream_get_error(data_input));
 		smtp_server_connection_close(&conn, "Read failure");
 	} else {
 		smtp_server_connection_debug(conn,