p11tool parses arguments are before (with gaa).

1 files changed, 10 insertions, 8 deletions

diff --git a/src/p11tool.c b/src/p11tool.c
index 864db3ed35..d800e46bea 100644
--- a/src/p11tool.c
+++ b/src/p11tool.c
@@ -78,12 +78,19 @@ cmd_parser (int argc, char **argv)
   common_info_st cinfo;
   unsigned int action = 1, pkcs11_type = -1, key_type = GNUTLS_PK_UNKNOWN;
   const char* url = NULL;
-  unsigned int detailed_url = 0;
+  unsigned int detailed_url = 0, optct;
   unsigned int login = 0, bits = 0;
   const char* label = NULL, *sec_param = NULL;
   
-  optionProcess( &p11toolOptions, argc, argv);
-  
+  optct = optionProcess( &p11toolOptions, argc, argv);
+  argc += optct;
+  argv += optct;
+ 
+  if (url == NULL && argc > 0)
+    url = argv[0];
+  else
+    url = "pkcs11:";
+ 
   if (HAVE_OPT(DEBUG))
     debug = OPT_VALUE_DEBUG;
 
@@ -209,11 +216,6 @@ cmd_parser (int argc, char **argv)
   if (ENABLED_OPT(LOGIN))
     login = 1;
 
-  if (HAVE_OPT(URL))
-    {
-      url = OPT_ARG(URL);
-    }
-
   if (HAVE_OPT(LABEL))
     {
       label = OPT_ARG(LABEL);