keyfile and certfile types were changed to string, to allow for PKCS #11 urls

diff --git a/src/cli-args.def.in b/src/cli-args.def.in
index c5583b521f4de14cf0757f8f19edfe1413287750..dfdbcdc8a8269460ff81368602953876ef3ccb55 100644 (file)
--- a/src/cli-args.def.in
+++ b/src/cli-args.def.in
@@ -136,8 +136,7 @@ information on allowed keywords";
 
 flag = {
     name      = x509cafile;
-    arg-type  = file;
-    file-exists = yes;
+    arg-type  = string;
     descrip   = "Certificate file or PKCS #11 URL to use";
     doc      = "";
 };
@@ -176,16 +175,14 @@ flag = {
 
 flag = {
     name      = x509keyfile;
-    arg-type  = file;
-    file-exists = yes;
+    arg-type  = string;
     descrip   = "X.509 key file or PKCS #11 URL to use";
     doc      = "";
 };
 
 flag = {
     name      = x509certfile;
-    arg-type  = file;
-    file-exists = yes;
+    arg-type  = string;
     descrip   = "X.509 Certificate file or PKCS #11 URL to use";
     doc      = "";
 };

diff --git a/src/serv-args.def.in b/src/serv-args.def.in
index 424cab2d920190089c83033c06348adf25ceb52e..4b4dee2f128bbe78c7ea09a41fd0c1e403d57618 100644 (file)
--- a/src/serv-args.def.in
+++ b/src/serv-args.def.in
@@ -125,8 +125,7 @@ flag = {
 
 flag = {
     name      = x509cafile;
-    arg-type  = file;
-    file-exists = yes;
+    arg-type  = string;
     descrip   = "Certificate file or PKCS #11 URL to use";
     doc      = "";
 };
@@ -165,48 +164,42 @@ flag = {
 
 flag = {
     name      = x509keyfile;
-    arg-type  = file;
-    file-exists = yes;
+    arg-type  = string;
     descrip   = "X.509 key file or PKCS #11 URL to use";
     doc      = "";
 };
 
 flag = {
     name      = x509certfile;
-    arg-type  = file;
-    file-exists = yes;
+    arg-type  = string;
     descrip   = "X.509 Certificate file or PKCS #11 URL to use";
     doc      = "";
 };
 
 flag = {
     name      = x509dsakeyfile;
-    arg-type  = file;
-    file-exists = yes;
+    arg-type  = string;
     descrip   = "Alternative X.509 key file or PKCS #11 URL to use";
     doc      = "";
 };
 
 flag = {
     name      = x509dsacertfile;
-    arg-type  = file;
-    file-exists = yes;
+    arg-type  = string;
     descrip   = "Alternative X.509 Certificate file or PKCS #11 URL to use";
     doc      = "";
 };
 
 flag = {
     name      = x509ecckeyfile;
-    arg-type  = file;
-    file-exists = yes;
+    arg-type  = string;
     descrip   = "Alternative X.509 key file or PKCS #11 URL to use";
     doc      = "";
 };
 
 flag = {
     name      = x509ecccertfile;
-    arg-type  = file;
-    file-exists = yes;
+    arg-type  = string;
     descrip   = "Alternative X.509 Certificate file or PKCS #11 URL to use";
     doc      = "";
 };