File 0007-init_curl_transport-make-inifile-available-early.patch of Package openwsman.16287
From 6be1290a3caa935cbbfa436f8572dc769f7598e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
Date: Tue, 25 Aug 2015 12:13:42 +0200
Subject: [PATCH 07/15] init_curl_transport: make inifile available early
---
src/lib/wsman-curl-client-transport.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/lib/wsman-curl-client-transport.c b/src/lib/wsman-curl-client-transport.c
index 5de6d87359c8..bdb4780bcc62 100644
--- a/src/lib/wsman-curl-client-transport.c
+++ b/src/lib/wsman-curl-client-transport.c
@@ -270,6 +270,8 @@ init_curl_transport(WsManClient *cl)
CURLcode r = CURLE_OK;
char *sslhack;
long sslversion;
+ dictionary *ini = iniparser_new(wsmc_get_conffile(cl));
+
#define curl_err(str) debug("Error = %d (%s); %s", \
r, curl_easy_strerror(r), str);
curl = curl_easy_init();
@@ -311,17 +313,13 @@ init_curl_transport(WsManClient *cl)
}
if (0 != cl->authentication.verify_peer && 0 != cl->authentication.crl_check)
- {
- dictionary *ini = NULL;
-
+ {
if (cl->authentication.crl_file == NULL)
{
- ini = iniparser_new(cl->client_config_file);
if (ini != NULL)
{
char *crlfile = iniparser_getstr(ini, "client:crlfile");
wsman_transport_set_crlfile(cl, crlfile);
- iniparser_free(ini);
}
}
if (cl->authentication.crl_file != NULL)
@@ -406,10 +404,12 @@ init_curl_transport(WsManClient *cl)
goto DONE;
}
+ iniparser_free(ini);
return (void *)curl;
DONE:
cl->last_error = convert_to_last_error(r);
curl_easy_cleanup(curl);
+ iniparser_free(ini);
return NULL;
#undef curl_err
}
--
2.18.0