From: Daiki Ueno <dueno@redhat.com>
Date: Tue, 27 Sep 2016 13:30:09 +0000 (+0200)
Subject: trust: Clarify the error message of 'extract'
X-Git-Tag: 0.23.3~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9cb55d7357db929960dca26b9f22f488b756bac2;p=p11-kit

trust: Clarify the error message of 'extract'

https://bugzilla.redhat.com/show_bug.cgi?id=1154693
---

diff --git a/trust/extract.c b/trust/extract.c
index 80b5e72..05273f9 100644
--- a/trust/extract.c
+++ b/trust/extract.c
@@ -147,6 +147,9 @@ validate_filter_and_format (p11_enumerate *ex,
 		 */
 
 		if (!ex->limit_to_purposes) {
+			p11_message ("format requires a purpose, specify it with --purpose; defaulting to 'server-auth'");
+			p11_enumerate_opt_purpose (ex, "server-auth");
+		} else if (p11_dict_size (ex->limit_to_purposes) > 1) {
 			p11_message ("format does not support multiple purposes, defaulting to 'server-auth'");
 			p11_enumerate_opt_purpose (ex, "server-auth");
 		}
@@ -191,7 +194,7 @@ p11_trust_extract (int argc,
 		{ 0, "usage: trust extract --format=<output> <destination>" },
 		{ opt_filter,
 		  "filter of what to export\n"
-		  "  ca-anchors        certificate anchors (default)\n"
+		  "  ca-anchors        certificate anchors\n"
 		  "  blacklist         blacklisted certificates\n"
 		  "  trust-policy      anchors and blacklist\n"
 		  "  certificates      all certificates\n"