From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Mon, 7 Jul 2014 11:32:56 +0000 (+0200)
Subject: p11tool: make brief output more brief
X-Git-Tag: gnutls_3_3_6~47
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=839bab44cdc586526e85b3b3f11fd2afdfbdb879;p=thirdparty%2Fgnutls.git

p11tool: make brief output more brief
---

diff --git a/src/pkcs11.c b/src/pkcs11.c
index 7f4ba261e1..126cbb9293 100644
--- a/src/pkcs11.c
+++ b/src/pkcs11.c
@@ -372,10 +372,12 @@ pkcs11_token_list(FILE * outfile, unsigned int detailed,
 			exit(1);
 		}
 
-		fprintf(outfile, "Token %d:\n\tURL: %s\n", i, url);
-
-		if (brief != 0)
+		if (brief != 0) {
+			fprintf(outfile, "Token %d: %s\n", i, url);
 			goto cont;
+		} else {
+			fprintf(outfile, "Token %d:\n\tURL: %s\n", i, url);
+		}
 
 		size = sizeof(buf);
 		ret =