dce

diff --git a/src/datacache/Makefile.am b/src/datacache/Makefile.am
index 8e4f265cdbd76feb4e7f550de26014c28b28c9a6..354e64b9e213afe3efa6aa572783519a85220722 100644 (file)
--- a/src/datacache/Makefile.am
+++ b/src/datacache/Makefile.am
@@ -177,6 +177,7 @@ perf_datacache_postgres_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 EXTRA_DIST = \
+ test_defaults.conf \
  test_datacache_data_sqlite.conf \
  perf_datacache_data_sqlite.conf \
  test_datacache_data_mysql.conf \

diff --git a/src/datastore/gnunet-service-datastore.c b/src/datastore/gnunet-service-datastore.c
index 29f68d8bb7ee41ec44370c4d30bc0e1697cf9261..71379d5db3bb1fe6bc50b03dde6c7d843f661b15 100644 (file)
--- a/src/datastore/gnunet-service-datastore.c
+++ b/src/datastore/gnunet-service-datastore.c
@@ -801,6 +801,9 @@ struct PutContext
 
 /**
  * Actually put the data message.
+ *
+ * @param client sender of the message
+ * @param dm message with the data to store
  */
 static void
 execute_put (struct GNUNET_SERVER_Client *client, const struct DataMessage *dm)

diff --git a/src/peerinfo-tool/test_gnunet_peerinfo_data.conf b/src/peerinfo-tool/test_gnunet_peerinfo_data.conf
index 86fcf5add17253bd7c447a29fa802bf90743646b..90da74fbffe3499104c6af2294f05818b391352f 100644 (file)
--- a/src/peerinfo-tool/test_gnunet_peerinfo_data.conf
+++ b/src/peerinfo-tool/test_gnunet_peerinfo_data.conf
@@ -23,7 +23,8 @@ PORT = 24357
 [dns]
 AUTOSTART = NO
 
-
+[mesh]
+AUTOSTART = NO
 
 [nse]
 AUTOSTART = NO

diff --git a/src/transport/test_transport_api_limited_sockets.c b/src/transport/test_transport_api_limited_sockets.c
index 9e7bdb9b602bdc50415076b2c063d697511dfcb8..a582a8f700d688fc8bb5d9588ecd8acf743b3c94 100644 (file)
--- a/src/transport/test_transport_api_limited_sockets.c
+++ b/src/transport/test_transport_api_limited_sockets.c
@@ -376,10 +376,7 @@ main (int argc, char *argv[])
   }
 #endif
 
-
-
   return ret;
-  check ();
 }
 
 /* end of test_transport_api.c */