[Pkg-gnupg-commit] [gnupg2] 134/159: gpg: Silence message about ignoring revoked user ids.

Daniel Kahn Gillmor dkg at fifthhorseman.net
Wed Jan 27 13:24:02 UTC 2016


This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit bdb61351776c038d668310d9b5e5c32588ef6519
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jan 20 15:51:18 2016 +0100

    gpg: Silence message about ignoring revoked user ids.
    
    * g10/trustdb.c (tdb_get_validity_core): Print message only in debug
    mode.
    --
    
    This makes only sense for debugging.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 g10/trustdb.c | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/g10/trustdb.c b/g10/trustdb.c
index d3a186f..8f2b2cb 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -1041,18 +1041,22 @@ tdb_get_validity_core (PKT_public_key *pk, PKT_user_id *uid,
 	  else
 	    user_id = user_id_node->pkt->pkt.user_id;
 
+          /* If the user id is revoked or expired, then skip it.  */
 	  if (user_id->is_revoked || user_id->is_expired)
-	    /* If the user id is revoked or expired, then skip it.  */
 	    {
-	      char *s;
-	      if (user_id->is_revoked && user_id->is_expired)
-		s = "revoked and expired";
-	      else if (user_id->is_revoked)
-		s = "revoked";
-	      else
-		s = "expire";
-
-	      log_info ("TOFU: Ignoring %s user id (%s)\n", s, user_id->name);
+              if (DBG_TRUST)
+                {
+                  char *s;
+                  if (user_id->is_revoked && user_id->is_expired)
+                    s = "revoked and expired";
+                  else if (user_id->is_revoked)
+                    s = "revoked";
+                  else
+                    s = "expire";
+
+                  log_debug ("TOFU: Ignoring %s user id (%s)\n",
+                             s, user_id->name);
+                }
 
 	      continue;
 	    }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git



More information about the Pkg-gnupg-commit mailing list