From 09e3b78ea26246ad7d180030b41b50bb09d543a0 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Thu, 23 Feb 2006 20:54:30 +0000 Subject: * keyserver.c (parse_keyserver_uri, add_canonical_option): Always append options to the list, as ordering may be significant to the user. --- g10/ChangeLog | 4 ++++ g10/keyserver.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/g10/ChangeLog b/g10/ChangeLog index 8a87e1a16..ca69c50eb 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,9 @@ 2006-02-23 David Shaw + * 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. diff --git a/g10/keyserver.c b/g10/keyserver.c index 4d51f91bc..bc49d1b2d 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -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) { -- cgit v1.2.3