diff options
| author | Werner Koch <[email protected]> | 2017-03-02 16:58:00 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-03-02 16:58:58 +0000 |
| commit | de6d8313f6df32aaa151bee74e1db269ac1e0fed (patch) | |
| tree | 676c6d8deb0a50597f8defa7bd518b5151ad518d /dirmngr/dirmngr.c | |
| parent | gpg: Always initialize the trust db when generating keys. (diff) | |
| download | gnupg-de6d8313f6df32aaa151bee74e1db269ac1e0fed.tar.gz gnupg-de6d8313f6df32aaa151bee74e1db269ac1e0fed.zip | |
dirmngr: Let --gpgconf-list return the default keyserver.
* dirmngr/misc.c (get_default_keyserver): New.
* dirmngr/http.c: Include misc.h
(http_session_new): Use get_default_keyserver instead of hardwired
"hkps.pool.sks-keyservers.net".
* dirmngr/http-ntbtls.c (gnupg_http_tls_verify_cb): Ditto.
* dirmngr/dirmngr.c (main) <aGPGCongList>: Return default keyserver.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'dirmngr/dirmngr.c')
| -rw-r--r-- | dirmngr/dirmngr.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c index c877a9b7d..75e852338 100644 --- a/dirmngr/dirmngr.c +++ b/dirmngr/dirmngr.c @@ -1454,7 +1454,13 @@ main (int argc, char **argv) es_printf ("ignore-ocsp-servic-url:%lu:\n", flags | GC_OPT_FLAG_NONE); es_printf ("use-tor:%lu:\n", flags | GC_OPT_FLAG_NONE); - es_printf ("keyserver:%lu:\n", flags | GC_OPT_FLAG_NONE); + + filename_esc = percent_escape (get_default_keyserver (0), NULL); + es_printf ("keyserver:%lu:\"%s:\n", flags | GC_OPT_FLAG_DEFAULT, + filename_esc); + xfree (filename_esc); + + es_printf ("nameserver:%lu:\n", flags | GC_OPT_FLAG_NONE); es_printf ("resolver-timeout:%lu:%u\n", flags | GC_OPT_FLAG_DEFAULT, 0); |