aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2005-03-09 10:11:14 +0000
committerWerner Koch <[email protected]>2005-03-09 10:11:14 +0000
commitb16d30910ae2c79400d085d8626ed2b25bfe3961 (patch)
treeaa3b234b1278dfa7a0eef9aebe39cb1b87b69fcc
parent* acinclude.m4 (GNUPG_PTH_VERSION_CHECK): Accidently used (diff)
downloadgnupg-b16d30910ae2c79400d085d8626ed2b25bfe3961.tar.gz
gnupg-b16d30910ae2c79400d085d8626ed2b25bfe3961.zip
Add honor-http-proxy.
Diffstat (limited to '')
-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 4d520cfca..e39dd3b04 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-09 Werner Koch <[email protected]>
+
+ * gpgconf-comp.c <dirmngr>: Add honor-http-proxy.
+
2005-02-25 Werner Koch <[email protected]>
* no-libgcrypt.c (gcry_strdup): New.
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index e4758c1e6..dd35d3701 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -746,6 +746,9 @@ static gc_option_t gc_options_dirmngr[] =
{ "http-proxy", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
"dirmngr", "|URL|redirect all HTTP requests to URL",
GC_ARG_TYPE_STRING, GC_BACKEND_DIRMNGR },
+ { "honor-http-proxy", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
+ "dirmngr", N_("use system's HTTP proxy setting"),
+ GC_ARG_TYPE_STRING, GC_BACKEND_DIRMNGR },
{ "LDAP",
GC_OPT_FLAG_GROUP, GC_LEVEL_BASIC,