[PATCH 09/13] keyserver: Show log prefix when not build with cURL.

Daniel Kahn Gillmor dkg at fifthhorseman.net
Sun Feb 22 05:10:33 CET 2015


From: Werner Koch <wk at gnupg.org>

* keyserver/ksutil.c (init_ks_options) [!HAVE_LIBCURL]: Set logging
prefix.

Signed-off-by: Werner Koch <wk at gnupg.org>

[dkg: rebased to STABLE-BRANCH-1-4]
Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
---
 keyserver/ksutil.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/keyserver/ksutil.c b/keyserver/ksutil.c
index b2efd00..5f21a1b 100644
--- a/keyserver/ksutil.c
+++ b/keyserver/ksutil.c
@@ -89,6 +89,12 @@ init_ks_options(void)
 {
   struct ks_options *opt;
 
+#ifndef HAVE_LIBCURL
+  /* Without cURL we use our own HTTP module which uses our logging
+     subsystem.  Thus we need to init that.  */
+  log_set_prefix ("gpgkeys", JNLIB_LOG_WITH_PREFIX);
+#endif /*!HAVE_LIBCURL*/
+
   opt=calloc(1,sizeof(struct ks_options));
 
   if(opt)
-- 
2.1.4




More information about the Gnupg-devel mailing list