Merge branch 'master' of gnunet.org:gnunet

2 files changed, 7 insertions, 1 deletions

diff --git a/src/util/dnsparser.c b/src/util/dnsparser.c
index 2baa76ef2..55a9ff6c8 100644
--- a/src/util/dnsparser.c
+++ b/src/util/dnsparser.c
@@ -25,15 +25,19 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
+#if HAVE_LIBIDN2
 #if HAVE_IDN2_H
 #include <idn2.h>
 #elif HAVE_IDN2_IDN2_H
 #include <idn2/idn2.h>
-#elif HAVE_IDNA_H
+#endif
+#elif HAVE_LIBIDN
+#if HAVE_IDNA_H
 #include <idna.h>
 #elif HAVE_IDN_IDNA_H
 #include <idn/idna.h>
 #endif
+#endif
 #if WINDOWS
 #include <idn-free.h>
 #endif
diff --git a/src/util/service.c b/src/util/service.c
index 5117f006f..f38e4b353 100644
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -888,6 +888,8 @@ accept_client (void *cls)
     start_client (slc->sh,
                   sock);
   }
+  if (0 != sh->suspend_state)
+    return;
   slc->listen_task
     = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
                                      slc->listen_socket,