aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-07-15 11:07:47 +0000
committerChristian Grothoff <christian@grothoff.org>2011-07-15 11:07:47 +0000
commit332e881066c72278bc309fc9d8184e823fd67426 (patch)
tree06a0410a1b4a3d917f72ae05a3ba0d5f27ea9de4
parenta35db619adaaa47a30a12c5199e9609f5ba2aa73 (diff)
downloadgnunet-332e881066c72278bc309fc9d8184e823fd67426.tar.gz
gnunet-332e881066c72278bc309fc9d8184e823fd67426.zip
eliminate leak
-rw-r--r--src/testing/testing.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/testing/testing.c b/src/testing/testing.c
index 57670dd23..b9f0fb538 100644
--- a/src/testing/testing.c
+++ b/src/testing/testing.c
@@ -1157,7 +1157,7 @@ GNUNET_TESTING_daemon_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
1157 GNUNET_asprintf (&arg, "%s@%s:%s", username, hostname, baseservicehome); 1157 GNUNET_asprintf (&arg, "%s@%s:%s", username, hostname, baseservicehome);
1158 else 1158 else
1159 GNUNET_asprintf (&arg, "%s:%s", hostname, baseservicehome); 1159 GNUNET_asprintf (&arg, "%s:%s", hostname, baseservicehome);
1160 1160 GNUNET_free(baseservicehome);
1161 if (ret->ssh_port_str == NULL) 1161 if (ret->ssh_port_str == NULL)
1162 { 1162 {
1163 ret->proc = GNUNET_OS_start_process (NULL, NULL, "scp", "scp", "-r", 1163 ret->proc = GNUNET_OS_start_process (NULL, NULL, "scp", "scp", "-r",
@@ -1166,7 +1166,10 @@ GNUNET_TESTING_daemon_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
1166#endif 1166#endif
1167 servicehome, arg, NULL); 1167 servicehome, arg, NULL);
1168#if DEBUG_TESTING 1168#if DEBUG_TESTING
1169 GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "copying directory with command scp -r %s %s\n", servicehome, arg); 1169 GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
1170 "copying directory with command scp -r %s %s\n",
1171 servicehome,
1172 arg);
1170#endif 1173#endif
1171 } 1174 }
1172 else 1175 else
@@ -1206,7 +1209,6 @@ GNUNET_TESTING_daemon_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
1206 = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_EXEC_WAIT, 1209 = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_EXEC_WAIT,
1207 &start_fsm, ret); 1210 &start_fsm, ret);
1208 GNUNET_free_non_null(hostkeyfile); 1211 GNUNET_free_non_null(hostkeyfile);
1209 GNUNET_free(baseservicehome);
1210 GNUNET_free(servicehome); 1212 GNUNET_free(servicehome);
1211 return ret; 1213 return ret;
1212 } 1214 }