From 783ec6dbb2322594fb206b79f937e7d9aa440421 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Fri, 24 Dec 2004 19:51:02 +0000 Subject: [PATCH] * keyserver.c (keyserver_typemap): Only map HTTP and FTP if libcurl has specifically been selected to handle them. --- g10/ChangeLog | 5 +++++ g10/keyserver.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/g10/ChangeLog b/g10/ChangeLog index 3fda46d4c..69559f40d 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2004-12-24 David Shaw + + * keyserver.c (keyserver_typemap): Only map HTTP and FTP if + libcurl has specifically been selected to handle them. + 2004-12-22 David Shaw * options.h, keyserver.c (parse_keyserver_uri): Properly parse diff --git a/g10/keyserver.c b/g10/keyserver.c index 815e784a6..f9343980a 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -784,12 +784,14 @@ keyserver_typemap(const char *type) { if(strcmp(type,"ldaps")==0) return "ldap"; -#ifdef HAVE_LIBCURL +#ifdef FTP_VIA_LIBCURL else if(strcmp(type,"ftp")==0) return "curl"; +#endif +#ifdef HTTP_VIA_LIBCURL else if(strcmp(type,"http")==0) return "curl"; -#endif /* HAVE_LIBCURL */ +#endif else return type; }