summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMarcus Brinkmann <mb@g10code.com>2008-06-12 16:24:46 +0200
committerMarcus Brinkmann <mb@g10code.com>2008-06-12 16:24:46 +0200
commit04e965c7fc32ce8f2c883a7e19294eb34bb50534 (patch)
tree127dc5deee10efde7bdd6b7b34ece3b489936ec3 /tools
parentRemoved unused variable. (diff)
downloadgnupg2-04e965c7fc32ce8f2c883a7e19294eb34bb50534.tar.xz
gnupg2-04e965c7fc32ce8f2c883a7e19294eb34bb50534.zip
sm/
2008-06-12 Marcus Brinkmann <marcus@g10code.de> * gpgsm.h (struct keyserver_spec): New struct. (opt): Add member keyserver. * gpgsm.c (keyserver_list_free, parse_keyserver_line): New functions. (main): Implement --keyserver option. * call-dirmngr.c (prepare_dirmngr): Send LDAPSERVER commands. tools/ 2008-06-12 Marcus Brinkmann <marcus@g10code.de> * gpgconf-comp.c (gc_options_gpgsm): Add option keyserver.
Diffstat (limited to 'tools')
-rw-r--r--tools/ChangeLog4
-rw-r--r--tools/gpgconf-comp.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/tools/ChangeLog b/tools/ChangeLog
index 6675e6157..9981212c7 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-12 Marcus Brinkmann <marcus@g10code.de>
+
+ * gpgconf-comp.c (gc_options_gpgsm): Add option keyserver.
+
2008-05-26 Marcus Brinkmann <marcus@g10code.de>
* gpgconf-comp.c: Replace pathname by filename everywhere.
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 5e7dd77f1..5cda2f118 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -732,6 +732,9 @@ static gc_option_t gc_options_gpgsm[] =
{ "p12-charset", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
"gnupg", N_("|NAME|use encoding NAME for PKCS#12 passphrases"),
GC_ARG_TYPE_STRING, GC_BACKEND_GPGSM },
+ { "keyserver", GC_OPT_FLAG_LIST, GC_LEVEL_BASIC,
+ "gnupg", N_("|SPEC|use this keyserver to lookup keys"),
+ GC_ARG_TYPE_STRING, GC_BACKEND_GPGSM },
{ "Debug",
GC_OPT_FLAG_GROUP, GC_LEVEL_ADVANCED,