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_server_tls.c

diff --git a/src/session_server_tls.c b/src/session_server_tls.c
index a905089..42bb445 100644
--- a/src/session_server_tls.c
+++ b/src/session_server_tls.c
@@ -700,7 +700,7 @@
     X509 *x509_cert;
 
     if (!cert) {
-        ERRARG;
+        ERRARG("cert");
         return -1;
     }
 
@@ -763,7 +763,7 @@
 nc_server_tls_set_cert_path(const char *cert_path, struct nc_server_tls_opts *opts)
 {
     if (!cert_path) {
-        ERRARG;
+        ERRARG("cert_path");
         return -1;
     }
 
@@ -825,7 +825,7 @@
     EVP_PKEY *key;;
 
     if (!privkey) {
-        ERRARG;
+        ERRARG("privkey");
         return -1;
     }
 
@@ -888,7 +888,7 @@
 nc_server_tls_set_key_path(const char *privkey_path, struct nc_server_tls_opts *opts)
 {
     if (!privkey_path) {
-        ERRARG;
+        ERRARG("privkey_path");
         return -1;
     }
 
@@ -951,7 +951,7 @@
     X509 *x509_cert;
 
     if (!cert) {
-        ERRARG;
+        ERRARG("cert");
         return -1;
     }
 
@@ -1023,7 +1023,7 @@
     X509 *x509_cert;
 
     if (!cert_path) {
-        ERRARG;
+        ERRARG("cert_path");
         return -1;
     }
 
@@ -1097,7 +1097,7 @@
     X509_LOOKUP *lookup;
 
     if (!ca_file && !ca_dir) {
-        ERRARG;
+        ERRARG("ca_file and ca_dir");
         return -1;
     }
 
@@ -1222,7 +1222,7 @@
     X509_LOOKUP *lookup;
 
     if (!crl_file && !crl_dir) {
-        ERRARG;
+        ERRARG("crl_file and crl_dir");
         return -1;
     }
 
@@ -1335,9 +1335,15 @@
 {
     struct nc_ctn *ctn, *new;
 
-    if (!fingerprint || !map_type || ((map_type == NC_TLS_CTN_SPECIFIED) && !name)
+    if (!fingerprint) {
+        ERRARG("fingerprint");
+        return -1;
+    } else if (!map_type) {
+        ERRARG("map_type");
+        return -1;
+    } else if (((map_type == NC_TLS_CTN_SPECIFIED) && !name)
             || ((map_type != NC_TLS_CTN_SPECIFIED) && name)) {
-        ERRARG;
+        ERRARG("map_type and name");
         return -1;
     }