mirror of
git://git.gnupg.org/gnupg.git
synced 2024-11-10 21:38:50 +01:00
* keyserver.c (parse_keyserver_uri): Include the scheme in the uri
even when we've assumed "hkp" when there was no scheme.
This commit is contained in:
parent
ca6c57bc8a
commit
8a1bd087fc
@ -1,3 +1,8 @@
|
||||
2006-02-20 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* keyserver.c (parse_keyserver_uri): Include the scheme in the uri
|
||||
even when we've assumed "hkp" when there was no scheme.
|
||||
|
||||
2006-02-14 Werner Koch <wk@gnupg.org>
|
||||
|
||||
* verify.c (verify_signatures): Print warning also for NO_DATA.
|
||||
|
@ -215,8 +215,6 @@ parse_keyserver_uri(const char *uri,int require_scheme,
|
||||
|
||||
keyserver=xmalloc_clear(sizeof(struct keyserver_spec));
|
||||
|
||||
keyserver->uri=xstrdup(uri);
|
||||
|
||||
/* Get the scheme */
|
||||
|
||||
for(idx=uri,count=0;*idx && *idx!=':';idx++)
|
||||
@ -247,11 +245,18 @@ parse_keyserver_uri(const char *uri,int require_scheme,
|
||||
/* Assume HKP if there is no scheme */
|
||||
assume_hkp=1;
|
||||
keyserver->scheme=xstrdup("hkp");
|
||||
|
||||
keyserver->uri=xmalloc(strlen(keyserver->scheme)+3+strlen(uri)+1);
|
||||
strcpy(keyserver->uri,keyserver->scheme);
|
||||
strcat(keyserver->uri,"://");
|
||||
strcat(keyserver->uri,uri);
|
||||
}
|
||||
else
|
||||
{
|
||||
int i;
|
||||
|
||||
keyserver->uri=xstrdup(uri);
|
||||
|
||||
keyserver->scheme=xmalloc(count+1);
|
||||
|
||||
/* Force to lowercase */
|
||||
|
Loading…
Reference in New Issue
Block a user