mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* 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.
This commit is contained in:
parent
ba3f9044d3
commit
36a5e54e54
5 changed files with 29 additions and 7 deletions
|
@ -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"),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue