-misc bugfixes, travel hacking

4 files changed, 6 insertions, 8 deletions

diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf
index 8d4c7e3e8..8e89f3f6e 100644
--- a/src/integration-tests/confs/c_no_nat_client.conf
+++ b/src/integration-tests/confs/c_no_nat_client.conf
@@ -140,7 +140,6 @@ ATS_MIN_INTERVAL = 15000
 ATS_EXEC_INTERVAL = 30000
 
 [transport]
-#DEBUG = YES
 #PREFIX = valgrind --alloc-fn=GNUNET_xmalloc_ --alloc-fn=GNUNET_xmalloc_unchecked_ --alloc-fn=GNUNET_xrealloc_ --alloc-fn=GNUNET_xgrow_ --massif-out-file=massif_client.out --tool=massif
 AUTOSTART = YES
 PORT = 20029
diff --git a/src/integration-tests/confs/c_no_nat_client_http.conf b/src/integration-tests/confs/c_no_nat_client_http.conf
index 523a4fdcf..bbf6a64ec 100644
--- a/src/integration-tests/confs/c_no_nat_client_http.conf
+++ b/src/integration-tests/confs/c_no_nat_client_http.conf
@@ -141,7 +141,6 @@ ATS_EXEC_INTERVAL = 30000
 
 [transport]
 PREFIX = valgrind --leak-check=full
-#DEBUG = YES
 AUTOSTART = YES
 PORT = 20029
 HOSTNAME = localhost
diff --git a/src/integration-tests/confs/c_no_nat_client_unix.conf b/src/integration-tests/confs/c_no_nat_client_unix.conf
index 62d679fd2..25373c927 100644
--- a/src/integration-tests/confs/c_no_nat_client_unix.conf
+++ b/src/integration-tests/confs/c_no_nat_client_unix.conf
@@ -141,7 +141,6 @@ ATS_EXEC_INTERVAL = 30000
 
 [transport]
 PREFIX = valgrind --leak-check=full
-#DEBUG = YES
 AUTOSTART = YES
 PORT = 20029
 HOSTNAME = localhost
diff --git a/src/integration-tests/connection_watchdog.c b/src/integration-tests/connection_watchdog.c
index 17aab2159..0998a367e 100644
--- a/src/integration-tests/connection_watchdog.c
+++ b/src/integration-tests/connection_watchdog.c
@@ -1097,11 +1097,12 @@ main (int argc, char *const *argv)
 
   if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
     return 2;
-
-  return (GNUNET_OK ==
-          GNUNET_PROGRAM_run (argc, argv, "cn",
-                              gettext_noop ("help text"), options, &run,
-                              NULL)) ? ret : 1;
+  ret = (GNUNET_OK ==
+         GNUNET_PROGRAM_run (argc, argv, "cn",
+                             gettext_noop ("help text"), options, &run,
+                             NULL)) ? ret : 1;
+  GNUNET_free ((void*) argv);
+  return ret;
 }
 
 /* end of connection_watchdog.c */