From de6d8313f6df32aaa151bee74e1db269ac1e0fed Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 2 Mar 2017 17:58:00 +0100 Subject: 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) : Return default keyserver. Signed-off-by: Werner Koch --- dirmngr/dirmngr.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'dirmngr/dirmngr.c') 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); -- cgit v1.2.3