From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sat, 21 Jan 2012 19:52:45 +0000 (+0100)
Subject: updated p11tool def.
X-Git-Tag: gnutls_3_0_13~238
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b95f3ad5d4f0862aae3ac439f48dc9dd9bb44a3a;p=thirdparty%2Fgnutls.git

updated p11tool def.
---

diff --git a/src/p11tool-args.def.in b/src/p11tool-args.def.in
index 2bfda10aa7..66ceffd090 100644
--- a/src/p11tool-args.def.in
+++ b/src/p11tool-args.def.in
@@ -172,7 +172,7 @@ flag = {
     name      = detailed-url;
     descrip   = "Print detailed URLs";
     disabled;
-    enable    = "no";
+    disable   = "no";
     doc   = "";
 };
 
@@ -275,15 +275,15 @@ To view all tokens in your system use:
 $ p11tool --list-tokens
 @end example
 
-To store a private key and a certificate in a token run:
+To view all objects in a token use:
 @example
-$ p11tool --login --write --url "pkcs11:URL" --load-privkey key.pem --label "Mykey"
-$ p11tool --login --write --url "pkcs11:URL" --load-certificate cert.pem --label "MyCert"
+$ p11tool --login --list-all --url "pkcs11:TOKEN-URL"
 @end example
 
-To view all objects in a token use:
+To store a private key and a certificate in a token run:
 @example
-$ p11tool --login --list-all --url "pkcs11:TOKEN-URL"
+$ p11tool --login --write --url "pkcs11:URL" --load-privkey key.pem --label "Mykey"
+$ p11tool --login --write --url "pkcs11:URL" --load-certificate cert.pem --label "MyCert"
 @end example
 _EOT_;
 };
diff --git a/src/p11tool.c b/src/p11tool.c
index 265b292ae5..d9f1af9ce4 100644
--- a/src/p11tool.c
+++ b/src/p11tool.c
@@ -229,6 +229,15 @@ cmd_parser (int argc, char **argv)
       sec_param = OPT_ARG(SEC_PARAM);
     }
 
+  if (debug > 0)
+    {
+      fprintf(stderr, "Private: %s\n", ENABLED_OPT(PRIVATE)?"yes":"no");
+      fprintf(stderr, "Trusted: %s\n", ENABLED_OPT(TRUSTED)?"yes":"no");
+      fprintf(stderr, "Login: %s\n", ENABLED_OPT(LOGIN)?"yes":"no");
+      fprintf(stderr, "Detailed URLs: %s\n", ENABLED_OPT(DETAILED_URL)?"yes":"no");
+      fprintf(stderr, "\n");
+    }
+
   switch (action)
     {
     case ACTION_PKCS11_LIST: