1
0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-21 14:47:03 +01:00

* keyserver.c (parse_keyserver_uri, add_canonical_option): Always append

options to the list, as ordering may be significant to the user.
This commit is contained in:
David Shaw 2006-02-23 20:54:30 +00:00
parent 1736866b5b
commit 09e3b78ea2
2 changed files with 7 additions and 3 deletions

View 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.

View 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)
{