* keyserver.c (free_keyserver_spec): Fix small leak.
authorDavid Shaw <dshaw@jabberwocky.com>
Sat, 22 Jan 2005 03:33:12 +0000 (03:33 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Sat, 22 Jan 2005 03:33:12 +0000 (03:33 +0000)
(keyserver_typemap): Map https if we are supporting it.

g10/ChangeLog
g10/keyserver.c

index 39e816c..68f96b0 100644 (file)
@@ -1,3 +1,8 @@
+2005-01-21  David Shaw  <dshaw@grover.jabberwocky.com>
+
+       * keyserver.c (free_keyserver_spec): Fix small leak.
+       (keyserver_typemap): Map https if we are supporting it.
+
 2005-01-20  Werner Koch  <wk@g10code.com>
 
        * cardglue.c (open_card): Issue new CARDCTRL(4) status.
 2005-01-20  Werner Koch  <wk@g10code.com>
 
        * cardglue.c (open_card): Issue new CARDCTRL(4) status.
index 735b7eb..d808bf5 100644 (file)
@@ -139,6 +139,8 @@ void
 free_keyserver_spec(struct keyserver_spec *keyserver)
 {
   m_free(keyserver->uri);
 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);
   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
   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;
 }
   else
     return type;
 }