diff options
| author | David Shaw <[email protected]> | 2002-12-27 23:46:51 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2002-12-27 23:46:51 +0000 |
| commit | 55eda4b4f8bef76c8de57cc5e0728825d9c6f3e6 (patch) | |
| tree | 6be960cd4ab859b7156524d8b1d39cc51c0819e7 /g10/getkey.c | |
| parent | * gpg.sgml: Clarify --no-permission-warning to note that the permission (diff) | |
| download | gnupg-55eda4b4f8bef76c8de57cc5e0728825d9c6f3e6.tar.gz gnupg-55eda4b4f8bef76c8de57cc5e0728825d9c6f3e6.zip | |
* keyserver.c (keyserver_refresh): Don't print the "refreshing..." line if
there are no keys to refresh or if there is no keyserver set.
* getkey.c (merge_selfsigs_main): Any valid user ID should make a key
valid, not just the last one. This also fixes Debian bug #174276.
Diffstat (limited to 'g10/getkey.c')
| -rw-r--r-- | g10/getkey.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/g10/getkey.c b/g10/getkey.c index 8df9af58a..abc8b2715 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -1499,7 +1499,10 @@ merge_selfsigs_main( KBNODE keyblock, int *r_revoked ) for(k=keyblock; k && k->pkt->pkttype != PKT_PUBLIC_SUBKEY; k = k->next ) { if ( k->pkt->pkttype == PKT_USER_ID ) { if ( uidnode && signode ) + { fixup_uidnode ( uidnode, signode, keytimestamp ); + pk->is_valid=1; + } uidnode = k; signode = NULL; if ( sigdate > uiddate ) |