From 54a1ed20e203dcafeacbe21eb147efa08255dbf5 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Thu, 4 Aug 2016 15:01:42 +0200
Subject: [PATCH] gpg: Always print the fingerprint in colons mode.

* g10/keylist.c (list_keyblock_colon): Remove arg FPR.  Always print
fingerprint records.  For secret keys always print keygrip records.
--

The fingerprint should always be used thus we should always print it.

Signed-off-by: Werner Koch <wk@gnupg.org>
---
 doc/gpg.texi  |  3 ++-
 g10/keylist.c | 32 ++++++++++++--------------------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/doc/gpg.texi b/doc/gpg.texi
index 4d6a26159..c54496747 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -2378,7 +2378,8 @@ Print the ICAO spelling of the fingerprint in addition to the hex digits.
 
 @item --with-keygrip
 @opindex with-keygrip
-Include the keygrip in the key listings.
+Include the keygrip in the key listings.  In @code{--with-colons} mode
+this is implicitly enable for secret keys.
 
 @item --with-wkd-hash
 @opindex with-wkd-hash
diff --git a/g10/keylist.c b/g10/keylist.c
index 2c99502b3..1ba92124f 100644
--- a/g10/keylist.c
+++ b/g10/keylist.c
@@ -1175,7 +1175,7 @@ print_revokers (estream_t fp, PKT_public_key * pk)
    secret key is available even if SECRET is not set.  */
 static void
 list_keyblock_colon (ctrl_t ctrl, kbnode_t keyblock,
-                     int secret, int has_secret, int fpr)
+                     int secret, int has_secret)
 {
   int rc;
   KBNODE kbctx;
@@ -1271,15 +1271,11 @@ list_keyblock_colon (ctrl_t ctrl, kbnode_t keyblock,
   es_putc ('\n', es_stdout);
 
   print_revokers (es_stdout, pk);
-  if (fpr)
-    print_fingerprint (NULL, pk, 0);
-  if (opt.with_key_data || opt.with_keygrip)
-    {
-      if (hexgrip)
-        es_fprintf (es_stdout, "grp:::::::::%s:\n", hexgrip);
-      if (opt.with_key_data)
-        print_key_data (pk);
-    }
+  print_fingerprint (NULL, pk, 0);
+  if (hexgrip)
+    es_fprintf (es_stdout, "grp:::::::::%s:\n", hexgrip);
+  if (opt.with_key_data)
+    print_key_data (pk);
 
   for (kbctx = NULL; (node = walk_kbnode (keyblock, &kbctx, 0));)
     {
@@ -1408,15 +1404,11 @@ list_keyblock_colon (ctrl_t ctrl, kbnode_t keyblock,
             }
           es_putc (':', es_stdout);	/* End of field 17. */
 	  es_putc ('\n', es_stdout);
-	  if (fpr > 1)
-	    print_fingerprint (NULL, pk2, 0);
-	  if (opt.with_key_data || opt.with_keygrip)
-            {
-              if (hexgrip)
-                es_fprintf (es_stdout, "grp:::::::::%s:\n", hexgrip);
-              if (opt.with_key_data)
-                print_key_data (pk2);
-            }
+          print_fingerprint (NULL, pk2, 0);
+          if (hexgrip)
+            es_fprintf (es_stdout, "grp:::::::::%s:\n", hexgrip);
+          if (opt.with_key_data)
+            print_key_data (pk2);
 	}
       else if (opt.list_sigs && node->pkt->pkttype == PKT_SIGNATURE)
 	{
@@ -1599,7 +1591,7 @@ list_keyblock (ctrl_t ctrl,
   reorder_keyblock (keyblock);
 
   if (opt.with_colons)
-    list_keyblock_colon (ctrl, keyblock, secret, has_secret, fpr);
+    list_keyblock_colon (ctrl, keyblock, secret, has_secret);
   else
     list_keyblock_print (ctrl, keyblock, secret, fpr, listctx);