[svn] GnuPG - r4484 - branches/STABLE-BRANCH-1-4/keyserver

[svn author dshaw]

Author: dshaw
Date: 2007-04-17 00:47:20 +0200 (Tue, 17 Apr 2007)
New Revision: 4484

Modified:
   branches/STABLE-BRANCH-1-4/keyserver/ChangeLog
   branches/STABLE-BRANCH-1-4/keyserver/Makefile.am
   branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_hkp.c
Log:
* gpgkeys_hkp.c (main): Show curl or fake-curl version string.

* Makefile.am: Link with libcompat.a for ascii_str(n)casecmp.


Modified: branches/STABLE-BRANCH-1-4/keyserver/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/keyserver/ChangeLog	2007-04-16 22:43:29 UTC (rev 4483)
+++ branches/STABLE-BRANCH-1-4/keyserver/ChangeLog	2007-04-16 22:47:20 UTC (rev 4484)
@@ -1,5 +1,9 @@
 2007-04-16  David Shaw  <dshaw at jabberwocky.com>
 
+	* gpgkeys_hkp.c (main): Show curl or fake-curl version string.
+
+	* Makefile.am: Link with libcompat.a for ascii_str(n)casecmp.
+
 	* gpgkeys_curl.c, gpgkeys_ldap.c, gpgkeys_hkp.c, ksutil.c: Rename
 	all str(n)casecmp to ascii_str(n)casecmp.  We want the
 	locale-independent ones here.

Modified: branches/STABLE-BRANCH-1-4/keyserver/Makefile.am
===================================================================
--- branches/STABLE-BRANCH-1-4/keyserver/Makefile.am	2007-04-16 22:43:29 UTC (rev 4483)
+++ branches/STABLE-BRANCH-1-4/keyserver/Makefile.am	2007-04-16 22:47:20 UTC (rev 4484)
@@ -47,8 +47,8 @@
 gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @DNSLIBS@ $(other_libs) @GETOPT@ @W32LIBS@
 else
 gpgkeys_curl_CPPFLAGS = @LIBCURL_CPPFLAGS@
-gpgkeys_curl_LDADD = @LIBCURL@ @GETOPT@
+gpgkeys_curl_LDADD = ../util/libcompat.a @LIBCURL@ @GETOPT@
 gpgkeys_hkp_CPPFLAGS = @LIBCURL_CPPFLAGS@
-gpgkeys_hkp_LDADD = @LIBCURL@ @GETOPT@
+gpgkeys_hkp_LDADD = ../util/libcompat.a @LIBCURL@ @GETOPT@
 gpgkeys_finger_CPPFLAGS = @LIBCURL_CPPFLAGS@
 endif

Modified: branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_hkp.c
===================================================================
--- branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_hkp.c	2007-04-16 22:43:29 UTC (rev 4483)
+++ branches/STABLE-BRANCH-1-4/keyserver/gpgkeys_hkp.c	2007-04-16 22:47:20 UTC (rev 4484)
@@ -731,7 +731,7 @@
   /* Send the response */
 
   fprintf(output,"VERSION %d\n",KEYSERVER_PROTO_VERSION);
-  fprintf(output,"PROGRAM %s\n\n",VERSION);
+  fprintf(output,"PROGRAM %s %s\n\n",VERSION,curl_version());
 
   if(opt->verbose>1)
     {