]> granicus.if.org Git - p11-kit/commitdiff
trust: Clarify the error message of 'extract'
authorDaiki Ueno <dueno@redhat.com>
Tue, 27 Sep 2016 13:30:09 +0000 (15:30 +0200)
committerDaiki Ueno <ueno@gnu.org>
Mon, 28 Nov 2016 09:35:06 +0000 (10:35 +0100)
https://bugzilla.redhat.com/show_bug.cgi?id=1154693

trust/extract.c

index 80b5e7238802e099db002429a41a52f9c12ac5b2..05273f92fc81a3cc504c34a001b08fd2c3f53c48 100644 (file)
@@ -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"