diff options
| author | David Shaw <[email protected]> | 2006-02-22 20:20:58 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2006-02-22 20:20:58 +0000 |
| commit | 477defdb1b5a8e7c2f4be8dace9576203a4650ec (patch) | |
| tree | 43ca4e0810f674549449207a61ceaa2771eec2b6 /g10/mainproc.c | |
| parent | * options.h, keydb.h, g10.c (main), getkey.c (parse_auto_key_locate): (diff) | |
| download | gnupg-477defdb1b5a8e7c2f4be8dace9576203a4650ec.tar.gz gnupg-477defdb1b5a8e7c2f4be8dace9576203a4650ec.zip | |
* options.h, gpg.c (main), mainproc.c (check_sig_and_print), keyserver.c
(keyserver_opts): Rename auto-pka-retrieve to honor-pka-record to be
consistent with honor-keyserver-url.
Diffstat (limited to 'g10/mainproc.c')
| -rw-r--r-- | g10/mainproc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/g10/mainproc.c b/g10/mainproc.c index afe4ee1ed..839d94c10 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -1530,11 +1530,11 @@ check_sig_and_print( CTX c, KBNODE node ) } } - /* If the preferred keyserver thing above didn't work, our second try is to use the URI from a DNS PKA record. */ if ( rc == G10ERR_NO_PUBKEY - && (opt.keyserver_options.options&KEYSERVER_AUTO_PKA_RETRIEVE)) + && opt.keyserver_options.options&KEYSERVER_AUTO_KEY_RETRIEVE + && opt.keyserver_options.options&KEYSERVER_HONOR_PKA_RECORD) { const char *uri = pka_uri_from_sig (sig); @@ -1558,12 +1558,11 @@ check_sig_and_print( CTX c, KBNODE node ) } } - /* If the preferred keyserver thing above didn't work and we got no information from the DNS PKA, this is a third try. */ if( rc == G10ERR_NO_PUBKEY && opt.keyserver - && (opt.keyserver_options.options&KEYSERVER_AUTO_KEY_RETRIEVE)) + && opt.keyserver_options.options&KEYSERVER_AUTO_KEY_RETRIEVE) { int res; |