diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 8 | ||||
| -rw-r--r-- | g10/g10.c | 3 | ||||
| -rw-r--r-- | g10/pkclist.c | 15 |
3 files changed, 17 insertions, 9 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 02a4f3910..8ae6963cc 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,11 @@ +2002-02-14 Werner Koch <[email protected]> + + * g10.c: New option --no-use-agent. + + * pkclist.c (check_signatures_trust): Always print the warning for + unknown and undefined trust. Removed the did_add cruft. Reported + by Janusz A. Urbanowicz. + 2002-02-11 David Shaw <[email protected]> * hkp.c (parse_hkp_index): Bug fix - properly handle user IDs with @@ -255,6 +255,7 @@ enum cmd_and_opt_values { aNull = 0, oAutoKeyRetrieve, oNoAutoKeyRetrieve, oUseAgent, + oNoUseAgent, oGpgAgentInfo, oMergeOnly, oTryAllSecrets, @@ -371,6 +372,7 @@ static ARGPARSE_OPTS opts[] = { { oDryRun, "dry-run", 0, N_("do not make any changes") }, /*{ oInteractive, "interactive", 0, N_("prompt before overwriting") }, */ { oUseAgent, "use-agent",0, N_("use the gpg-agent")}, + { oNoUseAgent, "no-use-agent",0, "@"}, { oGpgAgentInfo, "gpg-agent-info",2, "@"}, { oBatch, "batch", 0, N_("batch mode: never ask")}, { oAnswerYes, "yes", 0, N_("assume yes on most questions")}, @@ -971,6 +973,7 @@ main( int argc, char **argv ) not_implemented("use-agent"); #endif /* __riscos__ */ break; + case oNoUseAgent: opt.use_agent = 0; break; case oGpgAgentInfo: opt.gpg_agent_info = pargs.r.ret_str; break; case oAnswerYes: opt.answer_yes = 1; break; case oAnswerNo: opt.answer_no = 1; break; diff --git a/g10/pkclist.c b/g10/pkclist.c index a9b79815c..128ef5c65 100644 --- a/g10/pkclist.c +++ b/g10/pkclist.c @@ -527,7 +527,6 @@ check_signatures_trust( PKT_signature *sig ) { PKT_public_key *pk = m_alloc_clear( sizeof *pk ); unsigned int trustlevel; - int did_add = 0; int rc=0; if ( opt.always_trust) @@ -579,14 +578,12 @@ check_signatures_trust( PKT_signature *sig ) /* fall thru */ case TRUST_UNKNOWN: case TRUST_UNDEFINED: - if( did_add || opt.batch || opt.answer_no ) { - write_status( STATUS_TRUST_UNDEFINED ); - log_info(_("WARNING: This key is not certified with" - " a trusted signature!\n")); - log_info(_(" There is no indication that the " - "signature belongs to the owner.\n" )); - print_fingerprint (pk, NULL, 1); - } + write_status( STATUS_TRUST_UNDEFINED ); + log_info(_("WARNING: This key is not certified with" + " a trusted signature!\n")); + log_info(_(" There is no indication that the " + "signature belongs to the owner.\n" )); + print_fingerprint (pk, NULL, 1); break; case TRUST_NEVER: |