diff options
| author | David Shaw <[email protected]> | 2005-07-27 01:24:57 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2005-07-27 01:24:57 +0000 |
| commit | efea9c3ce18b71588e6bcbd6a126c0b808e3953a (patch) | |
| tree | 32670737ba9b302388e4d8508816968196a32035 | |
| parent | * NEWS, configure.ac: Switch over to using curl or fake-curl by (diff) | |
| download | gnupg-efea9c3ce18b71588e6bcbd6a126c0b808e3953a.tar.gz gnupg-efea9c3ce18b71588e6bcbd6a126c0b808e3953a.zip | |
* keyserver.c (keyserver_typemap): Special-case LDAP since curl will
report that it can handle it, and we don't want it to.
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/keyserver.c | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 9b1f0336a..85aff8786 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2005-07-26 David Shaw <[email protected]> + + * 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 <[email protected]> * passphrase.c (agent_get_passphrase): Make sure to release the diff --git a/g10/keyserver.c b/g10/keyserver.c index 2ce03d41e..574a53414 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -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"; |