diff options
| author | David Shaw <[email protected]> | 2003-05-31 04:06:06 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-05-31 04:06:06 +0000 |
| commit | 9390fe676bbd619f37d147c86651f6f30a67fb9b (patch) | |
| tree | 3f70cf87ffdc4f4dba5493bd22a175de32f528d6 /g10/getkey.c | |
| parent | * gpgkeys_hkp.c, gpgkeys_ldap.c: #include <getopt.h> if it is available. (diff) | |
| download | gnupg-9390fe676bbd619f37d147c86651f6f30a67fb9b.tar.gz gnupg-9390fe676bbd619f37d147c86651f6f30a67fb9b.zip | |
* keylist.c (list_one): Don't show the keyring filename when in
--with-colons mode. Actually translate "Keyring" string.
* mainproc.c (proc_tree): We can't currently handle multiple signatures of
different classes or digests (we'd pretty much have to run a different
hash context for each), but if they are all the same, make an exception.
This is Debian bug #194292.
* sig-check.c (check_key_signature2): Make string translatable.
* packet.h, getkey.c (fixup_uidnode): Mark real primary uids differently
than assumed primaries.
* keyedit.c (no_primary_warning): Use the differently marked primaries
here in a new function to warn when an --edit-key command might rearrange
the self-sig dates enough to change which uid is primary. (menu_expire,
menu_set_preferences): Use no_primary_warning() here.
* Makefile.am: Use @DLLIBS@ for -ldl.
Diffstat (limited to 'g10/getkey.c')
| -rw-r--r-- | g10/getkey.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/getkey.c b/g10/getkey.c index 122d17f26..1944c2a8d 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -1273,7 +1273,7 @@ fixup_uidnode ( KBNODE uidnode, KBNODE signode, u32 keycreated ) uid->is_primary = 0; p = parse_sig_subpkt ( sig->hashed, SIGSUBPKT_PRIMARY_UID, NULL ); if ( p && *p ) - uid->is_primary = 1; + uid->is_primary = 2; /* We could also query this from the unhashed area if it is not in * the hased area and then later try to decide which is the better * there should be no security problem with this. |