lib-storage: Remove mail_storage_service_input.conn_secured

This isn't actually used by anything, and it's rather ambiguous how it's
supposed to work through proxies.

diff --git a/src/imap/main.c b/src/imap/main.c
index 3db7519845e98df9a59c0776cb038b736b88b106..03944024d104e813b93b465f7c95c4124f188d68 100644 (file)
--- a/src/imap/main.c
+++ b/src/imap/main.c
@@ -374,8 +374,6 @@ login_request_finished(const struct login_server_request *request,
        input.username = username;
        input.userdb_fields = extra_fields;
        input.session_id = request->session_id;
-       if ((flags & LOGIN_REQUEST_FLAG_CONN_SECURED) != 0)
-               input.conn_secured = TRUE;
        if ((flags & LOGIN_REQUEST_FLAG_CONN_SSL_SECURED) != 0)
                input.conn_ssl_secured = TRUE;
 

diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index ca77abaec1ff29baa105a69b47a4586324a46022..66b9074c7f0151ef3cde57d8fcebbc00652426f9 100644 (file)
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -679,7 +679,6 @@ mail_storage_service_init_post(struct mail_storage_service_ctx *ctx,
        conn_data.remote_ip = &user->input.remote_ip;
        conn_data.local_port = user->input.local_port;
        conn_data.remote_port = user->input.remote_port;
-       conn_data.secured = user->input.conn_secured;
        conn_data.ssl_secured = user->input.conn_ssl_secured;
 
        /* NOTE: if more user initialization is added, add it also to

diff --git a/src/lib-storage/mail-storage-service.h b/src/lib-storage/mail-storage-service.h
index 6831080fdf3d06dc0cf735434a2d0ec1a700c31b..c2f38c73b25ea563c85d3e50febb1f5db06d9a4b 100644 (file)
--- a/src/lib-storage/mail-storage-service.h
+++ b/src/lib-storage/mail-storage-service.h
@@ -68,8 +68,6 @@ struct mail_storage_service_input {
        bool no_userdb_lookup:1;
        /* Enable auth_debug=yes for this lookup */
        bool debug:1;
-       /* Connection is secure (SSL or just trusted) */
-       bool conn_secured:1;
        /* Connection is secured using SSL specifically */
        bool conn_ssl_secured:1;
 };

diff --git a/src/lmtp/lmtp-client.c b/src/lmtp/lmtp-client.c
index 2757c803a6be4af8a81bb1816c6d620b3618c0c8..95e13a8679e56fe4a382e576ddaf8684ef26a7d4 100644 (file)
--- a/src/lmtp/lmtp-client.c
+++ b/src/lmtp/lmtp-client.c
@@ -121,7 +121,6 @@ static void client_read_settings(struct client *client, bool ssl)
        input.remote_ip = client->remote_ip;
        input.local_port = client->local_port;
        input.remote_port = client->remote_port;
-       input.conn_secured = ssl;
        input.conn_ssl_secured = ssl;
        input.username = "";
 

diff --git a/src/lmtp/lmtp-local.c b/src/lmtp/lmtp-local.c
index 94d3f385b8fade122ce24f865024025d3960136c..a39b63e82c77533a9aa698df18c86bef3425e832 100644 (file)
--- a/src/lmtp/lmtp-local.c
+++ b/src/lmtp/lmtp-local.c
@@ -307,8 +307,6 @@ int lmtp_local_rcpt(struct client *client,
        input.session_id = lrcpt->session_id;
        input.conn_ssl_secured =
                smtp_server_connection_is_ssl_secured(client->conn);
-       input.conn_secured = input.conn_ssl_secured ||
-               smtp_server_connection_is_trusted(client->conn);
        input.forward_fields = lrcpt->forward_fields;
        input.event_parent = rcpt->event;
 

diff --git a/src/pop3/main.c b/src/pop3/main.c
index c4e19bcbbd6b2e87ed524f644c6439016bdeacbd..4043c89d2da67f27ec03d7cb32f87b9c0761947d 100644 (file)
--- a/src/pop3/main.c
+++ b/src/pop3/main.c
@@ -304,8 +304,6 @@ login_request_finished(const struct login_server_request *login_client,
        input.username = username;
        input.userdb_fields = extra_fields;
        input.session_id = login_client->session_id;
-       if ((flags & LOGIN_REQUEST_FLAG_CONN_SECURED) != 0)
-               input.conn_secured = TRUE;
        if ((flags & LOGIN_REQUEST_FLAG_CONN_SSL_SECURED) != 0)
                input.conn_ssl_secured = TRUE;
 

diff --git a/src/submission/main.c b/src/submission/main.c
index a79f5417bd84abf62c11e7c6673b8f00a05473ed..2ba92a38a69f2b5d2c3e9adf9751d24201adb330 100644 (file)
--- a/src/submission/main.c
+++ b/src/submission/main.c
@@ -291,8 +291,6 @@ login_request_finished(const struct login_server_request *request,
        input.username = username;
        input.userdb_fields = extra_fields;
        input.session_id = request->session_id;
-       if ((flags & LOGIN_REQUEST_FLAG_CONN_SECURED) != 0)
-               input.conn_secured = TRUE;
        if ((flags & LOGIN_REQUEST_FLAG_CONN_SSL_SECURED) != 0)
                input.conn_ssl_secured = TRUE;