security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-21 14:47:03 +01:00
Code Activity

* options.h, g10.c (main), keyserver.c (keyserver_opts,

Browse Source 
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.
This commit is contained in:
David Shaw 2003-12-28 16:08:04 +00:00
parent a847d49133
commit 48238805b9
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
g10/ChangeLog
View File

@ -1,5 +1,11 @@
2003-12-28 David Shaw <dshaw@jabberwocky.com> 2003-12-28 David Shaw <dshaw@jabberwocky.com>
* 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 * keyserver.c (argsep): New variation on strsep that knows about
optional arguments. optional arguments.
(parse_keyserver_options): Use it here for optional arguments. (parse_keyserver_options): Use it here for optional arguments.

5
g10/g10.c
View File

@ -1983,11 +1983,10 @@ main( int argc, char **argv )
case oNoLiteral: opt.no_literal = 1; break; case oNoLiteral: opt.no_literal = 1; break;
case oSetFilesize: opt.set_filesize = pargs.r.ret_ulong; break; case oSetFilesize: opt.set_filesize = pargs.r.ret_ulong; break;
case oHonorHttpProxy: case oHonorHttpProxy:
opt.keyserver_options.honor_http_proxy = 1; add_to_strlist(&opt.keyserver_options.other,"http-proxy");
deprecated_warning(configname,configlineno, deprecated_warning(configname,configlineno,
"--honor-http-proxy", "--honor-http-proxy",
"--keyserver-options ", "--keyserver-options ","http-proxy");
"honor-http-proxy");
break; break;
case oFastListMode: opt.fast_list_mode = 1; break; case oFastListMode: opt.fast_list_mode = 1; break;
case oFixedListMode: opt.fixed_list_mode = 1; break; case oFixedListMode: opt.fixed_list_mode = 1; break;

4
g10/keyserver.c
View File

@ -63,8 +63,6 @@ struct kopts
{"include-disabled",1,&opt.keyserver_options.include_disabled}, {"include-disabled",1,&opt.keyserver_options.include_disabled},
{"include-subkeys",1,&opt.keyserver_options.include_subkeys}, {"include-subkeys",1,&opt.keyserver_options.include_subkeys},
{"keep-temp-files",0,&opt.keyserver_options.keep_temp_files}, {"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}, {"refresh-add-fake-v3-keyids",0,&opt.keyserver_options.fake_v3_keyids},
{"auto-key-retrieve",0,&opt.keyserver_options.auto_key_retrieve}, {"auto-key-retrieve",0,&opt.keyserver_options.auto_key_retrieve},
{"try-dns-srv",1,&opt.keyserver_options.try_dns_srv}, {"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", deprecated_warning(configname,configlineno,"x-broken-hkp",
"--keyserver-options ","broken-http-proxy"); "--keyserver-options ","broken-http-proxy");
opt.keyserver_scheme="hkp"; 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 else if(ascii_strcasecmp(opt.keyserver_scheme,"x-hkp")==0
|| ascii_strcasecmp(opt.keyserver_scheme,"http")==0) || ascii_strcasecmp(opt.keyserver_scheme,"http")==0)

2
g10/options.h
View File

@ -127,8 +127,6 @@ struct {
int include_revoked; int include_revoked;
int include_disabled; int include_disabled;
int include_subkeys; int include_subkeys;
int honor_http_proxy;
int broken_http_proxy;
int use_temp_files; int use_temp_files;
int keep_temp_files; int keep_temp_files;
int fake_v3_keyids; int fake_v3_keyids;