diff options
| author | David Shaw <[email protected]> | 2003-12-28 16:08:04 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-12-28 16:08:04 +0000 |
| commit | 48238805b9a767c2ecbfa36575520cc3cebd8940 (patch) | |
| tree | 6835e5d5eae150e2ad2634e06050789f38b745ba /g10/keyserver.c | |
| parent | * http.h: Pass the http proxy from outside rather than pulling it from the (diff) | |
| download | gnupg-48238805b9a767c2ecbfa36575520cc3cebd8940.tar.gz gnupg-48238805b9a767c2ecbfa36575520cc3cebd8940.zip | |
* options.h, g10.c (main), keyserver.c (keyserver_opts,
parse_keyserver_uri): honor-http-proxy is no longer an option since we can
do the same thing with http-proxy with no arguments. Also remove
broken-http-proxy since it can be better handled in the HTTP helper.
Diffstat (limited to '')
| -rw-r--r-- | g10/keyserver.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/g10/keyserver.c b/g10/keyserver.c index 18746f7f3..d7843b271 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -63,8 +63,6 @@ struct kopts {"include-disabled",1,&opt.keyserver_options.include_disabled}, {"include-subkeys",1,&opt.keyserver_options.include_subkeys}, {"keep-temp-files",0,&opt.keyserver_options.keep_temp_files}, - {"honor-http-proxy",1,&opt.keyserver_options.honor_http_proxy}, - {"broken-http-proxy",1,&opt.keyserver_options.broken_http_proxy}, {"refresh-add-fake-v3-keyids",0,&opt.keyserver_options.fake_v3_keyids}, {"auto-key-retrieve",0,&opt.keyserver_options.auto_key_retrieve}, {"try-dns-srv",1,&opt.keyserver_options.try_dns_srv}, @@ -242,7 +240,7 @@ parse_keyserver_uri(char *uri,const char *configname,unsigned int configlineno) deprecated_warning(configname,configlineno,"x-broken-hkp", "--keyserver-options ","broken-http-proxy"); opt.keyserver_scheme="hkp"; - opt.keyserver_options.broken_http_proxy=1; + add_to_strlist(&opt.keyserver_options.other,"broken-http-proxy"); } else if(ascii_strcasecmp(opt.keyserver_scheme,"x-hkp")==0 || ascii_strcasecmp(opt.keyserver_scheme,"http")==0) |