aboutsummaryrefslogtreecommitdiffstats
path: root/g10/pkclist.c
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2002-12-13 21:10:53 +0000
committerDavid Shaw <[email protected]>2002-12-13 21:10:53 +0000
commit6a4bd944a8a727ebafeae821228c22fe05f11316 (patch)
tree7b7c2bb00a9cd474456e149e78db237c022f5d8e /g10/pkclist.c
parent* tdbio.c (tdbio_read_record, tdbio_write_record): Compact the (diff)
downloadgnupg-6a4bd944a8a727ebafeae821228c22fe05f11316.tar.gz
gnupg-6a4bd944a8a727ebafeae821228c22fe05f11316.zip
* 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.
Diffstat (limited to 'g10/pkclist.c')
-rw-r--r--g10/pkclist.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/g10/pkclist.c b/g10/pkclist.c
index 3444870c0..9ed8ef3a4 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -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: