gnupg/g10 (ChangeLog keyserver.c)

[cvs user dshaw]

    Date: Friday, December 24, 2004 @ 20:51:02
  Author: dshaw
    Path: /cvs/gnupg/gnupg/g10

Modified: ChangeLog keyserver.c

* keyserver.c (keyserver_typemap): Only map HTTP and FTP if libcurl has
specifically been selected to handle them.


-------------+
 ChangeLog   |    5 +++++
 keyserver.c |    6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)


Index: gnupg/g10/ChangeLog
diff -u gnupg/g10/ChangeLog:1.671 gnupg/g10/ChangeLog:1.672
--- gnupg/g10/ChangeLog:1.671	Wed Dec 22 19:09:41 2004
+++ gnupg/g10/ChangeLog	Fri Dec 24 20:51:02 2004
@@ -1,3 +1,8 @@
+2004-12-24  David Shaw  <dshaw at 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 at jabberwocky.com>
 
 	* options.h, keyserver.c (parse_keyserver_uri): Properly parse
Index: gnupg/g10/keyserver.c
diff -u gnupg/g10/keyserver.c:1.75 gnupg/g10/keyserver.c:1.76
--- gnupg/g10/keyserver.c:1.75	Wed Dec 22 19:09:41 2004
+++ gnupg/g10/keyserver.c	Fri Dec 24 20:51:02 2004
@@ -784,12 +784,14 @@
 {
   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;
 }