commit 45e53ae66e25d91933cc21340d20f81b74e9d8ed
author Michal Vasko <mvasko@cesnet.cz> Thu Apr 07 11:46:03 2016 +0200
committer Michal Vasko <mvasko@cesnet.cz> Thu Apr 07 11:46:03 2016 +0200
tree f7f27831c460682ee6615afefe430ad8b9050053
parent e24f3d32ae9e69497425c4c8c644695c4a524a4f

log CHANGE invalid argument error enhanced

src/session_client_tls.c

diff --git a/src/session_client_tls.c b/src/session_client_tls.c
index 37f9d4e..25ddd85 100644
--- a/src/session_client_tls.c
+++ b/src/session_client_tls.c
@@ -151,7 +151,7 @@
 _nc_client_tls_set_cert_key_paths(const char *client_cert, const char *client_key, struct nc_client_tls_opts *opts)
 {
     if (!client_cert) {
-        ERRARG;
+        ERRARG("client_cert");
         return -1;
     }
 
@@ -195,7 +195,7 @@
 _nc_client_tls_get_cert_key_paths(const char **client_cert, const char **client_key, struct nc_client_tls_opts *opts)
 {
     if (!client_cert && !client_key) {
-        ERRARG;
+        ERRARG("client_cert and client_key");
         return;
     }
 
@@ -223,7 +223,7 @@
 _nc_client_tls_set_trusted_ca_paths(const char *ca_file, const char *ca_dir, struct nc_client_tls_opts *opts)
 {
     if (!ca_file && !ca_dir) {
-        ERRARG;
+        ERRARG("ca_file and ca_dir");
         return -1;
     }
 
@@ -271,7 +271,7 @@
 _nc_client_tls_get_trusted_ca_paths(const char **ca_file, const char **ca_dir, struct nc_client_tls_opts *opts)
 {
     if (!ca_file && !ca_dir) {
-        ERRARG;
+        ERRARG("ca_file and ca_dir");
         return;
     }
 
@@ -299,7 +299,7 @@
 _nc_client_tls_set_crl_paths(const char *crl_file, const char *crl_dir, struct nc_client_tls_opts *opts)
 {
     if (!crl_file && !crl_dir) {
-        ERRARG;
+        ERRARG("crl_file and crl_dir");
         return -1;
     }
 
@@ -347,7 +347,7 @@
 _nc_client_tls_get_crl_paths(const char **crl_file, const char **crl_dir, struct nc_client_tls_opts *opts)
 {
     if (!crl_file && !crl_dir) {
-        ERRARG;
+        ERRARG("crl_file and crl_dir");
         return;
     }
 
@@ -467,7 +467,7 @@
     uint32_t elapsed_usec = 0;
 
     if (!tls_opts.cert_path || (!tls_opts.ca_file && !tls_opts.ca_dir)) {
-        ERRARG;
+        ERRINIT;
         return NULL;
     }
 
@@ -598,8 +598,10 @@
 {
     struct nc_session *session;
 
-    /* check TLS session status */
-    if (!tls || !SSL_is_init_finished(tls)) {
+    if (!tls) {
+        ERRARG("tls");
+        return NULL;
+    } else if (!SSL_is_init_finished(tls)) {
         ERR("Supplied TLS session is not fully connected!");
         return NULL;
     }