diff options
| author | David Shaw <[email protected]> | 2004-12-14 14:42:41 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-12-14 14:42:41 +0000 |
| commit | 7dd3fe2a79efc12905ac9c4fe002864539747e9b (patch) | |
| tree | 8da5d93978ac8cd6f0c01842b750cf544abca562 /g10/trustdb.c | |
| parent | post release updates (diff) | |
| download | gnupg-7dd3fe2a79efc12905ac9c4fe002864539747e9b.tar.gz gnupg-7dd3fe2a79efc12905ac9c4fe002864539747e9b.zip | |
* trustdb.c (uid_trust_string_fixed): Show uids as revoked if the key is
revoked.
* keyedit.c (show_key_with_all_names): Don't show validity for secret key
UIDs.
* keyedit.c (parse_sign_type): New. Figure out the flags (local,
nonrevoke, trust) for a signature. (keyedit_menu): Call it here so we can
mix and match flags, and don't need "nrltsign", "ltsign", "tnrsign", etc,
etc, etc.
Diffstat (limited to '')
| -rw-r--r-- | g10/trustdb.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/g10/trustdb.c b/g10/trustdb.c index 1222f49ca..ca4c4209d 100644 --- a/g10/trustdb.c +++ b/g10/trustdb.c @@ -495,17 +495,18 @@ trust_letter (unsigned int value) properly. The value "10" should be the length of the strings you choose to translate to. This is the length in printable columns. It gets passed to atoi() so everything after the number is - essentially a comment and need not be translated. */ + essentially a comment and need not be translated. Either key and + uid are both NULL, or neither are NULL. */ const char * uid_trust_string_fixed(PKT_public_key *key,PKT_user_id *uid) { if(!key && !uid) return _("10 translator see trustdb.c:uid_trust_string_fixed"); - else if(uid->is_revoked) + else if(uid->is_revoked || key->is_revoked) return _("[ revoked]"); else if(uid->is_expired) return _("[ expired]"); - else if(key) + else switch(get_validity(key,uid)&TRUST_MASK) { case TRUST_UNKNOWN: return _("[ unknown]"); |