diff options
| author | David Shaw <[email protected]> | 2004-03-19 23:15:27 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-03-19 23:15:27 +0000 |
| commit | 36a5e54e54d171f4caf07b004ea646045c52c9e0 (patch) | |
| tree | ec6fdea83b37d2a7e0a1cb24038f06f71bf0cbab /g10/trustdb.c | |
| parent | * mainproc.c (proc_pubkey_enc, print_pkenc_list, list_node): (diff) | |
| download | gnupg-36a5e54e54d171f4caf07b004ea646045c52c9e0.tar.gz gnupg-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 '')
| -rw-r--r-- | g10/trustdb.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/g10/trustdb.c b/g10/trustdb.c index 67f9211fd..5cb69ccfe 100644 --- a/g10/trustdb.c +++ b/g10/trustdb.c @@ -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)); |