diff options
author | David Shaw <dshaw@jabberwocky.com> | 2008-09-04 18:54:58 +0200 |
---|---|---|
committer | David Shaw <dshaw@jabberwocky.com> | 2008-09-04 18:54:58 +0200 |
commit | 1377e1fe8db603c1dfbd4c926e3ca4c1e332b265 (patch) | |
tree | cf43bada3bab9d4e7d0e551215ac2825f2de7a37 /g10 | |
parent | Workaround for a mingw runtime bug. (diff) | |
download | gnupg2-1377e1fe8db603c1dfbd4c926e3ca4c1e332b265.tar.xz gnupg2-1377e1fe8db603c1dfbd4c926e3ca4c1e332b265.zip |
* keyserver.c (keyserver_import_cert): Allow keyserver URLs in
addition to full URLs in CERT records.
Diffstat (limited to 'g10')
-rw-r--r-- | g10/ChangeLog | 5 | ||||
-rw-r--r-- | g10/keyserver.c | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 6556ce2c7..3478257d5 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2008-09-04 David Shaw <dshaw@jabberwocky.com> + + * keyserver.c (keyserver_import_cert): Allow keyserver URLs in + addition to full URLs in CERT records. + 2008-08-11 Werner Koch <wk@g10code.com> * keygen.c (ask_expire_interval): Check for time overflow of an diff --git a/g10/keyserver.c b/g10/keyserver.c index 920353387..a54f2d11c 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -2041,13 +2041,7 @@ keyserver_import_cert(const char *name,unsigned char **fpr,size_t *fpr_len) spec=parse_keyserver_uri(url,1,NULL,0); if(spec) { - strlist_t list=NULL; - - add_to_strlist(&list,url); - - rc=keyserver_fetch(list); - - free_strlist(list); + rc=keyserver_import_fprint(*fpr,*fpr_len,spec); free_keyserver_spec(spec); } } |