From: Thomas Roessler <roessler@does-not-exist.org>
Date: Thu, 29 May 2003 17:45:32 +0000 (+0000)
Subject: Fix PGP subkey handling when looking at key capabilities.  This
X-Git-Tag: pre-type-punning-patch~69
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7f4a9ea59600297ace0542c5e2334bdfc4b7a828;p=mutt

Fix PGP subkey handling when looking at key capabilities.  This
should take care of the recent "mutt does not see all keys"
problems.
---

diff --git a/gnupgparse.c b/gnupgparse.c
index 47532c9b..ea0663ef 100644
--- a/gnupgparse.c
+++ b/gnupgparse.c
@@ -299,10 +299,12 @@ static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
 	      }
 	  }
 
-        if (!is_uid && !(*is_subkey && option (OPTPGPIGNORESUB)))
+        if (!is_uid && 
+	    (!*is_subkey || !option (OPTPGPIGNORESUB) || !(flags & KEYFLAG_DISABLED)))
 	  k->flags |= flags;
 
 	break;
+      
       default:
         break;
     }