From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Thu, 3 Nov 2022 17:15:13 +0000 (+0200)
Subject: login-common: Rename client.starttls to connection_used_starttls
X-Git-Tag: 2.4.0~3426
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=778e849539e911c53bc0cd5f7321255f28547a65;p=thirdparty%2Fdovecot%2Fcore.git

login-common: Rename client.starttls to connection_used_starttls
---

diff --git a/src/imap-login/imap-login-client.c b/src/imap-login/imap-login-client.c
index a6aba6b431..62bf410ab7 100644
--- a/src/imap-login/imap-login-client.c
+++ b/src/imap-login/imap-login-client.c
@@ -129,7 +129,7 @@ static int cmd_capability(struct imap_client *imap_client,
 	/* Client is required to send CAPABILITY after STARTTLS, so the
 	   capability resp-code workaround checks only pre-STARTTLS
 	   CAPABILITY commands. */
-	if (!client->starttls)
+	if (!client->connection_used_starttls)
 		imap_client->client_ignores_capability_resp_code = TRUE;
 	client_send_raw(client, t_strconcat(
 		"* CAPABILITY ", get_capability(client), "\r\n", NULL));
diff --git a/src/login-common/client-common.c b/src/login-common/client-common.c
index a757284d88..92ce7ed434 100644
--- a/src/login-common/client-common.c
+++ b/src/login-common/client-common.c
@@ -593,7 +593,7 @@ int client_init_ssl(struct client *client)
 	client->connection_secured = TRUE;
 	client->end_client_tls_secured = TRUE;
 
-	if (client->starttls) {
+	if (client->connection_used_starttls) {
 		io_remove(&client->io);
 		if (!client_does_custom_io(client)) {
 			client->io = io_add_istream(client->input,
@@ -605,7 +605,7 @@ int client_init_ssl(struct client *client)
 
 static void client_start_tls(struct client *client)
 {
-	client->starttls = TRUE;
+	client->connection_used_starttls = TRUE;
 	if (client_init_ssl(client) < 0) {
 		client_notify_disconnect(client,
 			CLIENT_DISCONNECT_INTERNAL_ERROR,
diff --git a/src/login-common/client-common.h b/src/login-common/client-common.h
index 5bc17e6ae5..f546671fcf 100644
--- a/src/login-common/client-common.h
+++ b/src/login-common/client-common.h
@@ -228,10 +228,11 @@ struct client {
 	bool input_blocked:1;
 	bool login_success:1;
 	bool no_extra_disconnect_reason:1;
-	bool starttls:1;
 	/* Client/proxy connection is using TLS. Dovecot has terminated the
 	   TLS connection (not haproxy). */
 	bool connection_tls_secured:1;
+	/* connection_tls_secured=TRUE was started via STARTTLS command. */
+	bool connection_used_starttls:1;
 	/* HAProxy terminated the TLS connection. */
 	bool haproxy_terminated_tls:1;
 	/* Connection from the previous hop (client, proxy, haproxy) is
diff --git a/src/submission-login/client.c b/src/submission-login/client.c
index c5843e7608..baf3226a02 100644
--- a/src/submission-login/client.c
+++ b/src/submission-login/client.c
@@ -66,7 +66,7 @@ static int submission_login_start_tls(void *conn_ctx,
 	struct submission_client *subm_client = conn_ctx;
 	struct client *client = &subm_client->common;
 
-	client->starttls = TRUE;
+	client->connection_used_starttls = TRUE;
 	if (client_init_ssl(client) < 0) {
 		client_notify_disconnect(client,
 			CLIENT_DISCONNECT_INTERNAL_ERROR,