global: Rename ssl_iostream_context_deinit() to ssl_iostream_context_unref()

diff --git a/src/doveadm/doveadm-dsync.c b/src/doveadm/doveadm-dsync.c
index 1224052385cddb6390d998a7fae248ceae1776e6..114639d125d139079c00e5924af5272dd3137977 100644 (file)
--- a/src/doveadm/doveadm-dsync.c
+++ b/src/doveadm/doveadm-dsync.c
@@ -711,7 +711,7 @@ cmd_dsync_run(struct doveadm_mail_cmd_context *_ctx, struct mail_user *user)
        if (ctx->ssl_iostream != NULL)
                ssl_iostream_destroy(&ctx->ssl_iostream);
        if (ctx->ssl_ctx != NULL)
-               ssl_iostream_context_deinit(&ctx->ssl_ctx);
+               ssl_iostream_context_unref(&ctx->ssl_ctx);
        if (ctx->input != NULL) {
                i_stream_set_max_buffer_size(ctx->input, ctx->input_orig_bufsize);
                i_stream_unref(&ctx->input);

diff --git a/src/lib-http/http-client.c b/src/lib-http/http-client.c
index ee1628b171f2a0c387dea1edcd4c63a00418ced6..0a78e4e6b785a76826dbe124e2bcce1dede9d32d 100644 (file)
--- a/src/lib-http/http-client.c
+++ b/src/lib-http/http-client.c
@@ -201,7 +201,7 @@ void http_client_deinit(struct http_client **_client)
        connection_list_deinit(&client->conn_list);
 
        if (client->ssl_ctx != NULL)
-               ssl_iostream_context_deinit(&client->ssl_ctx);
+               ssl_iostream_context_unref(&client->ssl_ctx);
        pool_unref(&client->pool);
 }
 

diff --git a/src/lib-http/http-server.c b/src/lib-http/http-server.c
index 62d74d57516ff31751e9309ec57a2fcbac9b34f6..617278102744188ce83c8c77e55c0207df05469e 100644 (file)
--- a/src/lib-http/http-server.c
+++ b/src/lib-http/http-server.c
@@ -52,7 +52,7 @@ void http_server_deinit(struct http_server **_server)
        connection_list_deinit(&server->conn_list);
 
        if (server->ssl_ctx != NULL)
-               ssl_iostream_context_deinit(&server->ssl_ctx);
+               ssl_iostream_context_unref(&server->ssl_ctx);
        pool_unref(&server->pool);
 }
 

diff --git a/src/lib-imap-client/imapc-client.c b/src/lib-imap-client/imapc-client.c
index 96f51b03053d22cc2f7b42563c84b0640c9ca656..0b586facbd7c290b243368f7c85767b522131bdf 100644 (file)
--- a/src/lib-imap-client/imapc-client.c
+++ b/src/lib-imap-client/imapc-client.c
@@ -137,7 +137,7 @@ void imapc_client_unref(struct imapc_client **_client)
                return;
 
        if (client->ssl_ctx != NULL)
-               ssl_iostream_context_deinit(&client->ssl_ctx);
+               ssl_iostream_context_unref(&client->ssl_ctx);
        pool_unref(&client->pool);
 }
 

diff --git a/src/lib-master/master-service-ssl.c b/src/lib-master/master-service-ssl.c
index 984ac6205a733d8aa39fd39efc8578f2b12c9dad..3bfd76d3e9db3c9c6c8f3bafebdba63467f23b54 100644 (file)
--- a/src/lib-master/master-service-ssl.c
+++ b/src/lib-master/master-service-ssl.c
@@ -95,6 +95,6 @@ void master_service_ssl_ctx_init(struct master_service *service)
 void master_service_ssl_ctx_deinit(struct master_service *service)
 {
        if (service->ssl_ctx != NULL)
-               ssl_iostream_context_deinit(&service->ssl_ctx);
+               ssl_iostream_context_unref(&service->ssl_ctx);
        service->ssl_ctx_initialized = FALSE;
 }

diff --git a/src/lib-ssl-iostream/iostream-openssl-context.c b/src/lib-ssl-iostream/iostream-openssl-context.c
index 4fe8b420f9e82af1395e0b762bc2ed835085f509..1a2df3a3b6146fbc25d12650a4998a6f80d88b22 100644 (file)
--- a/src/lib-ssl-iostream/iostream-openssl-context.c
+++ b/src/lib-ssl-iostream/iostream-openssl-context.c
@@ -589,7 +589,7 @@ int openssl_iostream_context_init_client(const struct ssl_iostream_settings *set
        ctx->ssl_ctx = ssl_ctx;
        ctx->client_ctx = TRUE;
        if (ssl_iostream_context_init_common(ctx, &set_copy, error_r) < 0) {
-               ssl_iostream_context_deinit(&ctx);
+               ssl_iostream_context_unref(&ctx);
                return -1;
        }
        *ctx_r = ctx;
@@ -614,7 +614,7 @@ int openssl_iostream_context_init_server(const struct ssl_iostream_settings *set
        ctx = i_new(struct ssl_iostream_context, 1);
        ctx->ssl_ctx = ssl_ctx;
        if (ssl_iostream_context_init_common(ctx, set, error_r) < 0) {
-               ssl_iostream_context_deinit(&ctx);
+               ssl_iostream_context_unref(&ctx);
                return -1;
        }
        *ctx_r = ctx;

diff --git a/src/lib-ssl-iostream/iostream-ssl.c b/src/lib-ssl-iostream/iostream-ssl.c
index 863e196e69a13b7deb11d8d0ed53280f91c4299f..e4485ec4e39e2cfad4a3300eb225f7701d7a2f1d 100644 (file)
--- a/src/lib-ssl-iostream/iostream-ssl.c
+++ b/src/lib-ssl-iostream/iostream-ssl.c
@@ -98,7 +98,7 @@ int ssl_iostream_context_init_server(const struct ssl_iostream_settings *set,
        return ssl_vfuncs->context_init_server(set, ctx_r, error_r);
 }
 
-void ssl_iostream_context_deinit(struct ssl_iostream_context **_ctx)
+void ssl_iostream_context_unref(struct ssl_iostream_context **_ctx)
 {
        struct ssl_iostream_context *ctx = *_ctx;
 

diff --git a/src/lib-ssl-iostream/iostream-ssl.h b/src/lib-ssl-iostream/iostream-ssl.h
index 77a00fe938a83fc8b645f990e2394efff2ee1320..531bf052628a029408793fee3a61138aacc4248c 100644 (file)
--- a/src/lib-ssl-iostream/iostream-ssl.h
+++ b/src/lib-ssl-iostream/iostream-ssl.h
@@ -92,7 +92,9 @@ int ssl_iostream_context_init_client(const struct ssl_iostream_settings *set,
 int ssl_iostream_context_init_server(const struct ssl_iostream_settings *set,
                                     struct ssl_iostream_context **ctx_r,
                                     const char **error_r);
-void ssl_iostream_context_deinit(struct ssl_iostream_context **ctx);
+void ssl_iostream_context_unref(struct ssl_iostream_context **ctx);
+/* FIXME: temporarily for backwards compatibility, remove later */
+#define ssl_iostream_context_deinit(ctx) ssl_iostream_context_unref(ctx)
 
 struct ssl_iostream_settings *ssl_iostream_settings_dup(pool_t pool,
                        const struct ssl_iostream_settings *old_set);

diff --git a/src/lib-storage/index/pop3c/pop3c-client.c b/src/lib-storage/index/pop3c/pop3c-client.c
index 0197626478d2d5d87e3664d64ca519d348d7468d..51ac34e9121f02ccd3e5a4461b06fcdd21d75875 100644 (file)
--- a/src/lib-storage/index/pop3c/pop3c-client.c
+++ b/src/lib-storage/index/pop3c/pop3c-client.c
@@ -218,7 +218,7 @@ void pop3c_client_deinit(struct pop3c_client **_client)
 
        pop3c_client_disconnect(client);
        if (client->ssl_ctx != NULL)
-               ssl_iostream_context_deinit(&client->ssl_ctx);
+               ssl_iostream_context_unref(&client->ssl_ctx);
        pool_unref(&client->pool);
 }