security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-03 16:53:03 +01:00
Code Activity

* keyserver.c (keyserver_typemap): Only map HTTP and FTP if libcurl has

Browse Source 
specifically been selected to handle them.
This commit is contained in:
David Shaw 2004-12-24 19:51:02 +00:00
parent d341143cd7
commit 783ec6dbb2
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/ChangeLog
View File

@ -1,3 +1,8 @@
2004-12-24 David Shaw <dshaw@jabberwocky.com>
* keyserver.c (keyserver_typemap): Only map HTTP and FTP if
libcurl has specifically been selected to handle them.
2004-12-22 David Shaw <dshaw@jabberwocky.com> 2004-12-22 David Shaw <dshaw@jabberwocky.com>
* options.h, keyserver.c (parse_keyserver_uri): Properly parse * options.h, keyserver.c (parse_keyserver_uri): Properly parse

6
g10/keyserver.c
View File

@ -784,12 +784,14 @@ keyserver_typemap(const char *type)
{ {
if(strcmp(type,"ldaps")==0) if(strcmp(type,"ldaps")==0)
return "ldap"; return "ldap";
#ifdef HAVE_LIBCURL #ifdef FTP_VIA_LIBCURL
else if(strcmp(type,"ftp")==0) else if(strcmp(type,"ftp")==0)
return "curl"; return "curl";
#endif
#ifdef HTTP_VIA_LIBCURL
else if(strcmp(type,"http")==0) else if(strcmp(type,"http")==0)
return "curl"; return "curl";
#endif /* HAVE_LIBCURL */ #endif
else else
return type; return type;
} }