From: Christian Grothoff <christian@grothoff.org>
Date: Thu, 8 Dec 2011 17:48:54 +0000 (+0000)
Subject: -LRN: misc. minor fixes
X-Git-Tag: initial-import-from-subversion-38251~15682
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=33867ff5ec4161633b5f0efeca2f9daad9a8ef78;p=oweals%2Fgnunet.git

-LRN: misc. minor fixes
---

diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 55f8e9ad9..96c527de4 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -94,8 +94,8 @@ gnunet_testing_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(GN_LIBINTL)
-#gnunet_testing_DEPENDENCIES =
-#  libgnunetttesting.la				
+gnunet_testing_DEPENDENCIES = \
+ libgnunettesting.la
 
 
 test_testing_SOURCES = \
diff --git a/src/util/service.c b/src/util/service.c
index d37fe87c2..d582b6d80 100644
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -1150,7 +1150,7 @@ receive_sockets_from_parent (struct GNUNET_SERVICE_Context *sctx)
   {
     LOG (GNUNET_ERROR_TYPE_ERROR,
          _("Could not access a pre-bound socket, will try to bind myself\n"));
-    for (i = 0; sctx->lsocks[i] != NULL && i < count; i++)
+    for (i = 0; i < count && sctx->lsocks[i] != NULL; i++)
       GNUNET_break (0 == GNUNET_NETWORK_socket_close (sctx->lsocks[i]));
     GNUNET_free (sctx->lsocks);
     sctx->lsocks = NULL;