From 76304a971fe507ea659b952932ea899463ab7166 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Wed, 31 Aug 2016 08:37:51 +0200
Subject: [PATCH] gpg: Fix regression in gpgv's printing of the keyid.

* g10/keyid.c (keystr): Take care of KF_NONE != KF_DEFAULT.
--

Debian-bug-id: 836144
Signed-off-by: Werner Koch <wk@gnupg.org>
---
 g10/keyid.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/g10/keyid.c b/g10/keyid.c
index ea6ed5ef0..4380151ee 100644
--- a/g10/keyid.c
+++ b/g10/keyid.c
@@ -403,6 +403,8 @@ keystr (u32 *keyid)
   static char keyid_str[KEYID_STR_SIZE];
   int format = opt.keyid_format;
 
+  if (format == KF_DEFAULT)
+    format = KF_NONE;
   if (format == KF_NONE)
     format = KF_LONG;