aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2005-01-22 03:33:12 +0000
committerDavid Shaw <[email protected]>2005-01-22 03:33:12 +0000
commit625806b6aef4a75d5ae693390ed90196a903858e (patch)
tree6d88578883004b675a1992c576b1345e41a02632
parent* gpgkeys_ldap.c (main): Add "check-cert" option to disable SSL (diff)
downloadgnupg-625806b6aef4a75d5ae693390ed90196a903858e.tar.gz
gnupg-625806b6aef4a75d5ae693390ed90196a903858e.zip
* keyserver.c (free_keyserver_spec): Fix small leak.
(keyserver_typemap): Map https if we are supporting it.
-rw-r--r--g10/ChangeLog5
-rw-r--r--g10/keyserver.c6
2 files changed, 11 insertions, 0 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 39e816cf7..68f96b0fd 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-21 David Shaw <[email protected]>
+
+ * keyserver.c (free_keyserver_spec): Fix small leak.
+ (keyserver_typemap): Map https if we are supporting it.
+
2005-01-20 Werner Koch <[email protected]>
* cardglue.c (open_card): Issue new CARDCTRL(4) status.
diff --git a/g10/keyserver.c b/g10/keyserver.c
index 735b7ebe1..d808bf5be 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -139,6 +139,8 @@ void
free_keyserver_spec(struct keyserver_spec *keyserver)
{
m_free(keyserver->uri);
+ m_free(keyserver->scheme);
+ m_free(keyserver->auth);
m_free(keyserver->host);
m_free(keyserver->port);
m_free(keyserver->path);
@@ -792,6 +794,10 @@ keyserver_typemap(const char *type)
else if(strcmp(type,"http")==0)
return "curl";
#endif
+#ifdef HTTPS_VIA_LIBCURL
+ else if(strcmp(type,"https")==0)
+ return "curl";
+#endif
else
return type;
}