[svn] GnuPG - r4023 - trunk/g10

[svn author dshaw]

Author: dshaw
Date: 2006-02-23 21:54:30 +0100 (Thu, 23 Feb 2006)
New Revision: 4023

Modified:
   trunk/g10/ChangeLog
   trunk/g10/keyserver.c
Log:
* keyserver.c (parse_keyserver_uri, add_canonical_option): Always append
options to the list, as ordering may be significant to the user.


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2006-02-23 19:52:20 UTC (rev 4022)
+++ trunk/g10/ChangeLog	2006-02-23 20:54:30 UTC (rev 4023)
@@ -1,5 +1,9 @@
 2006-02-23  David Shaw  <dshaw at 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.
 

Modified: trunk/g10/keyserver.c
===================================================================
--- trunk/g10/keyserver.c	2006-02-23 19:52:20 UTC (rev 4022)
+++ trunk/g10/keyserver.c	2006-02-23 20:54:30 UTC (rev 4023)
@@ -118,11 +118,11 @@
       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 @@
 			 "--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)
     {