1 files changed, 3 insertions, 1 deletions

diff --git a/src/testbed/gnunet-helper-testbed.c b/src/testbed/gnunet-helper-testbed.c
index 88ef3f87d..95c54d06d 100644
--- a/src/testbed/gnunet-helper-testbed.c
+++ b/src/testbed/gnunet-helper-testbed.c
@@ -337,6 +337,7 @@ tokenizer_cb (void *cls, void *client,
   char *hostname;
   char *config;
   char *xconfig;
+  char *evstr;
   size_t config_size;
   uLongf ul_config_size;
   size_t xconfig_size;
@@ -422,7 +423,8 @@ tokenizer_cb (void *cls, void *client,
   LOG_DEBUG ("Staring testbed with config: %s\n", config);
   binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-testbed");
   /* expose testbed configuration through env variable */
-  GNUNET_assert (0 == setenv (ENV_TESTBED_CONFIG, config, 1));
+  GNUNET_assert (0 < GNUNET_asprintf (&evstr, "%s=%s", ENV_TESTBED_CONFIG, config));
+  GNUNET_assert (0 == putenv (evstr)); /* Do NOT free evstr; it is consumed by putenv */
   testbed =
       GNUNET_OS_start_process (PIPE_CONTROL,
                                GNUNET_OS_INHERIT_STD_ERR /*verbose? */ , NULL,