diff options
| -rw-r--r-- | g10/ChangeLog | 6 | ||||
| -rw-r--r-- | g10/g10.c | 5 | ||||
| -rw-r--r-- | g10/keyserver.c | 4 | ||||
| -rw-r--r-- | g10/options.h | 2 |
4 files changed, 9 insertions, 8 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index a5d9b1cac..4e7fdf31d 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,11 @@ 2003-12-28 David Shaw <[email protected]> + * 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. + * keyserver.c (argsep): New variation on strsep that knows about optional arguments. (parse_keyserver_options): Use it here for optional arguments. @@ -1983,11 +1983,10 @@ main( int argc, char **argv ) case oNoLiteral: opt.no_literal = 1; break; case oSetFilesize: opt.set_filesize = pargs.r.ret_ulong; break; case oHonorHttpProxy: - opt.keyserver_options.honor_http_proxy = 1; + add_to_strlist(&opt.keyserver_options.other,"http-proxy"); deprecated_warning(configname,configlineno, "--honor-http-proxy", - "--keyserver-options ", - "honor-http-proxy"); + "--keyserver-options ","http-proxy"); break; case oFastListMode: opt.fast_list_mode = 1; break; case oFixedListMode: opt.fixed_list_mode = 1; break; 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) diff --git a/g10/options.h b/g10/options.h index 0832abf21..f359a6a2d 100644 --- a/g10/options.h +++ b/g10/options.h @@ -127,8 +127,6 @@ struct { int include_revoked; int include_disabled; int include_subkeys; - int honor_http_proxy; - int broken_http_proxy; int use_temp_files; int keep_temp_files; int fake_v3_keyids; |