Merge branch 'master' of gnunet.org:gnunet

5 files changed, 11 insertions, 16 deletions

diff --git a/contrib/apparmor/gnunet-mesh b/contrib/apparmor/gnunet-mesh
deleted file mode 100644
index 9f5b07fc5..000000000
--- a/contrib/apparmor/gnunet-mesh
+++ /dev/null
@@ -1,13 +0,0 @@
-# Last Modified: Fri Aug  7 18:02:28 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-
-profile @{GNUNET_PREFIX}/bin/gnunet-mesh {
-  #include <abstractions/base>
-  #include <abstractions/gnunet-common>
-
-  @{GNUNET_PREFIX}/bin/gnunet-mesh mr,
-
-  # Site-specific additions and overrides. See local/README for details.
-  #include <local/gnunet>
-}
diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index 4b9dac842..ac8a411eb 100644
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -108,6 +108,7 @@ libgnunet_plugin_ats_ril_la_SOURCES = \
 libgnunet_plugin_ats_ril_la_LIBADD = \
   libgnunetats.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
+        $(top_builddir)/src/nt/libgnunetnt.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(LTLIBINTL)
 libgnunet_plugin_ats_ril_la_LDFLAGS = \
diff --git a/src/gns/test_gns_rel_expiration.sh b/src/gns/test_gns_rel_expiration.sh
index 66adbb631..c7c66bc27 100755
--- a/src/gns/test_gns_rel_expiration.sh
+++ b/src/gns/test_gns_rel_expiration.sh
@@ -7,6 +7,13 @@ if [ -z $LOCATION ]
 then
   LOCATION="gnunet-config"
 fi
+
+if [ -z $(which timeout) ]
+then
+  echo "timeout utility not found which is required for test."
+  exit 77
+fi
+
 $LOCATION --version 1> /dev/null
 if test $? != 0
 then
diff --git a/src/util/gnunet-service-resolver.c b/src/util/gnunet-service-resolver.c
index d85885d64..79108ff2d 100644
--- a/src/util/gnunet-service-resolver.c
+++ b/src/util/gnunet-service-resolver.c
@@ -1246,7 +1246,7 @@ shutdown_task (void *cls)
   while (NULL != hosts_head)
     free_hosts_entry (hosts_head);
   GNUNET_DNSSTUB_stop (dnsstub_ctx);
-  GNUNET_free (my_domain);
+  GNUNET_free_non_null (my_domain);
 }
 
 
diff --git a/src/util/scheduler.c b/src/util/scheduler.c
index dd0d5d5cf..3bd7ccec7 100644
--- a/src/util/scheduler.c
+++ b/src/util/scheduler.c
@@ -658,8 +658,8 @@ sighandler_shutdown ()
   int old_errno = errno;        /* backup errno */
 
   if (getpid () != my_pid)
-    exit (1);                   /* we have fork'ed since the signal handler was created,
-                                 * ignore the signal, see https://gnunet.org/vfork discussion */
+    _exit (1);                   /* we have fork'ed since the signal handler was created,
+                                  * ignore the signal, see https://gnunet.org/vfork discussion */
   GNUNET_DISK_file_write (GNUNET_DISK_pipe_handle
                           (shutdown_pipe_handle, GNUNET_DISK_PIPE_END_WRITE),
                           &c, sizeof (c));