mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +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
|
@ -797,8 +797,9 @@ update_min_ownertrust (u32 *kid, unsigned int new_trust )
|
|||
if (!rc)
|
||||
{
|
||||
if (DBG_TRUST)
|
||||
log_debug ("key %s: update min_ownertrust from %u to %u\n",
|
||||
keystr(kid),(unsigned int)rec.r.trust.min_ownertrust,
|
||||
log_debug ("key %08lX%08lX: update min_ownertrust from %u to %u\n",
|
||||
(ulong)kid[0],(ulong)kid[1],
|
||||
(unsigned int)rec.r.trust.min_ownertrust,
|
||||
new_trust );
|
||||
if (rec.r.trust.min_ownertrust != new_trust)
|
||||
{
|
||||
|
@ -1985,9 +1986,9 @@ validate_keys (int interactive)
|
|||
if(k->ownertrust<min)
|
||||
{
|
||||
if(DBG_TRUST)
|
||||
log_debug("key %s:"
|
||||
log_debug("key %08lX%08lX:"
|
||||
" overriding ownertrust \"%s\" with \"%s\"\n",
|
||||
keystr(k->kid),
|
||||
(ulong)k->kid[0],(ulong)k->kid[1],
|
||||
trust_value_to_string(k->ownertrust),
|
||||
trust_value_to_string(min));
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue