* options.h, g10.c (main), keyserver.c (keyserver_opts,
authorDavid Shaw <dshaw@jabberwocky.com>
Sun, 28 Dec 2003 16:08:04 +0000 (16:08 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Sun, 28 Dec 2003 16:08:04 +0000 (16:08 +0000)
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.

g10/ChangeLog
g10/g10.c
g10/keyserver.c
g10/options.h

index a5d9b1c..4e7fdf3 100644 (file)
@@ -1,5 +1,11 @@
 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
        optional arguments.
        (parse_keyserver_options): Use it here for optional arguments.
index 5315062..60c5267 100644 (file)
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -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;
index 18746f7..d7843b2 100644 (file)
@@ -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)
index 0832abf..f359a6a 100644 (file)
@@ -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;