Automatically prefix all log messages with the plugin name (if available).

[sysdb.git] / src / utils / ssl.c

diff --git a/src/utils/ssl.c b/src/utils/ssl.c
index c6a3fcb5e17df59b1050ca7c07aa8315068004ff..12beac528fbcfb36d9643469fb8213159ee6a80a 100644 (file)
--- a/src/utils/ssl.c
+++ b/src/utils/ssl.c
@@ -168,8 +168,7 @@ ssl_log_err(int prio, SSL *ssl, int status, const char *prefix, ...)
 
        if (errno) {
                char errbuf[1024];
-               sdb_log(prio, "%s: %s", msg,
-                               sdb_strerror(errno, errbuf, sizeof(errbuf)));
+               sdb_log(prio, "%s: %s", msg, sdb_strerror(errno, errbuf, sizeof(errbuf)));
        }
 } /* ssl_log_err */
 
@@ -399,6 +398,7 @@ sdb_ssl_server_create(const sdb_ssl_options_t *opts)
                                server->opts.ca_file, NULL)) {
                ssl_log(SDB_LOG_ERR, "Failed to load CA file %s",
                                server->opts.ca_file);
+               sdb_ssl_server_destroy(server);
                return NULL;
        }
        SSL_CTX_set_client_CA_list(server->ctx,
@@ -408,16 +408,19 @@ sdb_ssl_server_create(const sdb_ssl_options_t *opts)
                                server->opts.cert_file, SSL_FILETYPE_PEM)) {
                ssl_log(SDB_LOG_ERR, "Failed to load SSL cert file %s",
                                server->opts.cert_file);
+               sdb_ssl_server_destroy(server);
                return NULL;
        }
        if (! SSL_CTX_use_PrivateKey_file(server->ctx,
                                server->opts.key_file, SSL_FILETYPE_PEM)) {
                ssl_log(SDB_LOG_ERR, "Failed to load SSL key file %s",
                                server->opts.key_file);
+               sdb_ssl_server_destroy(server);
                return NULL;
        }
        if (! SSL_CTX_check_private_key(server->ctx)) {
                ssl_log(SDB_LOG_ERR, "Failed to verify SSL private key");
+               sdb_ssl_server_destroy(server);
                return NULL;
        }