diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 6 | ||||
| -rw-r--r-- | g10/g10.c | 4 | ||||
| -rw-r--r-- | g10/mainproc.c | 2 | ||||
| -rw-r--r-- | g10/options.h | 1 |
4 files changed, 12 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 618fb7a04..f684a2075 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,9 @@ +Fri Jun 9 10:09:52 CEST 2000 Werner Koch <[email protected]> + + * g10.c: New options --no-auto-key-retrieve + * options.h (auto_key_retrieve): New. + * mainproc.c (check_sig_and_print): Implemented that. + Wed Jun 7 19:19:09 CEST 2000 Werner Koch <[email protected]> * sig-check.c (do_check): Use EMULATE_MDENCODE also on v4 paclets. @@ -186,6 +186,7 @@ enum cmd_and_opt_values { aNull = 0, oListOnly, oIgnoreTimeConflict, oNoRandomSeedFile, + oNoAutoKeyRetrieve, oEmu3DESS2KBug, /* will be removed in 1.1 */ oEmuMDEncodeBug, aTest }; @@ -367,6 +368,7 @@ static ARGPARSE_OPTS opts[] = { { oListOnly, "list-only", 0, "@"}, { oIgnoreTimeConflict, "ignore-time-conflict", 0, "@" }, { oNoRandomSeedFile, "no-random-seed-file", 0, "@" }, + { oNoAutoKeyRetrieve, "no-auto-key-retrieve", 0, "@" }, { oEmu3DESS2KBug, "emulate-3des-s2k-bug", 0, "@"}, { oEmuMDEncodeBug, "emulate-md-encode-bug", 0, "@"}, {0} }; @@ -613,6 +615,7 @@ main( int argc, char **argv ) opt.marginals_needed = 3; opt.max_cert_depth = 5; opt.pgp2_workarounds = 1; + opt.auto_key_retrieve = 1; #ifdef __MINGW32__ opt.homedir = read_w32_registry_string( NULL, "Software\\GNU\\GnuPG", "HomeDir" ); #else @@ -913,6 +916,7 @@ main( int argc, char **argv ) case oListOnly: opt.list_only=1; break; case oIgnoreTimeConflict: opt.ignore_time_conflict = 1; break; case oNoRandomSeedFile: use_random_seed = 0; break; + case oNoAutoKeyRetrieve: opt.auto_key_retrieve = 0; break; default : pargs.err = configfp? 1:2; break; } diff --git a/g10/mainproc.c b/g10/mainproc.c index abfdf6bb6..99806313a 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -1068,7 +1068,7 @@ check_sig_and_print( CTX c, KBNODE node ) (int)strlen(tstr), tstr, astr? astr: "?", (ulong)sig->keyid[1] ); rc = do_check_sig(c, node, NULL ); - if( rc == G10ERR_NO_PUBKEY && opt.keyserver_name ) { + if( rc == G10ERR_NO_PUBKEY && opt.keyserver_name && opt.auto_key_retrieve) { if( !hkp_ask_import( sig->keyid ) ) rc = do_check_sig(c, node, NULL ); } diff --git a/g10/options.h b/g10/options.h index f5657f70f..5d80e6771 100644 --- a/g10/options.h +++ b/g10/options.h @@ -90,6 +90,7 @@ struct { int fast_list_mode; int ignore_time_conflict; int command_fd; + int auto_key_retrieve; } opt; |