Merge branch 'master' of ssh://gnunet.org/gnunet

14 files changed, 208 insertions, 135 deletions

diff --git a/.buildbot/firefly-x86_64-amdepyc_test_tng.sh b/.buildbot/firefly-x86_64-amdepyc_test_tng.sh
index ff504ae57..f247f5a69 100755
--- a/.buildbot/firefly-x86_64-amdepyc_test_tng.sh
+++ b/.buildbot/firefly-x86_64-amdepyc_test_tng.sh
@@ -3,6 +3,6 @@
 # echo "Skipped"
 
 pushd src/transport
-make check TESTS='test_communicator_basic-tcp test_communicator_rekey-tcp test_communicator_basic-unix test_communicator_basic-udp test_communicator_backchannel-udp test_communicator_rekey-udp'
+make check TESTS='test_communicator_basic-tcp test_communicator_rekey-tcp test_communicator_basic-unix test_communicator_basic-udp test_communicator_backchannel-udp test_communicator_rekey-udp test_communicator_bidirect-tcp'
 pkill --signal 9 -U buildbot gnunet
 popd
diff --git a/configure.ac b/configure.ac
index 530e38d88..eca988bb3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1538,7 +1538,7 @@ AC_FUNC_VPRINTF
 AC_HEADER_SYS_WAIT
 AC_TYPE_OFF_T
 AC_TYPE_UID_T
-AC_CHECK_FUNCS([atoll stat64 strnlen mremap getrlimit setrlimit sysconf initgroups strndup gethostbyname2 getpeerucred getpeereid setresuid $funcstocheck getifaddrs freeifaddrs getresgid mallinfo malloc_size malloc_usable_size getrusage random srandom stat statfs statvfs wait4])
+AC_CHECK_FUNCS([atoll stat64 strnlen mremap getrlimit setrlimit sysconf initgroups strndup gethostbyname2 getpeerucred getpeereid setresuid $funcstocheck getifaddrs freeifaddrs getresgid mallinfo malloc_size malloc_usable_size getrusage random srandom stat statfs statvfs wait4 timegm])
 
 # restore LIBS
 LIBS=$SAVE_LIBS
diff --git a/src/hello/gnunet-hello.c b/src/hello/gnunet-hello.c
index b3f48322b..1f110ac18 100644
--- a/src/hello/gnunet-hello.c
+++ b/src/hello/gnunet-hello.c
@@ -51,7 +51,7 @@ static int address_count;
 
 
 /**
- * Add the given address with infinit expiration to the buffer.
+ * Add the given address with infinite expiration to the buffer.
  *
  * @param cls closure
  * @param address address to add
diff --git a/src/include/gnunet_program_lib.h b/src/include/gnunet_program_lib.h
index adb159e55..4167060c0 100644
--- a/src/include/gnunet_program_lib.h
+++ b/src/include/gnunet_program_lib.h
@@ -72,9 +72,12 @@ typedef void
  * @param task_cls closure for @a task
  * @param run_without_scheduler #GNUNET_NO start the scheduler,
  *        #GNUNET_YES do not start the scheduler just run the main task
- * @return #GNUNET_SYSERR on error, #GNUNET_OK on success
+ * @return #GNUNET_SYSERR on error,
+ *         #GNUNET_NO if successful option processing called
+ *                    for the program to terminate,
+ *         #GNUNET_OK on success (#a task was invoked)
  */
-int
+enum GNUNET_GenericReturnValue
 GNUNET_PROGRAM_run2 (int argc,
                      char *const *argv,
                      const char *binaryName,
@@ -96,9 +99,12 @@ GNUNET_PROGRAM_run2 (int argc,
  * @param options command line options
  * @param task main function to run
  * @param task_cls closure for @a task
- * @return #GNUNET_SYSERR on error, #GNUNET_OK on success
+ * @return #GNUNET_SYSERR on error,
+ *         #GNUNET_NO if successful option processing called
+ *                    for the program to terminate,
+ *         #GNUNET_OK on success (#a task was invoked)
  */
-int
+enum GNUNET_GenericReturnValue
 GNUNET_PROGRAM_run (int argc,
                     char *const *argv,
                     const char *binaryName,
diff --git a/src/include/gnunet_time_lib.h b/src/include/gnunet_time_lib.h
index 1237c4a65..38c372f23 100644
--- a/src/include/gnunet_time_lib.h
+++ b/src/include/gnunet_time_lib.h
@@ -179,7 +179,7 @@ GNUNET_NETWORK_STRUCT_END
 #define GNUNET_TIME_STD_BACKOFF(r) GNUNET_TIME_relative_min ( \
     GNUNET_TIME_STD_EXPONENTIAL_BACKOFF_THRESHOLD, \
     GNUNET_TIME_relative_multiply ( \
-      GNUNET_TIME_relative_max (GNUNET_TIME_UNIT_MILLISECONDS, (r)), 2));
+      GNUNET_TIME_relative_max (GNUNET_TIME_UNIT_MILLISECONDS, (r)), 2))
 
 
 /**
diff --git a/src/pq/pq_result_helper.c b/src/pq/pq_result_helper.c
index 546822e45..204ccee72 100644
--- a/src/pq/pq_result_helper.c
+++ b/src/pq/pq_result_helper.c
@@ -170,6 +170,9 @@ extract_fixed_blob (void *cls,
   if (fnum < 0)
   {
     GNUNET_break (0);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Result does not have field %s\n",
+                fname);
     return GNUNET_SYSERR;
   }
   if (PQgetisnull (result,
@@ -187,6 +190,11 @@ extract_fixed_blob (void *cls,
                      fnum);
   if (*dst_size != len)
   {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Expected %u bytes for field `%s', got %u\n",
+                (unsigned int) *dst_size,
+                fname,
+                (unsigned int) len);
     GNUNET_break (0);
     return GNUNET_SYSERR;
   }
@@ -861,6 +869,9 @@ extract_uint64 (void *cls,
                     fname);
   if (fnum < 0)
   {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Field %s missing in result\n",
+                fname);
     GNUNET_break (0);
     return GNUNET_SYSERR;
   }
diff --git a/src/setu/gnunet-service-setu.c b/src/setu/gnunet-service-setu.c
index e7f27bd7d..e5d8751f2 100644
--- a/src/setu/gnunet-service-setu.c
+++ b/src/setu/gnunet-service-setu.c
@@ -1000,7 +1000,8 @@ op_register_element (struct Operation *op,
 
 
 /**
- * FIXME.
+ * Modify an IBF key @a k_in based on the @a salt, returning a
+ * salted key in @a k_out.
  */
 static void
 salt_key (const struct IBF_Key *k_in,
diff --git a/src/setu/ibf.c b/src/setu/ibf.c
index 1532afceb..79b4f28db 100644
--- a/src/setu/ibf.c
+++ b/src/setu/ibf.c
@@ -112,7 +112,7 @@ ibf_create (uint32_t size, uint8_t hash_num)
 
 
 /**
- * Store unique bucket indices for the specified key in dst.
+ * Store unique bucket indices for the specified @a key in @a dst.
  */
 static void
 ibf_get_indices (const struct InvertibleBloomFilter *ibf,
@@ -126,13 +126,13 @@ ibf_get_indices (const struct InvertibleBloomFilter *ibf,
   bucket = GNUNET_CRYPTO_crc32_n (&key, sizeof key);
   for (i = 0, filled = 0; filled < ibf->hash_num; i++)
   {
-    unsigned int j;
     uint64_t x;
-    for (j = 0; j < filled; j++)
-      if (dst[j] == bucket)
+
+    for (unsigned int j = 0; j < filled; j++)
+      if (dst[j] == bucket % ibf->size)
         goto try_next;
     dst[filled++] = bucket % ibf->size;
-try_next:;
+try_next:
     x = ((uint64_t) bucket << 32) | i;
     bucket = GNUNET_CRYPTO_crc32_n (&x, sizeof x);
   }
@@ -142,13 +142,13 @@ try_next:;
 static void
 ibf_insert_into (struct InvertibleBloomFilter *ibf,
                  struct IBF_Key key,
-                 const int *buckets, int side)
+                 const int *buckets,
+                 int side)
 {
-  int i;
-
-  for (i = 0; i < ibf->hash_num; i++)
+  for (unsigned int i = 0; i < ibf->hash_num; i++)
   {
     const int bucket = buckets[i];
+
     ibf->count[bucket].count_val += side;
     ibf->key_sum[bucket].key_val ^= key.key_val;
     ibf->key_hash_sum[bucket].key_hash_val
@@ -164,7 +164,8 @@ ibf_insert_into (struct InvertibleBloomFilter *ibf,
  * @param key the element's hash code
  */
 void
-ibf_insert (struct InvertibleBloomFilter *ibf, struct IBF_Key key)
+ibf_insert (struct InvertibleBloomFilter *ibf,
+            struct IBF_Key key)
 {
   int buckets[ibf->hash_num];
 
@@ -181,7 +182,8 @@ ibf_insert (struct InvertibleBloomFilter *ibf, struct IBF_Key key)
  * @param key the element's hash code
  */
 void
-ibf_remove (struct InvertibleBloomFilter *ibf, struct IBF_Key key)
+ibf_remove (struct InvertibleBloomFilter *ibf,
+            struct IBF_Key key)
 {
   int buckets[ibf->hash_num];
 
@@ -197,9 +199,7 @@ ibf_remove (struct InvertibleBloomFilter *ibf, struct IBF_Key key)
 static int
 ibf_is_empty (struct InvertibleBloomFilter *ibf)
 {
-  int i;
-
-  for (i = 0; i < ibf->size; i++)
+  for (uint32_t i = 0; i < ibf->size; i++)
   {
     if (0 != ibf->count[i].count_val)
       return GNUNET_NO;
@@ -220,27 +220,25 @@ ibf_is_empty (struct InvertibleBloomFilter *ibf)
  *                 A negative sign indicates that the element was recovered
  *                 resides in an IBF that was previously subtracted from.
  * @param ret_id receives the hash code of the decoded element, if successful
- * @return GNUNET_YES if decoding an element was successful,
- *         GNUNET_NO if the IBF is empty,
- *         GNUNET_SYSERR if the decoding has failed
+ * @return #GNUNET_YES if decoding an element was successful,
+ *         #GNUNET_NO if the IBF is empty,
+ *         #GNUNET_SYSERR if the decoding has failed
  */
 int
 ibf_decode (struct InvertibleBloomFilter *ibf,
-            int *ret_side, struct IBF_Key *ret_id)
+            int *ret_side,
+            struct IBF_Key *ret_id)
 {
   struct IBF_KeyHash hash;
-  int i;
   int buckets[ibf->hash_num];
 
-  GNUNET_assert (NULL != ibf);
-
-  for (i = 0; i < ibf->size; i++)
+  for (uint32_t i = 0; i < ibf->size; i++)
   {
-    int j;
     int hit;
 
     /* we can only decode from pure buckets */
-    if ((1 != ibf->count[i].count_val) && (-1 != ibf->count[i].count_val))
+    if ( (1 != ibf->count[i].count_val) &&
+         (-1 != ibf->count[i].count_val) )
       continue;
 
     hash.key_hash_val = IBF_KEY_HASH_VAL (ibf->key_sum[i]);
@@ -253,7 +251,7 @@ ibf_decode (struct InvertibleBloomFilter *ibf,
      * if not, the key hash was subject to collision */
     hit = GNUNET_NO;
     ibf_get_indices (ibf, ibf->key_sum[i], buckets);
-    for (j = 0; j < ibf->hash_num; j++)
+    for (int j = 0; j < ibf->hash_num; j++)
       if (buckets[j] == i)
         hit = GNUNET_YES;
 
@@ -287,7 +285,8 @@ ibf_decode (struct InvertibleBloomFilter *ibf,
  * @param buf buffer to write the data to
  */
 void
-ibf_write_slice (const struct InvertibleBloomFilter *ibf, uint32_t start,
+ibf_write_slice (const struct InvertibleBloomFilter *ibf,
+                 uint32_t start,
                  uint32_t count, void *buf)
 {
   struct IBF_Key *key_dst;
@@ -298,16 +297,21 @@ ibf_write_slice (const struct InvertibleBloomFilter *ibf, uint32_t start,
 
   /* copy keys */
   key_dst = (struct IBF_Key *) buf;
-  GNUNET_memcpy (key_dst, ibf->key_sum + start, count * sizeof *key_dst);
+  GNUNET_memcpy (key_dst,
+                 ibf->key_sum + start,
+                 count * sizeof *key_dst);
   key_dst += count;
   /* copy key hashes */
   key_hash_dst = (struct IBF_KeyHash *) key_dst;
-  GNUNET_memcpy (key_hash_dst, ibf->key_hash_sum + start, count
-                 * sizeof *key_hash_dst);
+  GNUNET_memcpy (key_hash_dst,
+                 ibf->key_hash_sum + start,
+                 count * sizeof *key_hash_dst);
   key_hash_dst += count;
   /* copy counts */
   count_dst = (struct IBF_Count *) key_hash_dst;
-  GNUNET_memcpy (count_dst, ibf->count + start, count * sizeof *count_dst);
+  GNUNET_memcpy (count_dst,
+                 ibf->count + start,
+                 count * sizeof *count_dst);
 }
 
 
@@ -320,8 +324,10 @@ ibf_write_slice (const struct InvertibleBloomFilter *ibf, uint32_t start,
  * @param ibf the ibf to read from
  */
 void
-ibf_read_slice (const void *buf, uint32_t start, uint32_t count, struct
-                InvertibleBloomFilter *ibf)
+ibf_read_slice (const void *buf,
+                uint32_t start,
+                uint32_t count,
+                struct InvertibleBloomFilter *ibf)
 {
   struct IBF_Key *key_src;
   struct IBF_KeyHash *key_hash_src;
@@ -332,16 +338,21 @@ ibf_read_slice (const void *buf, uint32_t start, uint32_t count, struct
 
   /* copy keys */
   key_src = (struct IBF_Key *) buf;
-  GNUNET_memcpy (ibf->key_sum + start, key_src, count * sizeof *key_src);
+  GNUNET_memcpy (ibf->key_sum + start,
+                 key_src,
+                 count * sizeof *key_src);
   key_src += count;
   /* copy key hashes */
   key_hash_src = (struct IBF_KeyHash *) key_src;
-  GNUNET_memcpy (ibf->key_hash_sum + start, key_hash_src, count
-                 * sizeof *key_hash_src);
+  GNUNET_memcpy (ibf->key_hash_sum + start,
+                 key_hash_src,
+                 count * sizeof *key_hash_src);
   key_hash_src += count;
   /* copy counts */
   count_src = (struct IBF_Count *) key_hash_src;
-  GNUNET_memcpy (ibf->count + start, count_src, count * sizeof *count_src);
+  GNUNET_memcpy (ibf->count + start,
+                 count_src,
+                 count * sizeof *count_src);
 }
 
 
@@ -353,15 +364,13 @@ ibf_read_slice (const void *buf, uint32_t start, uint32_t count, struct
  * @param ibf2 IBF that will be subtracted from ibf1
  */
 void
-ibf_subtract (struct InvertibleBloomFilter *ibf1, const struct
-              InvertibleBloomFilter *ibf2)
+ibf_subtract (struct InvertibleBloomFilter *ibf1,
+              const struct InvertibleBloomFilter *ibf2)
 {
-  int i;
-
   GNUNET_assert (ibf1->size == ibf2->size);
   GNUNET_assert (ibf1->hash_num == ibf2->hash_num);
 
-  for (i = 0; i < ibf1->size; i++)
+  for (uint32_t i = 0; i < ibf1->size; i++)
   {
     ibf1->count[i].count_val -= ibf2->count[i].count_val;
     ibf1->key_hash_sum[i].key_hash_val ^= ibf2->key_hash_sum[i].key_hash_val;
@@ -383,12 +392,12 @@ ibf_dup (const struct InvertibleBloomFilter *ibf)
   copy = GNUNET_malloc (sizeof *copy);
   copy->hash_num = ibf->hash_num;
   copy->size = ibf->size;
-  copy->key_hash_sum = GNUNET_memdup (ibf->key_hash_sum, ibf->size
-                                      * sizeof(struct IBF_KeyHash));
-  copy->key_sum = GNUNET_memdup (ibf->key_sum, ibf->size * sizeof(struct
-                                                                  IBF_Key));
-  copy->count = GNUNET_memdup (ibf->count, ibf->size * sizeof(struct
-                                                              IBF_Count));
+  copy->key_hash_sum = GNUNET_memdup (ibf->key_hash_sum,
+                                      ibf->size * sizeof(struct IBF_KeyHash));
+  copy->key_sum = GNUNET_memdup (ibf->key_sum,
+                                 ibf->size * sizeof(struct IBF_Key));
+  copy->count = GNUNET_memdup (ibf->count,
+                               ibf->size * sizeof(struct IBF_Count));
   return copy;
 }
 
diff --git a/src/testbed/testbed_api_test.c b/src/testbed/testbed_api_test.c
index 6179a23ef..30dbe455d 100644
--- a/src/testbed/testbed_api_test.c
+++ b/src/testbed/testbed_api_test.c
@@ -23,9 +23,11 @@
  * @brief high-level test function
  * @author Christian Grothoff
  * @author Sree Harsha Totakura
+ * @author Tobias Frisch
  */
 #include "platform.h"
 #include "gnunet_testbed_service.h"
+#include "testbed.h"
 
 
 /**
@@ -143,6 +145,10 @@ GNUNET_TESTBED_test_run (const char *testname,
   argv2[2] = GNUNET_strdup (cfg_filename);
   GNUNET_assert (NULL != test_master);
   GNUNET_assert (num_peers > 0);
+
+  char* envcfg = getenv(ENV_TESTBED_CONFIG);
+  setenv(ENV_TESTBED_CONFIG, cfg_filename, 1);
+
   rc = GNUNET_malloc (sizeof(struct TestRunContext)
                       + (num_peers * sizeof(struct GNUNET_TESTBED_Peer *)));
   rc->test_master = test_master;
@@ -153,6 +159,12 @@ GNUNET_TESTBED_test_run (const char *testname,
   rc->cc_cls = cc_cls;
   ret = GNUNET_PROGRAM_run ((sizeof(argv2) / sizeof(char *)) - 1, argv2,
                             testname, "nohelp", options, &run, rc);
+
+  if (envcfg)
+    setenv(ENV_TESTBED_CONFIG, envcfg, 1);
+  else
+    unsetenv(ENV_TESTBED_CONFIG);
+
   GNUNET_free (rc);
   GNUNET_free (argv2[0]);
   GNUNET_free (argv2[2]);
diff --git a/src/util/getopt.c b/src/util/getopt.c
index acc1b6535..6dfad96da 100644
--- a/src/util/getopt.c
+++ b/src/util/getopt.c
@@ -878,16 +878,7 @@ GNgetopt_long (int argc,
 
 /* ******************** now the GNUnet specific modifications... ********************* */
 
-/**
- * Parse the command line.
- *
- * @param binaryOptions Name of application with option summary
- * @param allOptions defined options and handlers
- * @param argc number of arguments
- * @param argv actual arguments
- * @return index into argv with first non-option
- *   argument, or #GNUNET_SYSERR on error
- */
+
 int
 GNUNET_GETOPT_run (const char *binaryOptions,
                    const struct GNUNET_GETOPT_CommandLineOption *allOptions,
@@ -899,7 +890,7 @@ GNUNET_GETOPT_run (const char *binaryOptions,
   int count;
   char *shorts;
   int spos;
-  int cont;
+  enum GNUNET_GenericReturnValue cont;
   uint8_t *seen;
   unsigned int optmatch = 0;
   const char *have_exclusive = NULL;
@@ -944,7 +935,11 @@ GNUNET_GETOPT_run (const char *binaryOptions,
     unsigned int i;
     int c;
 
-    c = GNgetopt_long (argc, argv, shorts, long_options, &option_index);
+    c = GNgetopt_long (argc,
+                       argv,
+                       shorts,
+                       long_options,
+                       &option_index);
     if (c == GNUNET_SYSERR)
       break;   /* No more flags to process */
 
@@ -971,7 +966,9 @@ GNUNET_GETOPT_run (const char *binaryOptions,
     }
     if (i == count)
     {
-      fprintf (stderr, _ ("Use %s to get a list of options.\n"), "--help");
+      fprintf (stderr,
+               _ ("Use %s to get a list of options.\n"),
+               "--help");
       cont = GNUNET_SYSERR;
     }
   }
diff --git a/src/util/program.c b/src/util/program.c
index b5484855c..e34b37370 100644
--- a/src/util/program.c
+++ b/src/util/program.c
@@ -122,22 +122,7 @@ cmd_sorter (const void *a1, const void *a2)
 }
 
 
-/**
- * Run a standard GNUnet command startup sequence (initialize loggers
- * and configuration, parse options).
- *
- * @param argc number of command line arguments in @a argv
- * @param argv command line arguments
- * @param binaryName our expected name
- * @param binaryHelp help text for the program
- * @param options command line options
- * @param task main function to run
- * @param task_cls closure for @a task
- * @param run_without_scheduler #GNUNET_NO start the scheduler, #GNUNET_YES do not
- *        start the scheduler just run the main task
- * @return #GNUNET_SYSERR on error, #GNUNET_OK on success
- */
-int
+enum GNUNET_GenericReturnValue
 GNUNET_PROGRAM_run2 (int argc,
                      char *const *argv,
                      const char *binaryName,
@@ -156,7 +141,8 @@ GNUNET_PROGRAM_run2 (int argc,
   char *logfile;
   char *cfg_fn;
   const char *xdg;
-  int ret;
+  enum GNUNET_GenericReturnValue ret;
+  int iret;
   unsigned int cnt;
   unsigned long long skew_offset;
   unsigned long long skew_variance;
@@ -232,7 +218,7 @@ GNUNET_PROGRAM_run2 (int argc,
          sizeof(struct GNUNET_GETOPT_CommandLineOption),
          &cmd_sorter);
   loglev = NULL;
-  if (NULL != pd->config_file && NULL != pd->user_config_file)
+  if ((NULL != pd->config_file) && (NULL != pd->user_config_file))
   {
     xdg = getenv ("XDG_CONFIG_HOME");
     if (NULL != xdg)
@@ -249,12 +235,18 @@ GNUNET_PROGRAM_run2 (int argc,
   lpfx = GNUNET_strdup (binaryName);
   if (NULL != (spc = strstr (lpfx, " ")))
     *spc = '\0';
-  ret = GNUNET_GETOPT_run (binaryName, allopts, (unsigned int) argc, argv);
-  if ((GNUNET_OK > ret) ||
-      (GNUNET_OK != GNUNET_log_setup (lpfx, loglev, logfile)))
+  iret = GNUNET_GETOPT_run (binaryName,
+                            allopts,
+                            (unsigned int) argc,
+                            argv);
+  if ((GNUNET_OK > iret) ||
+      (GNUNET_OK != GNUNET_log_setup (lpfx,
+                                      loglev,
+                                      logfile)))
   {
     GNUNET_free (allopts);
     GNUNET_free (lpfx);
+    ret = (enum GNUNET_GenericReturnValue) iret;
     goto cleanup;
   }
   if (NULL != cc.cfgfile)
@@ -274,7 +266,7 @@ GNUNET_PROGRAM_run2 (int argc,
   }
   else
   {
-    if (NULL != cfg_fn && GNUNET_YES == GNUNET_DISK_file_test (cfg_fn))
+    if ((NULL != cfg_fn) && (GNUNET_YES == GNUNET_DISK_file_test (cfg_fn)))
     {
       if (GNUNET_SYSERR == GNUNET_CONFIGURATION_load (cfg, cfg_fn))
       {
@@ -306,14 +298,16 @@ GNUNET_PROGRAM_run2 (int argc,
   }
   GNUNET_free (allopts);
   GNUNET_free (lpfx);
-  if ((GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (cc.cfg,
-                                                           "testing",
-                                                           "skew_offset",
-                                                           &skew_offset)) &&
-      (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (cc.cfg,
-                                                           "testing",
-                                                           "skew_variance",
-                                                           &skew_variance)))
+  if ((GNUNET_OK ==
+       GNUNET_CONFIGURATION_get_value_number (cc.cfg,
+                                              "testing",
+                                              "skew_offset",
+                                              &skew_offset)) &&
+      (GNUNET_OK ==
+       GNUNET_CONFIGURATION_get_value_number (cc.cfg,
+                                              "testing",
+                                              "skew_variance",
+                                              &skew_variance)))
   {
     clock_offset = skew_offset - skew_variance;
     GNUNET_TIME_set_offset (clock_offset);
@@ -323,16 +317,26 @@ GNUNET_PROGRAM_run2 (int argc,
      specified in the configuration, remember the command-line option
      in "cfg".  This is typically really only having an effect if we
      are running code in src/arm/, as obviously the rest of the code
-     has little business with ARM-specific options. */if (GNUNET_YES != GNUNET_CONFIGURATION_have_value (cfg, "arm", "CONFIG"))
+     has little business with ARM-specific options. */
+  if (GNUNET_YES !=
+      GNUNET_CONFIGURATION_have_value (cfg,
+                                       "arm",
+                                       "CONFIG"))
   {
     if (NULL != cc.cfgfile)
-      GNUNET_CONFIGURATION_set_value_string (cfg, "arm", "CONFIG", cc.cfgfile);
+      GNUNET_CONFIGURATION_set_value_string (cfg,
+                                             "arm",
+                                             "CONFIG",
+                                             cc.cfgfile);
     else if (NULL != cfg_fn)
-      GNUNET_CONFIGURATION_set_value_string (cfg, "arm", "CONFIG", cfg_fn);
+      GNUNET_CONFIGURATION_set_value_string (cfg,
+                                             "arm",
+                                             "CONFIG",
+                                             cfg_fn);
   }
 
   /* run */
-  cc.args = &argv[ret];
+  cc.args = &argv[iret];
   if ((NULL == cc.cfgfile) && (NULL != cfg_fn))
     cc.cfgfile = GNUNET_strdup (cfg_fn);
   if (GNUNET_NO == run_without_scheduler)
@@ -355,20 +359,7 @@ cleanup:
 }
 
 
-/**
- * Run a standard GNUnet command startup sequence (initialize loggers
- * and configuration, parse options).
- *
- * @param argc number of command line arguments
- * @param argv command line arguments
- * @param binaryName our expected name
- * @param binaryHelp help text for the program
- * @param options command line options
- * @param task main function to run
- * @param task_cls closure for @a task
- * @return #GNUNET_SYSERR on error, #GNUNET_OK on success
- */
-int
+enum GNUNET_GenericReturnValue
 GNUNET_PROGRAM_run (int argc,
                     char *const *argv,
                     const char *binaryName,
diff --git a/src/util/test_configuration.c b/src/util/test_configuration.c
index 59b1b2291..823bf273d 100644
--- a/src/util/test_configuration.c
+++ b/src/util/test_configuration.c
@@ -70,12 +70,17 @@ initDiffsCBData (struct DiffsCBData *cbData)
  * and comparing configuration
  */
 static void
-diffsCallBack (void *cls, const char *section, const char *option,
+diffsCallBack (void *cls,
+               const char *section,
+               const char *option,
                const char *value)
 {
   struct DiffsCBData *cbData = cls;
   int cbOption = cbData->callBackOption;
 
+  if (0 == strcasecmp ("PATHS",
+                       section))
+    return;
   switch (cbOption)
   {
   case EDIT_SECTION:
@@ -89,14 +94,12 @@ diffsCallBack (void *cls, const char *section, const char *option,
                                              "new-value");
     }
     break;
-
   case EDIT_ALL:
     GNUNET_CONFIGURATION_set_value_string (cbData->cfg, section, option,
                                            "new-value");
     GNUNET_CONFIGURATION_set_value_string (cbData->cfgDiffs, section, option,
                                            "new-value");
     break;
-
   case ADD_NEW_ENTRY:
     {
       static int hit = 0;
@@ -111,7 +114,6 @@ diffsCallBack (void *cls, const char *section, const char *option,
       }
       break;
     }
-
   case COMPARE:
     {
       int ret;
@@ -119,15 +121,32 @@ diffsCallBack (void *cls, const char *section, const char *option,
 
       diffValue = NULL;
       ret =
-        GNUNET_CONFIGURATION_get_value_string (cbData->cfgDiffs, section,
-                                               option, &diffValue);
+        GNUNET_CONFIGURATION_get_value_string (cbData->cfgDiffs,
+                                               section,
+                                               option,
+                                               &diffValue);
       if (NULL != diffValue)
       {
-        if ((ret == GNUNET_SYSERR) || (strcmp (diffValue, value) != 0) )
+        if ( (ret == GNUNET_SYSERR) ||
+             (strcmp (diffValue, value) != 0) )
+        {
+          GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                      "Unexpected value %s in %s/%s\n",
+                      diffValue,
+                      section,
+                      option);
           cbData->status = 1;
+        }
       }
       else
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    "Unexpected value %s in %s/%s\n",
+                    diffValue,
+                    section,
+                    option);
         cbData->status = 1;
+      }
       GNUNET_free (diffValue);
       break;
     }
@@ -153,7 +172,8 @@ diffsCallBack (void *cls, const char *section, const char *option,
 
 
 static struct GNUNET_CONFIGURATION_Handle *
-editConfiguration (struct GNUNET_CONFIGURATION_Handle *cfg, int option)
+editConfiguration (struct GNUNET_CONFIGURATION_Handle *cfg,
+                   int option)
 {
   struct DiffsCBData diffsCB;
 
@@ -244,7 +264,9 @@ checkDiffs (struct GNUNET_CONFIGURATION_Handle *cfg_default, int option)
                               diffsFileName);
   cbData.callBackOption = COMPARE;
   cbData.cfgDiffs = cfgDiffs;
-  GNUNET_CONFIGURATION_iterate (cfg, diffsCallBack, &cbData);
+  GNUNET_CONFIGURATION_iterate (cfg,
+                                &diffsCallBack,
+                                &cbData);
   if (1 == (ret = cbData.status))
   {
     fprintf (stderr, "%s",
diff --git a/src/util/test_os_start_process.c b/src/util/test_os_start_process.c
index ff5021d03..435b70e1a 100644
--- a/src/util/test_os_start_process.c
+++ b/src/util/test_os_start_process.c
@@ -118,29 +118,23 @@ read_call (void *cls)
 static void
 run_task (void *cls)
 {
-  char *fn;
   const struct GNUNET_DISK_FileHandle *stdout_read_handle;
   const struct GNUNET_DISK_FileHandle *wh;
 
-  GNUNET_asprintf (&fn, "cat");
-
   hello_pipe_stdin = GNUNET_DISK_pipe (GNUNET_DISK_PF_BLOCKING_RW);
   hello_pipe_stdout = GNUNET_DISK_pipe (GNUNET_DISK_PF_BLOCKING_RW);
   if ((hello_pipe_stdout == NULL) || (hello_pipe_stdin == NULL))
   {
     GNUNET_break (0);
     ok = 1;
-    GNUNET_free (fn);
     return;
   }
 
   proc =
     GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ERR,
                              hello_pipe_stdin, hello_pipe_stdout, NULL,
-                             fn,
-                             "test_gnunet_echo_hello", "-", NULL);
-  GNUNET_free (fn);
-
+                             "cat",
+                             "cat", "-", NULL);
   /* Close the write end of the read pipe */
   GNUNET_DISK_pipe_close_end (hello_pipe_stdout, GNUNET_DISK_PIPE_END_WRITE);
   /* Close the read end of the write pipe */
diff --git a/src/util/time.c b/src/util/time.c
index 5205fe11a..9e41305f1 100644
--- a/src/util/time.c
+++ b/src/util/time.c
@@ -716,6 +716,32 @@ GNUNET_TIME_time_to_year (struct GNUNET_TIME_Absolute at)
 }
 
 
+#ifndef HAVE_TIMEGM
+/**
+ * As suggested in the timegm() man page.
+ */
+static time_t
+my_timegm (struct tm *tm)
+{
+  time_t ret;
+  char *tz;
+
+  tz = getenv ("TZ");
+  setenv ("TZ", "", 1);
+  tzset ();
+  ret = mktime (tm);
+  if (tz)
+    setenv ("TZ", tz, 1);
+  else
+    unsetenv ("TZ");
+  tzset ();
+  return ret;
+}
+
+
+#endif
+
+
 /**
  * Convert a year to an expiration time of January 1st of that year.
  *
@@ -740,7 +766,11 @@ GNUNET_TIME_year_to_time (unsigned int year)
   t.tm_mon = 0;
   t.tm_wday = 1;
   t.tm_yday = 1;
-  tp = mktime (&t);
+#ifndef HAVE_TIMEGM
+  tp = my_timegm (&t);
+#else
+  tp = timegm (&t);
+#endif
   GNUNET_break (tp != (time_t) -1);
   ret.abs_value_us = tp * 1000LL * 1000LL; /* seconds to microseconds */
   return ret;