summaryrefslogtreecommitdiffstats
path: root/gnupgparse.c
diff options
context:
space:
mode:
authorThomas Roessler <roessler@does-not-exist.org>2003-05-29 17:45:32 +0000
committerThomas Roessler <roessler@does-not-exist.org>2003-05-29 17:45:32 +0000
commit7f4a9ea59600297ace0542c5e2334bdfc4b7a828 (patch)
tree7cb03f92295faf4b12853a14b022582ba74b53cd /gnupgparse.c
parent0cbb6caed943b4986b8862778618758734f79b72 (diff)
Fix PGP subkey handling when looking at key capabilities. This
should take care of the recent "mutt does not see all keys" problems.
Diffstat (limited to 'gnupgparse.c')
-rw-r--r--gnupgparse.c4
1 files changed, 3 insertions, 1 deletions
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;
}