[gnunet] branch master updated (23d5c0716 -> 2321a2f86)

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a change to branch master
in repository gnunet.

    from 23d5c0716 -fix notification processing zonemaster; give zonemaster 
some time in GNS tests; fix GNS tests for new gnunet.org IP
     new 35068004d -minor optimization
     new 2321a2f86 -do not execute GNS proxy test with curl-openssl

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 configure.ac                               | 1 +
 src/gns/Makefile.am                        | 2 +-
 src/zonemaster/gnunet-service-zonemaster.c | 9 ++++-----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index cf03e4d2c..54eb73a92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -734,6 +734,7 @@ AC_RUN_IFELSE(
                     [AC_MSG_WARN([cURL does not have GnuTLS backend])
                      curl_gnutls=0])
 LIBS=$OLD_LIBS
+AM_CONDITIONAL([HAVE_GNUTLS_CURL], [test "x$curl_gnutls" = "x1"])
 
 
 # Even if curl is found, we check for this constant in order to determine
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 1fe6ce438..2fbb49b18 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -259,7 +259,7 @@ check_SCRIPTS = \
   test_gns_revocation.sh\
   test_gns_redirect_lookup.sh
 
-if HAVE_GNUTLS
+if HAVE_GNUTLS_CURL
 check_SCRIPTS += \
   test_proxy.sh
 endif
diff --git a/src/zonemaster/gnunet-service-zonemaster.c 
b/src/zonemaster/gnunet-service-zonemaster.c
index 0413fff32..4cf5e690a 100644
--- a/src/zonemaster/gnunet-service-zonemaster.c
+++ b/src/zonemaster/gnunet-service-zonemaster.c
@@ -911,17 +911,17 @@ initiate_put_from_pipe_trigger (void *cls)
   nf_count = GNUNET_DISK_file_read (np_fh, buf, sizeof (buf));
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Read %lld notifications from pipe\n",
               (long long) nf_count);
-  for (int i = 0; i < nf_count; i++)
+  while (true)
   {
     GNUNET_assert (0 == pthread_mutex_lock (&results_lock));
-    job = results_head;
-    if (NULL == job)
+    if (NULL == results_head)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Hmm... no results. Back to sleep.\n");
+                  "No more results. Back to sleep.\n");
       GNUNET_assert (0 == pthread_mutex_unlock (&results_lock));
       return;
     }
+    job = results_head;
     GNUNET_CONTAINER_DLL_remove (results_head, results_tail, job);
     GNUNET_assert (0 == pthread_mutex_unlock (&results_lock));
     GNUNET_GNSRECORD_query_from_private_key (&job->zone,
@@ -956,7 +956,6 @@ initiate_put_from_pipe_trigger (void *cls)
     refresh_block (job->block_priv);
     free_job (job);
   }
-  return;
 }
 
 

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.