From 646f09315fa655745165926d49c3b53a66a9f0fd Mon Sep 17 00:00:00 2001 From: Stephan Bosch Date: Sun, 2 Sep 2018 15:29:24 +0200 Subject: [PATCH] submission: Move client_proxy_destroy() to submission-backend-relay.c. --- src/submission/submission-backend-relay.c | 6 ++++++ src/submission/submission-backend-relay.h | 1 + src/submission/submission-client.c | 6 ------ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/submission/submission-backend-relay.c b/src/submission/submission-backend-relay.c index 43560c3351..bb6232a924 100644 --- a/src/submission/submission-backend-relay.c +++ b/src/submission/submission-backend-relay.c @@ -739,6 +739,12 @@ void client_proxy_create(struct client *client, set->submission_relay_port, ssl_mode, &smtp_set); } +void client_proxy_destroy(struct client *client) +{ + if (client->proxy_conn != NULL) + smtp_client_connection_close(&client->proxy_conn); +} + static void client_proxy_ready_cb(const struct smtp_reply *reply, void *context) { diff --git a/src/submission/submission-backend-relay.h b/src/submission/submission-backend-relay.h index 0ed021e76d..f432d9eace 100644 --- a/src/submission/submission-backend-relay.h +++ b/src/submission/submission-backend-relay.h @@ -20,6 +20,7 @@ struct submission_settings; void client_proxy_create(struct client *client, const struct submission_settings *set); +void client_proxy_destroy(struct client *client); void client_proxy_start(struct client *client); #endif diff --git a/src/submission/submission-client.c b/src/submission/submission-client.c index 3019badae4..4aac1ceba2 100644 --- a/src/submission/submission-client.c +++ b/src/submission/submission-client.c @@ -82,12 +82,6 @@ static const char *client_remote_id(struct client *client) return addr; } -static void client_proxy_destroy(struct client *client) -{ - if (client->proxy_conn != NULL) - smtp_client_connection_close(&client->proxy_conn); -} - static void client_init_urlauth(struct client *client) { static const char *access_apps[] = { "submit+", NULL };