fixes

[oweals/gnunet.git] / src / testbed / testbed_api.c

diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c
index 0452b097ad4a45bbc859c820fbdbae7e9f056625..053d730ffe968992b710028d3d1fe37242c62e23 100644 (file)
--- a/src/testbed/testbed_api.c
+++ b/src/testbed/testbed_api.c
@@ -1462,7 +1462,7 @@ GNUNET_TESTBED_controller_start (const char *controller_ip,
                              &helper_mst, &helper_exp_cb, cp);
   else
   {
-    char *remote_args[8];
+    char *remote_args[10];
     unsigned int argp;
     const char *username;
 
@@ -1480,10 +1480,12 @@ GNUNET_TESTBED_controller_start (const char *controller_ip,
     remote_args[argp++] = cp->port;
     remote_args[argp++] = "-o";
     remote_args[argp++] = "BatchMode=yes";
+    remote_args[argp++] = "-o";
+    remote_args[argp++] = "NoHostAuthenticationForLocalhost=yes";
     remote_args[argp++] = cp->dst;
     remote_args[argp++] = HELPER_TESTBED_BINARY_SSH;
     remote_args[argp++] = NULL;
-    GNUNET_assert (argp == 8);
+    GNUNET_assert (argp == 10);
     cp->helper =
         GNUNET_HELPER_start (GNUNET_NO, "ssh", remote_args, &helper_mst,
                              &helper_exp_cb, cp);
@@ -1681,6 +1683,8 @@ GNUNET_TESTBED_controller_configure_sharing (struct GNUNET_TESTBED_Controller
   memcpy (&msg[1], service_name, service_name_size);
   GNUNET_TESTBED_queue_message_ (controller,
                                  (struct GNUNET_MessageHeader *) msg);
+  GNUNET_break (0);             /* This function is not yet implemented on the
+                                   testbed service */
 }
 
 
@@ -1776,9 +1780,13 @@ GNUNET_TESTBED_register_host (struct GNUNET_TESTBED_Controller *controller,
   msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_ADDHOST);
   msg->host_id = htonl (GNUNET_TESTBED_host_get_id_ (host));
   msg->ssh_port = htons (GNUNET_TESTBED_host_get_ssh_port_ (host));
-  msg->user_name_length = htons (user_name_length);
   if (NULL != username)
+  {
+    msg->user_name_length = htons (user_name_length - 1);
     memcpy (&msg[1], username, user_name_length);
+  }
+  else
+    msg->user_name_length = htons (user_name_length);
   strcpy (((void *) &msg[1]) + user_name_length, hostname);
   GNUNET_TESTBED_queue_message_ (controller,
                                  (struct GNUNET_MessageHeader *) msg);