Merge remote-tracking branch 'origin/master' into credentials

36 files changed, 218 insertions, 105 deletions

diff --git a/src/block/block.c b/src/block/block.c
index 4b6f3826d..bbf45477c 100644
--- a/src/block/block.c
+++ b/src/block/block.c
@@ -151,10 +151,9 @@ GNUNET_BLOCK_context_create (const struct GNUNET_CONFIGURATION_Handle *cfg)
 void
 GNUNET_BLOCK_context_destroy (struct GNUNET_BLOCK_Context *ctx)
 {
-  unsigned int i;
   struct Plugin *plugin;
 
-  for (i = 0; i < ctx->num_plugins; i++)
+  for (unsigned int i = 0; i < ctx->num_plugins; i++)
   {
     plugin = ctx->plugins[i];
     GNUNET_break (NULL ==
@@ -301,6 +300,8 @@ GNUNET_BLOCK_group_create (struct GNUNET_BLOCK_Context *ctx,
 
   plugin = find_plugin (ctx,
                         type);
+  if (NULL == plugin)
+    return NULL;
   if (NULL == plugin->create_group)
     return NULL;
   va_start (ap,
diff --git a/src/cadet/cadet_api.c b/src/cadet/cadet_api.c
index 3fdeffe13..00a482452 100644
--- a/src/cadet/cadet_api.c
+++ b/src/cadet/cadet_api.c
@@ -326,7 +326,7 @@ destroy_channel (struct GNUNET_CADET_Channel *ch)
 
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Destroying channel %X of %p\n",
-       ch->ccn,
+       htonl (ch->ccn.channel_of_client),
        h);
   GNUNET_assert (GNUNET_YES ==
                  GNUNET_CONTAINER_multihashmap32_remove (h->channels,
diff --git a/src/cadet/gnunet-service-cadet_channel.c b/src/cadet/gnunet-service-cadet_channel.c
index 739b68228..1a2b32be0 100644
--- a/src/cadet/gnunet-service-cadet_channel.c
+++ b/src/cadet/gnunet-service-cadet_channel.c
@@ -2049,6 +2049,7 @@ void
 GCCH_debug (struct CadetChannel *ch,
             enum GNUNET_ErrorType level)
 {
+#if !defined(GNUNET_CULL_LOGGING)
   int do_log;
 
   do_log = GNUNET_get_log_call_status (level & (~GNUNET_ERROR_TYPE_BULK),
@@ -2088,6 +2089,7 @@ GCCH_debug (struct CadetChannel *ch,
         ntohl (ch->mid_recv.mid),
         (unsigned long long) ch->mid_futures,
         ntohl (ch->mid_send.mid));
+#endif
 }
 
 
diff --git a/src/cadet/gnunet-service-cadet_connection.c b/src/cadet/gnunet-service-cadet_connection.c
index 7b66f61a2..82ab5cc2c 100644
--- a/src/cadet/gnunet-service-cadet_connection.c
+++ b/src/cadet/gnunet-service-cadet_connection.c
@@ -1066,6 +1066,7 @@ void
 GCC_debug (struct CadetConnection *cc,
            enum GNUNET_ErrorType level)
 {
+#if !defined(GNUNET_CULL_LOGGING)
   int do_log;
 
   do_log = GNUNET_get_log_call_status (level & (~GNUNET_ERROR_TYPE_BULK),
@@ -1086,6 +1087,7 @@ GCC_debug (struct CadetConnection *cc,
         GCPP_2s (cc->path),
         cc->state,
         (GNUNET_YES == cc->mqm_ready) ? "ready" : "busy");
+#endif
 }
 
-/* end of gnunet-service-cadet-new_connection.c */
+/* end of gnunet-service-cadet_connection.c */
diff --git a/src/cadet/gnunet-service-cadet_tunnels.c b/src/cadet/gnunet-service-cadet_tunnels.c
index 28004debc..22e19ef70 100644
--- a/src/cadet/gnunet-service-cadet_tunnels.c
+++ b/src/cadet/gnunet-service-cadet_tunnels.c
@@ -3404,6 +3404,7 @@ void
 GCT_debug (const struct CadetTunnel *t,
            enum GNUNET_ErrorType level)
 {
+#if !defined(GNUNET_CULL_LOGGING)
   struct CadetTConnection *iter_c;
   int do_log;
 
@@ -3435,7 +3436,8 @@ GCT_debug (const struct CadetTunnel *t,
 
   LOG2 (level,
         "TTT TUNNEL END\n");
+#endif
 }
 
 
-/* end of gnunet-service-cadet-new_tunnels.c */
+/* end of gnunet-service-cadet_tunnels.c */
diff --git a/src/core/test_core_quota_peer1.conf b/src/core/test_core_quota_peer1.conf
index b96e7fefd..1807c763a 100644
--- a/src/core/test_core_quota_peer1.conf
+++ b/src/core/test_core_quota_peer1.conf
@@ -25,6 +25,10 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-peerinfo.sock
 PORT = 12475
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-transport.sock
 
+[nat]
+port = 12481
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-nat.sock
+
 [ats]
 PORT = 12471
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-ats.sock
diff --git a/src/core/test_core_quota_peer2.conf b/src/core/test_core_quota_peer2.conf
index 3c3275d74..122b00eec 100644
--- a/src/core/test_core_quota_peer2.conf
+++ b/src/core/test_core_quota_peer2.conf
@@ -26,6 +26,10 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p2-service-transport.sock
 PORT = 22480
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p2-service-core.sock
 
+[nat]
+PORT = 22481
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p2.service-nat.sock
+
 [ats]
 PORT = 22482
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p2-service-ats.sock
diff --git a/src/datacache/datacache.c b/src/datacache/datacache.c
index a1869a8bd..92cc40b53 100644
--- a/src/datacache/datacache.c
+++ b/src/datacache/datacache.c
@@ -185,9 +185,9 @@ GNUNET_DATACACHE_create (const struct GNUNET_CONFIGURATION_Handle *cfg,
     }
     if (NULL == ret->filter)
     {
-        ret->filter = GNUNET_CONTAINER_bloomfilter_init (NULL,
-                                                         bf_size,
-                                                         5); /* approx. 3% false positives at max use */
+      ret->filter = GNUNET_CONTAINER_bloomfilter_init (NULL,
+                                                       bf_size,
+                                                       5); /* approx. 3% false positives at max use */
     }
   }
   ret->stats = GNUNET_STATISTICS_create ("datacache", cfg);
diff --git a/src/datacache/plugin_datacache_postgres.c b/src/datacache/plugin_datacache_postgres.c
index 5c497cdf8..2fe6498a5 100644
--- a/src/datacache/plugin_datacache_postgres.c
+++ b/src/datacache/plugin_datacache_postgres.c
@@ -68,11 +68,11 @@ init_connection (struct Plugin *plugin)
 {
   struct GNUNET_PQ_ExecuteStatement es[] = {
     GNUNET_PQ_make_execute ("CREATE TEMPORARY TABLE IF NOT EXISTS gn090dc ("
-                            "  type INTEGER NOT NULL DEFAULT 0,"
-                            "  discard_time BIGINT NOT NULL DEFAULT 0,"
-                            "  key BYTEA NOT NULL DEFAULT '',"
-                            "  value BYTEA NOT NULL DEFAULT '',"
-                            "  path BYTEA DEFAULT '')"
+                            "  type INTEGER NOT NULL,"
+                            "  discard_time BIGINT NOT NULL,"
+                            "  key BYTEA NOT NULL,"
+                            "  value BYTEA NOT NULL,"
+                            "  path BYTEA DEFAULT NULL)"
                             "WITH OIDS"),
     GNUNET_PQ_make_try_execute ("CREATE INDEX IF NOT EXISTS idx_key ON gn090dc (key)"),
     GNUNET_PQ_make_try_execute ("CREATE INDEX IF NOT EXISTS idx_dt ON gn090dc (discard_time)"),
diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index f712890ac..00ce0e934 100644
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -50,13 +50,13 @@ libgnunet_plugin_block_dht_la_LDFLAGS = \
 libexec_PROGRAMS = \
  gnunet-service-dht
 
-noinst_PROGRAMS = \
+bin_PROGRAMS = \
  gnunet-dht-monitor \
  gnunet-dht-get \
  gnunet-dht-put
 
 if HAVE_TESTING
-noinst_PROGRAMS += \
+noinst_PROGRAMS = \
  gnunet-dht-profiler
 endif
 
diff --git a/src/dht/test_dht_tools.py.in b/src/dht/test_dht_tools.py.in
index 5ceabbfad..f5dd14f67 100644
--- a/src/dht/test_dht_tools.py.in
+++ b/src/dht/test_dht_tools.py.in
@@ -36,18 +36,16 @@ else:
   put = './gnunet-dht-put'
   arm = 'gnunet-arm'
 
-tf, tempcfg = tempfile.mkstemp (prefix='test_dht_api_peer1.')
-os.close (tf)
-
-run_get = [get, '-c', tempcfg]
-run_put = [put, '-c', tempcfg]
-run_arm = [arm, '-c', tempcfg]
+cfgfile = 'test_dht_api_peer1.conf'
+  
+run_get = [get, '-c', cfgfile]
+run_put = [put, '-c', cfgfile]
+run_arm = [arm, '-c', cfgfile]
 debug = os.getenv ('DEBUG')
 if debug:
   run_arm += [debug.split (' ')]
 
 def cleanup (exitcode):
-  os.remove (tempcfg)
   sys.exit (exitcode)
 
 def sub_run (args, want_stdo = True, want_stde = False, nofail = False):
@@ -104,7 +102,6 @@ def print_only_failer (command, rc, stdo, stde, normal):
       print ("FAIL: expected error while running {}\nCommand output was:\n{}\n{}".format (command, stdo, stde))
       cleanup (1)
 
-shutil.copyfile ('test_dht_api_peer1.conf', tempcfg)
 
 print ("TEST: Starting ARM...", end='')
 r_arm (['-s'], failer = end_arm_failer, want_stdo = False, want_stde = False)
diff --git a/src/exit/gnunet-daemon-exit.c b/src/exit/gnunet-daemon-exit.c
index 87b30c04a..d9a5dd684 100644
--- a/src/exit/gnunet-daemon-exit.c
+++ b/src/exit/gnunet-daemon-exit.c
@@ -3852,7 +3852,8 @@ run (void *cls,
 
   /* Cadet handle acquired, now open ports and announce regular
      expressions matching our exit */
-  if ( (GNUNET_YES == ipv4_enabled) && (GNUNET_YES == ipv4_exit) )
+  if ( (GNUNET_YES == ipv4_enabled) &&
+       (GNUNET_YES == ipv4_exit) )
   {
     GNUNET_CRYPTO_hash (GNUNET_APPLICATION_PORT_IPV4_GATEWAY,
                         strlen (GNUNET_APPLICATION_PORT_IPV4_GATEWAY),
@@ -3931,12 +3932,12 @@ run (void *cls,
       GNUNET_free (prefixed_regex);
     }
   }
-  if ((ipv4_exit) || (ipv6_exit))
-    helper_handle = GNUNET_HELPER_start (GNUNET_NO,
-                                         "gnunet-helper-exit",
-                                         exit_argv,
-                                         &message_token,
-                                         NULL, NULL);
+  helper_handle = GNUNET_HELPER_start (GNUNET_NO,
+                                       "gnunet-helper-exit",
+                                       exit_argv,
+                                       &message_token,
+                                       NULL,
+                                       NULL);
 }
 
 
diff --git a/src/include/gnunet_configuration_lib.h b/src/include/gnunet_configuration_lib.h
index c1537e4f8..8a874da13 100644
--- a/src/include/gnunet_configuration_lib.h
+++ b/src/include/gnunet_configuration_lib.h
@@ -132,8 +132,8 @@ GNUNET_CONFIGURATION_serialize (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param cfg configuration to update
  * @param mem the memory block of serialized configuration
  * @param size the size of the memory block
- * @param allow_inline set to #GNUNET_YES if we recursively load configuration
- *          from inlined configurations; #GNUNET_NO if not and raise warnings
+ * @param allow_inline set to the base directory if we recursively load configuration
+ *          from inlined configurations; NULL if not and raise warnings
  *          when we come across them
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
@@ -141,7 +141,7 @@ int
 GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
                                   const char *mem,
                                   size_t size,
-                                  int allow_inline);
+                                  const char *basedir);
 
 
 /**
diff --git a/src/integration-tests/confs/c_bootstrap_server.conf b/src/integration-tests/confs/c_bootstrap_server.conf
index acd29493b..4311e36f6 100644
--- a/src/integration-tests/confs/c_bootstrap_server.conf
+++ b/src/integration-tests/confs/c_bootstrap_server.conf
@@ -1,4 +1,4 @@
-@INLINE@ confs/test_defaults.conf
+@INLINE@ test_defaults.conf
 
 [PATHS]
 GNUNET_TEST_HOME = /tmp/c_bootstrap_server/
diff --git a/src/integration-tests/confs/c_nat_client.conf b/src/integration-tests/confs/c_nat_client.conf
index e8cdf6fa8..12d542851 100644
--- a/src/integration-tests/confs/c_nat_client.conf
+++ b/src/integration-tests/confs/c_nat_client.conf
@@ -1,4 +1,4 @@
-@INLINE@ confs/test_defaults.conf
+@INLINE@ test_defaults.conf
 
 [PATHS]
 GNUNET_TEST_HOME = /tmp/c_nat_client/
diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf
index 5b4d08d7f..40bb37df8 100644
--- a/src/integration-tests/confs/c_no_nat_client.conf
+++ b/src/integration-tests/confs/c_no_nat_client.conf
@@ -1,4 +1,4 @@
-@INLINE@ confs/test_defaults.conf
+@INLINE@ test_defaults.conf
 
 [PATHS]
 GNUNET_TEST_HOME = /tmp/c_no_nat_client/
diff --git a/src/integration-tests/confs/c_no_nat_client_2.conf b/src/integration-tests/confs/c_no_nat_client_2.conf
index 928d6e101..805389a15 100644
--- a/src/integration-tests/confs/c_no_nat_client_2.conf
+++ b/src/integration-tests/confs/c_no_nat_client_2.conf
@@ -1,4 +1,4 @@
-@INLINE@ confs/test_defaults.conf
+@INLINE@ test_defaults.conf
 
 [PATHS]
 GNUNET_TEST_HOME = /tmp/c_no_nat_client_2/
diff --git a/src/nat-auto/gnunet-service-nat-auto.c b/src/nat-auto/gnunet-service-nat-auto.c
index ae570c351..5f10dad94 100644
--- a/src/nat-auto/gnunet-service-nat-auto.c
+++ b/src/nat-auto/gnunet-service-nat-auto.c
@@ -310,7 +310,7 @@ handle_autoconfig_request (void *cls,
       GNUNET_CONFIGURATION_deserialize (ac->c,
                                         (const char *) &message[1],
                                         left,
-                                        GNUNET_NO))
+                                        NULL))
   {
     GNUNET_break (0);
     GNUNET_SERVICE_client_drop (ch->client);
diff --git a/src/nat-auto/nat_auto_api.c b/src/nat-auto/nat_auto_api.c
index 8a7eaf264..43a5212c8 100644
--- a/src/nat-auto/nat_auto_api.c
+++ b/src/nat-auto/nat_auto_api.c
@@ -155,7 +155,7 @@ handle_auto_result (void *cls,
       GNUNET_CONFIGURATION_deserialize (cfg,
                                         (const char *) &res[1],
                                         left,
-                                        GNUNET_NO))
+                                        NULL))
   {
     GNUNET_break (0);
     ah->arc (ah->arc_cls,
diff --git a/src/pq/pq_result_helper.c b/src/pq/pq_result_helper.c
index c5c8e56b9..045fe74b1 100644
--- a/src/pq/pq_result_helper.c
+++ b/src/pq/pq_result_helper.c
@@ -83,8 +83,10 @@ extract_varsize_blob (void *cls,
   if (PQgetisnull (result,
                    row,
                    fnum))
-    return GNUNET_SYSERR;
-
+  {
+    /* Let's allow this for varsize */
+    return GNUNET_OK;
+  }
   /* if a field is null, continue but
    * remember that we now return a different result */
   len = PQgetlength (result,
@@ -160,7 +162,10 @@ extract_fixed_blob (void *cls,
   if (PQgetisnull (result,
                    row,
                    fnum))
+  {
+    GNUNET_break (0);
     return GNUNET_SYSERR;
+  } 
 
   /* if a field is null, continue but
    * remember that we now return a different result */
@@ -241,8 +246,10 @@ extract_rsa_public_key (void *cls,
   if (PQgetisnull (result,
                    row,
                    fnum))
+  {
+    GNUNET_break (0);
     return GNUNET_SYSERR;
-
+  }
   /* if a field is null, continue but
    * remember that we now return a different result */
   len = PQgetlength (result,
@@ -340,8 +347,10 @@ extract_rsa_signature (void *cls,
   if (PQgetisnull (result,
                    row,
                    fnum))
+  {
+    GNUNET_break (0);
     return GNUNET_SYSERR;
-
+  }
   /* if a field is null, continue but
    * remember that we now return a different result */
   len = PQgetlength (result,
@@ -439,8 +448,10 @@ extract_string (void *cls,
   if (PQgetisnull (result,
                    row,
                    fnum))
+  {
+    GNUNET_break (0);
     return GNUNET_SYSERR;
-
+  }
   /* if a field is null, continue but
    * remember that we now return a different result */
   len = PQgetlength (result,
@@ -569,7 +580,10 @@ extract_uint16 (void *cls,
   if (PQgetisnull (result,
                    row,
                    fnum))
+  { 
+    GNUNET_break (0);
     return GNUNET_SYSERR;
+  }
   GNUNET_assert (NULL != dst);
   if (sizeof (uint16_t) != *dst_size)
   {
@@ -639,7 +653,10 @@ extract_uint32 (void *cls,
   if (PQgetisnull (result,
                    row,
                    fnum))
+  {
+    GNUNET_break (0);
     return GNUNET_SYSERR;
+  }
   GNUNET_assert (NULL != dst);
   if (sizeof (uint32_t) != *dst_size)
   {
@@ -709,7 +726,10 @@ extract_uint64 (void *cls,
   if (PQgetisnull (result,
                    row,
                    fnum))
+  {
+    GNUNET_break (0);
     return GNUNET_SYSERR;
+  }
   GNUNET_assert (NULL != dst);
   if (sizeof (uint64_t) != *dst_size)
   {
diff --git a/src/psycstore/plugin_psycstore_postgres.c b/src/psycstore/plugin_psycstore_postgres.c
index b8010af0a..046daf6ea 100644
--- a/src/psycstore/plugin_psycstore_postgres.c
+++ b/src/psycstore/plugin_psycstore_postgres.c
@@ -465,8 +465,10 @@ channel_key_store (struct Plugin *plugin,
     GNUNET_PQ_query_param_end
   };
 
-  if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS !=
-      GNUNET_PQ_eval_prepared_non_select (plugin->dbh, "insert_channel_key", params))
+  if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+      GNUNET_PQ_eval_prepared_non_select (plugin->dbh,
+                                          "insert_channel_key",
+                                          params))
     return GNUNET_SYSERR;
 
   return GNUNET_OK;
@@ -482,7 +484,7 @@ slave_key_store (struct Plugin *plugin,
     GNUNET_PQ_query_param_end
   };
 
-  if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS !=
+  if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
       GNUNET_PQ_eval_prepared_non_select (plugin->dbh, "insert_slave_key", params))
     return GNUNET_SYSERR;
 
@@ -508,21 +510,22 @@ postgres_membership_store (void *cls,
                            uint64_t group_generation)
 {
   struct Plugin *plugin = cls;
-
-  uint32_t idid_join = (uint32_t)did_join;
+  uint32_t idid_join = (uint32_t) did_join;
 
   GNUNET_assert (TRANSACTION_NONE == plugin->transaction);
 
-  if (announced_at > INT64_MAX ||
-      effective_since > INT64_MAX ||
-      group_generation > INT64_MAX)
+  if ( (announced_at > INT64_MAX) ||
+       (effective_since > INT64_MAX) ||
+       (group_generation > INT64_MAX) )
   {
     GNUNET_break (0);
     return GNUNET_SYSERR;
   }
 
-  if (GNUNET_OK != channel_key_store (plugin, channel_key)
-      || GNUNET_OK != slave_key_store (plugin, slave_key))
+  if ( (GNUNET_OK !=
+        channel_key_store (plugin, channel_key)) ||
+       (GNUNET_OK !=
+        slave_key_store (plugin, slave_key)) )
     return GNUNET_SYSERR;
 
   struct GNUNET_PQ_QueryParam params[] = {
@@ -535,8 +538,10 @@ postgres_membership_store (void *cls,
     GNUNET_PQ_query_param_end
   };
 
-  if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS !=
-      GNUNET_PQ_eval_prepared_non_select (plugin->dbh, "insert_membership", params))
+  if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
+      GNUNET_PQ_eval_prepared_non_select (plugin->dbh,
+                                          "insert_membership",
+                                          params))
     return GNUNET_SYSERR;
 
   return GNUNET_OK;
diff --git a/src/set/gnunet-service-set_union.c b/src/set/gnunet-service-set_union.c
index 4ca10f0b4..b2983545f 100644
--- a/src/set/gnunet-service-set_union.c
+++ b/src/set/gnunet-service-set_union.c
@@ -1467,8 +1467,6 @@ maybe_finish (struct Operation *op)
          num_demanded);
     if (0 == num_demanded)
     {
-      struct GNUNET_MQ_Envelope *ev;
-
       op->state->phase = PHASE_DONE;
       send_client_done (op);
       destroy_channel (op);
@@ -1894,8 +1892,6 @@ handle_union_p2p_full_done (void *cls,
     break;
   case PHASE_FULL_SENDING:
     {
-      struct GNUNET_MQ_Envelope *ev;
-
       LOG (GNUNET_ERROR_TYPE_DEBUG,
            "got FULL DONE, finishing\n");
       /* We sent the full set, and got the response for that.  We're done. */
diff --git a/src/testbed/gnunet-helper-testbed.c b/src/testbed/gnunet-helper-testbed.c
index d2a3a98b7..392f257dd 100644
--- a/src/testbed/gnunet-helper-testbed.c
+++ b/src/testbed/gnunet-helper-testbed.c
@@ -358,7 +358,10 @@ tokenizer_cb (void *cls,
   }
   cfg = GNUNET_CONFIGURATION_create ();
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_deserialize (cfg, config, ul_config_size, GNUNET_NO))
+      GNUNET_CONFIGURATION_deserialize (cfg,
+                                        config, 
+                                        ul_config_size,
+                                        NULL))
   {
     LOG (GNUNET_ERROR_TYPE_WARNING,
          "Unable to deserialize config -- exiting\n");
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c
index 0e0a5da9c..1acd0e47c 100644
--- a/src/testbed/testbed_api.c
+++ b/src/testbed/testbed_api.c
@@ -2158,9 +2158,10 @@ GNUNET_TESTBED_extract_config_ (const struct GNUNET_MessageHeader *msg)
   }
   cfg = GNUNET_CONFIGURATION_create ();
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_deserialize (cfg, (const char *) data,
+      GNUNET_CONFIGURATION_deserialize (cfg,
+                                        (const char *) data,
                                         (size_t) data_len,
-                                        GNUNET_NO))
+                                        NULL))
   {
     GNUNET_free (data);
     GNUNET_break_op (0);        /* De-serialization failure */
diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c
index 5d2c1cc37..8efcab649 100644
--- a/src/testbed/testbed_api_hosts.c
+++ b/src/testbed/testbed_api_hosts.c
@@ -983,7 +983,10 @@ helper_mst (void *cls,
   GNUNET_CONFIGURATION_destroy (cp->host->cfg);
   cp->host->cfg = GNUNET_CONFIGURATION_create ();
   GNUNET_assert (GNUNET_CONFIGURATION_deserialize
-                 (cp->host->cfg, config, config_size, GNUNET_NO));
+                 (cp->host->cfg,
+                  config,
+                  config_size,
+                  NULL));
   GNUNET_free (config);
   if (NULL == (hostname = GNUNET_TESTBED_host_get_hostname (cp->host)))
     hostname = "localhost";
diff --git a/src/topology/gnunet-daemon-topology.c b/src/topology/gnunet-daemon-topology.c
index 537ffe059..4415d0a24 100644
--- a/src/topology/gnunet-daemon-topology.c
+++ b/src/topology/gnunet-daemon-topology.c
@@ -1183,8 +1183,8 @@ run (void *cls,
               "Topology would like %u connections with at least %u friends\n",
               target_connection_count,
               minimum_friend_count);
-  if ( (friend_count < minimum_friend_count) &&
-       (NULL == blacklist))
+  if ( (GNUNET_YES == friends_only) ||
+       (minimum_friend_count > 0))
     blacklist = GNUNET_TRANSPORT_blacklist (cfg,
                                             &blacklist_check,
                                             NULL);
diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c
index 892d97050..d9fade44f 100644
--- a/src/transport/plugin_transport_http_server.c
+++ b/src/transport/plugin_transport_http_server.c
@@ -1977,6 +1977,37 @@ server_disconnect_cb (void *cls,
 
 
 /**
+ * Callback from MHD when a connection starts/stops
+ *
+ * @param cls closure with the `struct HTTP_Server_Plugin *`
+ * @param connection connection handle
+ * @param socket_context socket-specific pointer
+ * @param toe reason for connection notification
+ * @see #MHD_OPTION_NOTIFY_CONNECTION
+ */
+static void
+server_connection_cb (void *cls,
+                      struct MHD_Connection *connection,
+                      void **socket_context,
+                      enum MHD_ConnectionNotificationCode toe)
+{
+  struct HTTP_Server_Plugin *plugin = cls;
+  const union MHD_ConnectionInfo *info;
+
+  if (MHD_CONNECTION_NOTIFY_STARTED == toe)
+    return;
+
+  /* Reschedule to remove closed socket from our select set */
+  info = MHD_get_connection_info (connection,
+                                  MHD_CONNECTION_INFO_DAEMON);
+  GNUNET_assert (NULL != info);
+  server_reschedule (plugin,
+                     info->daemon,
+                     GNUNET_YES);
+}
+
+
+/**
  * Check if incoming connection is accepted.
  *
  * @param cls plugin as closure
@@ -2257,6 +2288,8 @@ run_mhd_start_daemon (struct HTTP_Server_Plugin *plugin,
                                        GNUNET_MAX_MESSAGE_SIZE),
                              MHD_OPTION_NOTIFY_COMPLETED,
                              &server_disconnect_cb, plugin,
+                             MHD_OPTION_NOTIFY_CONNECTION,
+                             &server_connection_cb, plugin,
                              MHD_OPTION_EXTERNAL_LOGGER,
                              &server_log, NULL,
                              MHD_OPTION_END);
diff --git a/src/transport/test_quota_compliance.c b/src/transport/test_quota_compliance.c
index 73b773b88..211e64e32 100644
--- a/src/transport/test_quota_compliance.c
+++ b/src/transport/test_quota_compliance.c
@@ -305,11 +305,11 @@ main (int argc,
   }
   for (unsigned int i=0;i<2;i++)
   {
-    if ( (NULL != gen_cfgs[0]) &&
-         (GNUNET_YES == GNUNET_DISK_file_test (gen_cfgs[0])) )
+    if ( (NULL != gen_cfgs[i]) &&
+         (GNUNET_YES == GNUNET_DISK_file_test (gen_cfgs[i])) )
     {
-      GNUNET_DISK_directory_remove (gen_cfgs[0]);
-      GNUNET_free (gen_cfgs[0]);
+      GNUNET_DISK_directory_remove (gen_cfgs[i]);
+      GNUNET_free (gen_cfgs[i]);
     }
   }
   return 0;
diff --git a/src/transport/transport-testing.c b/src/transport/transport-testing.c
index 53a44f338..2aa6cdbb0 100644
--- a/src/transport/transport-testing.c
+++ b/src/transport/transport-testing.c
@@ -413,7 +413,10 @@ GNUNET_TRANSPORT_TESTING_start_peer (struct GNUNET_TRANSPORT_TESTING_Handle *tth
   else
     p->cb_cls = p;
   p->start_cb = start_cb;
-  p->start_cb_cls = start_cb_cls;
+  if (NULL != start_cb_cls)
+    p->start_cb_cls = start_cb_cls;
+  else
+    p->start_cb_cls = p;
   GNUNET_CONTAINER_DLL_insert (tth->p_head,
                                tth->p_tail,
                                p);
diff --git a/src/util/bandwidth.c b/src/util/bandwidth.c
index bc0c3b9b4..f551bbb82 100644
--- a/src/util/bandwidth.c
+++ b/src/util/bandwidth.c
@@ -327,7 +327,6 @@ static void
 update_tracker (struct GNUNET_BANDWIDTH_Tracker *av)
 {
   struct GNUNET_TIME_Absolute now;
-  struct GNUNET_TIME_Relative delta;
   uint64_t delta_time;
   uint64_t delta_avail;
   uint64_t left_bytes;
@@ -354,14 +353,20 @@ update_tracker (struct GNUNET_BANDWIDTH_Tracker *av)
     else
       av->consumption_since_last_update__ = - max_carry;
   }
-  delta.rel_value_us = delta_time;
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Tracker %p updated, consumption at %lld at %u Bps, last update was %s ago\n",
-       av,
-       (long long) av->consumption_since_last_update__,
-       (unsigned int) av->available_bytes_per_s__,
-       GNUNET_STRINGS_relative_time_to_string (delta,
-                                               GNUNET_YES));
+#if !defined(GNUNET_CULL_LOGGING)
+  {
+    struct GNUNET_TIME_Relative delta;
+
+    delta.rel_value_us = delta_time;
+    LOG (GNUNET_ERROR_TYPE_DEBUG,
+         "Tracker %p updated, consumption at %lld at %u Bps, last update was %s ago\n",
+         av,
+         (long long) av->consumption_since_last_update__,
+         (unsigned int) av->available_bytes_per_s__,
+         GNUNET_STRINGS_relative_time_to_string (delta,
+                                                 GNUNET_YES));
+  }
+#endif
 }
 
 
diff --git a/src/util/common_logging.c b/src/util/common_logging.c
index 7d5b50b8b..34481fe13 100644
--- a/src/util/common_logging.c
+++ b/src/util/common_logging.c
@@ -203,6 +203,8 @@ struct LogDef
   int force;
 };
 
+
+#if !defined(GNUNET_CULL_LOGGING)
 /**
  * Dynamic array of logging definitions
  */
@@ -219,19 +221,20 @@ static int logdefs_size;
 static int logdefs_len;
 
 /**
- * GNUNET_YES if GNUNET_LOG environment variable is already parsed.
+ * #GNUNET_YES if GNUNET_LOG environment variable is already parsed.
  */
 static int gnunet_log_parsed;
 
 /**
- * GNUNET_YES if GNUNET_FORCE_LOG environment variable is already parsed.
+ * #GNUNET_YES if GNUNET_FORCE_LOG environment variable is already parsed.
  */
 static int gnunet_force_log_parsed;
 
 /**
- * GNUNET_YES if at least one definition with forced == 1 is available.
+ * #GNUNET_YES if at least one definition with forced == 1 is available.
  */
 static int gnunet_force_log_present;
+#endif
 
 #ifdef WINDOWS
 /**
@@ -269,18 +272,6 @@ get_type (const char *log)
 }
 
 
-#if !defined(GNUNET_CULL_LOGGING)
-/**
- * Utility function - reallocates logdefs array to be twice as large.
- */
-static void
-resize_logdefs ()
-{
-  logdefs_size = (logdefs_size + 1) * 2;
-  logdefs = GNUNET_realloc (logdefs, logdefs_size * sizeof (struct LogDef));
-}
-
-
 /**
  * Abort the process, generate a core dump if possible.
  */
@@ -294,6 +285,18 @@ GNUNET_abort_ ()
 }
 
 
+#if !defined(GNUNET_CULL_LOGGING)
+/**
+ * Utility function - reallocates logdefs array to be twice as large.
+ */
+static void
+resize_logdefs ()
+{
+  logdefs_size = (logdefs_size + 1) * 2;
+  logdefs = GNUNET_realloc (logdefs, logdefs_size * sizeof (struct LogDef));
+}
+
+
 #if ! TALER_WALLET_ONLY
 /**
  * Rotate logs, deleting the oldest log.
@@ -715,7 +718,7 @@ GNUNET_log_setup (const char *comp,
   log_file_name = GNUNET_STRINGS_filename_expand (logfile);
   if (NULL == log_file_name)
     return GNUNET_SYSERR;
-#if TALER_WALLET_ONLY
+#if TALER_WALLET_ONLY || defined(GNUNET_CULL_LOGGING)
   /* log file option not allowed for wallet logic */
   GNUNET_assert (NULL == logfile);
   return GNUNET_OK;
@@ -1030,7 +1033,7 @@ mylog (enum GNUNET_ErrorType kind,
     }
 #endif
     VSNPRINTF (buf, size, message, va);
-#if ! TALER_WALLET_ONLY
+#if ! (defined(GNUNET_CULL_LOGGING) || TALER_WALLET_ONLY)
     if (NULL != tmptr)
       (void) setup_log_file (tmptr);
 #endif
diff --git a/src/util/configuration.c b/src/util/configuration.c
index 639bd55a2..f63903b4e 100644
--- a/src/util/configuration.c
+++ b/src/util/configuration.c
@@ -145,8 +145,8 @@ GNUNET_CONFIGURATION_destroy (struct GNUNET_CONFIGURATION_Handle *cfg)
  * @param cfg configuration to update
  * @param mem the memory block of serialized configuration
  * @param size the size of the memory block
- * @param allow_inline set to #GNUNET_YES if we recursively load configuration
- *          from inlined configurations; #GNUNET_NO if not and raise warnings
+ * @param basedir set to path from which we recursively load configuration
+ *          from inlined configurations; NULL if not and raise warnings
  *          when we come across them
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
@@ -154,7 +154,7 @@ int
 GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
                                   const char *mem,
                                   size_t size,
-                                  int allow_inline)
+                                  const char *basedir)
 {
   char *line;
   char *line_orig;
@@ -228,13 +228,23 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
     {
       /* @INLINE@ value */
       value = &line[strlen ("@INLINE@ ")];
-      if (GNUNET_YES == allow_inline)
+      if (NULL != basedir)
       {
-        if (GNUNET_OK != GNUNET_CONFIGURATION_parse (cfg, value))
+        char *fn;
+
+        GNUNET_asprintf (&fn,
+                         "%s/%s",
+                         basedir,
+                         value);        
+        if (GNUNET_OK !=
+            GNUNET_CONFIGURATION_parse (cfg,
+                                        fn))
         {
+          GNUNET_free (fn);
           ret = GNUNET_SYSERR;    /* failed to parse included config */
           break;
         }
+        GNUNET_free (fn);
       }
       else
       {
@@ -311,6 +321,7 @@ GNUNET_CONFIGURATION_parse (struct GNUNET_CONFIGURATION_Handle *cfg,
   size_t fs;
   char *fn;
   char *mem;
+  char *endsep;
   int dirty;
   int ret;
 
@@ -350,8 +361,14 @@ GNUNET_CONFIGURATION_parse (struct GNUNET_CONFIGURATION_Handle *cfg,
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Deserializing contents of file `%s'\n",
        fn);
+  endsep = strrchr (fn, (int) '/');
+  if (NULL != endsep)
+    *endsep = '\0';
+  ret = GNUNET_CONFIGURATION_deserialize (cfg,
+                                          mem,
+                                          fs,
+                                          fn);
   GNUNET_free (fn);
-  ret = GNUNET_CONFIGURATION_deserialize (cfg, mem, fs, GNUNET_YES);
   GNUNET_free (mem);
   /* restore dirty flag - anything we set in the meantime
    * came from disk */
diff --git a/src/util/crypto_ecc_setup.c b/src/util/crypto_ecc_setup.c
index 2f2e2f122..64610ddd3 100644
--- a/src/util/crypto_ecc_setup.c
+++ b/src/util/crypto_ecc_setup.c
@@ -119,7 +119,8 @@ GNUNET_CRYPTO_eddsa_key_create_from_file (const char *filename)
       {
         ec = errno;
         LOG (GNUNET_ERROR_TYPE_ERROR,
-             _("Could not acquire lock on file `%s': %s...\n"), filename,
+             _("Could not acquire lock on file `%s': %s...\n"),
+             filename,
              STRERROR (ec));
       }
     }
@@ -313,7 +314,8 @@ GNUNET_CRYPTO_ecdsa_key_create_from_file (const char *filename)
       {
         ec = errno;
         LOG (GNUNET_ERROR_TYPE_ERROR,
-             _("Could not acquire lock on file `%s': %s...\n"), filename,
+             _("Could not acquire lock on file `%s': %s...\n"),
+             filename,
              STRERROR (ec));
         LOG (GNUNET_ERROR_TYPE_ERROR,
              _
diff --git a/src/util/gnunet-service-resolver.c b/src/util/gnunet-service-resolver.c
index 12e484845..d26bdd212 100644
--- a/src/util/gnunet-service-resolver.c
+++ b/src/util/gnunet-service-resolver.c
@@ -666,6 +666,8 @@ handle_get (void *cls,
     return;
   }
   ip = &msg[1];
+  
+#if !defined(GNUNET_CULL_LOGGING)
   {
     char buf[INET6_ADDRSTRLEN];
 
@@ -676,6 +678,7 @@ handle_get (void *cls,
                            buf,
                            sizeof (buf)));
   }
+#endif
   get_ip_as_string (client,
                     af,
                     ip);
diff --git a/src/util/resolver_api.c b/src/util/resolver_api.c
index 0c915932c..e7bba3000 100644
--- a/src/util/resolver_api.c
+++ b/src/util/resolver_api.c
@@ -821,6 +821,7 @@ handle_lookup_timeout (void *cls)
   }
   else
   {
+#if !defined(GNUNET_CULL_LOGGING)
     char buf[INET6_ADDRSTRLEN];
 
     LOG (GNUNET_ERROR_TYPE_INFO,
@@ -829,6 +830,7 @@ handle_lookup_timeout (void *cls)
                     (const void *) &rh[1],
                     buf,
                     sizeof(buf)));
+#endif
     if (GNUNET_NO == rh->received_response)
     {
       char *nret;
diff --git a/src/util/test_common_logging_dummy.c b/src/util/test_common_logging_dummy.c
index 0d971eac5..cb191ddab 100644
--- a/src/util/test_common_logging_dummy.c
+++ b/src/util/test_common_logging_dummy.c
@@ -47,11 +47,15 @@ my_log (void *ctx, enum GNUNET_ErrorType kind, const char *component,
   fflush (stdout);
 }
 
+
+#if !defined(GNUNET_CULL_LOGGING)
 static int
 expensive_func ()
 {
   return GNUNET_NETWORK_socket_select (NULL, NULL, NULL, OUTPUT_DELAY);
 }
+#endif
+
 
 #define pr(kind,lvl) {\
   struct GNUNET_TIME_Absolute t1, t2;\