* keyserver.c (keyserver_typemap): Special-case LDAP since curl will
authorDavid Shaw <dshaw@jabberwocky.com>
Wed, 27 Jul 2005 01:24:57 +0000 (01:24 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Wed, 27 Jul 2005 01:24:57 +0000 (01:24 +0000)
report that it can handle it, and we don't want it to.

g10/ChangeLog
g10/keyserver.c

index 9b1f033..85aff87 100644 (file)
@@ -1,3 +1,8 @@
+2005-07-26  David Shaw  <dshaw@jabberwocky.com>
+
+       * keyserver.c (keyserver_typemap): Special-case LDAP since curl
+       will report that it can handle it, and we don't want it to.
+
 2005-07-26  Werner Koch  <wk@g10code.com>
 
        * passphrase.c (agent_get_passphrase): Make sure to release the
index 2ce03d4..574a534 100644 (file)
@@ -860,7 +860,9 @@ curl_can_handle(const char *scheme)
 static const char *
 keyserver_typemap(const char *type)
 {
-  if(strcmp(type,"ldaps")==0)
+  if(strcmp(type,"ldap")==0)
+    return "ldap";
+  else if(strcmp(type,"ldaps")==0)
     return "ldap";
   else if(curl_can_handle(type))
     return "curl";