diff options
| author | David Shaw <[email protected]> | 2007-04-16 22:47:20 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2007-04-16 22:47:20 +0000 |
| commit | 1fc3e4a299b56a215402e7c38f0eee2fcc8b5d9b (patch) | |
| tree | 05f7663f3aed338eb2e1b5df3e0a3c66e81c9000 | |
| parent | * gpgkeys_curl.c, gpgkeys_ldap.c, gpgkeys_hkp.c, ksutil.c: Rename all (diff) | |
| download | gnupg-1fc3e4a299b56a215402e7c38f0eee2fcc8b5d9b.tar.gz gnupg-1fc3e4a299b56a215402e7c38f0eee2fcc8b5d9b.zip | |
* gpgkeys_hkp.c (main): Show curl or fake-curl version string.
* Makefile.am: Link with libcompat.a for ascii_str(n)casecmp.
| -rw-r--r-- | keyserver/ChangeLog | 4 | ||||
| -rw-r--r-- | keyserver/Makefile.am | 4 | ||||
| -rw-r--r-- | keyserver/gpgkeys_hkp.c | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog index 94ee6b6c5..984ab61e7 100644 --- a/keyserver/ChangeLog +++ b/keyserver/ChangeLog @@ -1,5 +1,9 @@ 2007-04-16 David Shaw <[email protected]> + * 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. diff --git a/keyserver/Makefile.am b/keyserver/Makefile.am index 337991031..b28fe0d73 100644 --- a/keyserver/Makefile.am +++ b/keyserver/Makefile.am @@ -47,8 +47,8 @@ gpgkeys_hkp_SOURCES += curl-shim.c curl-shim.h 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 diff --git a/keyserver/gpgkeys_hkp.c b/keyserver/gpgkeys_hkp.c index f93676905..1a577a9af 100644 --- a/keyserver/gpgkeys_hkp.c +++ b/keyserver/gpgkeys_hkp.c @@ -731,7 +731,7 @@ main(int argc,char *argv[]) /* 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) { |