summaryrefslogtreecommitdiffstats
path: root/dirmngr/dirmngr.h
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2015-10-05 17:44:20 +0200
committerWerner Koch <wk@gnupg.org>2015-10-05 17:44:20 +0200
commita48e6de603c3a312f02b1b5fdb813032eeae9074 (patch)
tree06e8dcee38c0cdf64ac914d430a4bcde0b4baca6 /dirmngr/dirmngr.h
parentdirmngr: Make clear that --use-tor is not yet ready for use. (diff)
downloadgnupg2-a48e6de603c3a312f02b1b5fdb813032eeae9074.tar.xz
gnupg2-a48e6de603c3a312f02b1b5fdb813032eeae9074.zip
dirmngr: Add option --keyserver.
* dirmngr/dirmngr.c (oKeyServer): New. (opts): Add "keyserver". (parse_rereadable_options): Parse that options (main): Add option to the gpgconf list. * dirmngr/dirmngr.h (opt): Add field "keyserver". * dirmngr/server.c (ensure_keyserver): New. (make_keyserver_item): New. Factored out from (cmd_keyserver): here. Call ensure_keyserver. (cmd_ks_search): Call ensure_keyserver. (cmd_ks_get): Ditto. (cmd_ks_fetch): Ditto. (cmd_ks_put): Ditto. -- This option specifies the keyserver to be used if the client does not set another keyserver. We want to fade out the use of --keyserver in gpg.conf in favor of specifying it here. Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'dirmngr/dirmngr.h')
-rw-r--r--dirmngr/dirmngr.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/dirmngr/dirmngr.h b/dirmngr/dirmngr.h
index a2db62755..b2b94f9c8 100644
--- a/dirmngr/dirmngr.h
+++ b/dirmngr/dirmngr.h
@@ -130,6 +130,8 @@ struct
considered valid after thisUpdate. */
unsigned int ocsp_current_period; /* Seconds a response is considered
current after nextUpdate. */
+
+ char *keyserver; /* Malloced string with the default keyserver. */
} opt;