* keyserver.c (parse_keyserver_uri, add_canonical_option): Always append
authorDavid Shaw <dshaw@jabberwocky.com>
Thu, 23 Feb 2006 20:54:30 +0000 (20:54 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Thu, 23 Feb 2006 20:54:30 +0000 (20:54 +0000)
options to the list, as ordering may be significant to the user.

g10/ChangeLog
g10/keyserver.c

index 8a87e1a..ca69c50 100644 (file)
@@ -1,5 +1,9 @@
 2006-02-23  David Shaw  <dshaw@jabberwocky.com>
 
+       * keyserver.c (parse_keyserver_uri, add_canonical_option): Always
+       append options to the list, as ordering may be significant to the
+       user.
+
        * gpg.c (add_notation_data): Fix reversed logic for isascii check
        when adding notations.  Noted by Christian Biere.
 
index 4d51f91..bc49d1b 100644 (file)
@@ -118,11 +118,11 @@ add_canonical_option(char *option,STRLIST *list)
       strcpy(joined,option);
       strcat(joined,"=");
       strcat(joined,arg);
-      add_to_strlist(list,joined);
+      append_to_strlist(list,joined);
       xfree(joined);
     }
   else
-    add_to_strlist(list,option);
+    append_to_strlist(list,option);
 }
 
 int
@@ -294,7 +294,7 @@ parse_keyserver_uri(const char *string,int require_scheme,
                         "--keyserver-options ","broken-http-proxy");
       xfree(keyserver->scheme);
       keyserver->scheme=xstrdup("hkp");
-      add_to_strlist(&opt.keyserver_options.other,"broken-http-proxy");
+      append_to_strlist(&opt.keyserver_options.other,"broken-http-proxy");
     }
   else if(ascii_strcasecmp(keyserver->scheme,"x-hkp")==0)
     {