diff options
| author | David Shaw <dshaw@jabberwocky.com> | 2004-03-20 00:15:27 +0100 |
|---|---|---|
| committer | David Shaw <dshaw@jabberwocky.com> | 2004-03-20 00:15:27 +0100 |
| commit | 36a5e54e54d171f4caf07b004ea646045c52c9e0 (patch) | |
| tree | ec6fdea83b37d2a7e0a1cb24038f06f71bf0cbab /g10/import.c | |
| parent | * mainproc.c (proc_pubkey_enc, print_pkenc_list, list_node): (diff) | |
| download | gnupg2-36a5e54e54d171f4caf07b004ea646045c52c9e0.tar.xz gnupg2-36a5e54e54d171f4caf07b004ea646045c52c9e0.zip | |
* trustdb.c (update_min_ownertrust, validate_keys): Do not use keystr
functions in log_debug.
* import.c (import_one): Try and collapse user IDs when importing a key
for the first time.
* keyedit.c (menu_addrevoker): Allow appointing a subkey as a designated
revoker if the user forces it via keyid!, so long as the subkey can
certify. Also use the proper date string when prompting for confirmation.
* g10.c (main): Maintain ordering of multiple Comment lines. Requested by
Peter Hyman.
Diffstat (limited to 'g10/import.c')
| -rw-r--r-- | g10/import.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/g10/import.c b/g10/import.c index b5a933937..c1110bff6 100644 --- a/g10/import.c +++ b/g10/import.c @@ -758,6 +758,9 @@ import_one( const char *fname, KBNODE keyblock, } if( opt.verbose > 1 ) log_info (_("writing to `%s'\n"), keydb_get_resource_name (hd) ); + + collapse_uids(&keyblock); + rc = keydb_insert_keyblock (hd, keyblock ); if (rc) log_error (_("error writing keyring `%s': %s\n"), |