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 47532c9b1618e90112ff2085c7d71e314c31504e..ea0663efef1579a56aababd51b38c3838f719e7b 100644 (file)
--- 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;
     }