gnupg/g10 (ChangeLog keyserver.c)

[cvs user dshaw]

    Date: Saturday, January 22, 2005 @ 04:33:12
  Author: dshaw
    Path: /cvs/gnupg/gnupg/g10

Modified: ChangeLog keyserver.c

* keyserver.c (free_keyserver_spec): Fix small leak.
(keyserver_typemap): Map https if we are supporting it.


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


Index: gnupg/g10/ChangeLog
diff -u gnupg/g10/ChangeLog:1.684 gnupg/g10/ChangeLog:1.685
--- gnupg/g10/ChangeLog:1.684	Thu Jan 20 19:25:25 2005
+++ gnupg/g10/ChangeLog	Sat Jan 22 04:33:12 2005
@@ -1,3 +1,8 @@
+2005-01-21  David Shaw  <dshaw at 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 at g10code.com>
 
 	* cardglue.c (open_card): Issue new CARDCTRL(4) status.
Index: gnupg/g10/keyserver.c
diff -u gnupg/g10/keyserver.c:1.77 gnupg/g10/keyserver.c:1.78
--- gnupg/g10/keyserver.c:1.77	Thu Jan  6 17:23:47 2005
+++ gnupg/g10/keyserver.c	Sat Jan 22 04:33:12 2005
@@ -139,6 +139,8 @@
 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 @@
   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;
 }