mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* pkclist.c (do_we_trust): Tweak language to refer to the "named
user" rather than "owner". Noted by Stefan Bellon. * trustdb.h, trustdb.c (trustdb_pending_check): New function to check if the trustdb needs a check. * import.c (import_keys_internal): Used here so we don't rebuild the trustdb if it is still clean. (import_one, chk_self_sigs): Only mark trustdb dirty if the key that is being imported has any sigs other than self-sigs. Suggested by Adrian von Bidder. * options.skel: Include the required '=' sign in the sample 'group' option. Noted by Stefan Bellon. * import.c (chk_self_sigs): Don't try and check a subkey as if it was a signature.
This commit is contained in:
parent
eb9607707e
commit
6a4bd944a8
6 changed files with 59 additions and 25 deletions
|
@ -493,25 +493,24 @@ do_we_trust( PKT_public_key *pk, unsigned int *trustlevel )
|
|||
/* fall thru */
|
||||
case TRUST_UNKNOWN:
|
||||
case TRUST_UNDEFINED:
|
||||
log_info(_("%08lX: There is no indication that this key "
|
||||
"really belongs to the owner\n"),
|
||||
(ulong)keyid_from_pk( pk, NULL) );
|
||||
log_info(_("%08lX: There is no assurance this key belongs "
|
||||
"to the named user\n"),(ulong)keyid_from_pk( pk, NULL) );
|
||||
return 0; /* no */
|
||||
|
||||
/* No way to get here? */
|
||||
case TRUST_NEVER:
|
||||
log_info(_("%08lX: We do NOT trust this key\n"),
|
||||
(ulong)keyid_from_pk( pk, NULL) );
|
||||
return 0; /* no */
|
||||
|
||||
case TRUST_MARGINAL:
|
||||
log_info(
|
||||
_("%08lX: It is not sure that this key really belongs to the owner\n"
|
||||
"but it is accepted anyway\n"), (ulong)keyid_from_pk( pk, NULL) );
|
||||
log_info(_("%08lX: There is limited assurance this key belongs "
|
||||
"to the named user\n"),(ulong)keyid_from_pk(pk,NULL));
|
||||
return 1; /* yes */
|
||||
|
||||
case TRUST_FULLY:
|
||||
if( opt.verbose )
|
||||
log_info(_("This key probably belongs to the owner\n"));
|
||||
log_info(_("This key probably belongs to the named user\n"));
|
||||
return 1; /* yes */
|
||||
|
||||
case TRUST_ULTIMATE:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue