From: Christian Grothoff <christian@grothoff.org>
Date: Sun, 21 Jun 2009 16:04:42 +0000 (+0000)
Subject: syn
X-Git-Tag: initial-import-from-subversion-38251~23737
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b2b1773aaa6e7c0c61ff7ac5a5766a8a2ea25495;p=oweals%2Fgnunet.git

syn
---

diff --git a/configure.ac b/configure.ac
index 634ef34a1..b4a294b17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -768,6 +768,7 @@ src/peerinfo/Makefile
 src/resolver/Makefile
 src/statistics/Makefile
 src/template/Makefile
+src/testing/Makefile
 src/topology/Makefile
 src/transport/Makefile
 src/util/Makefile
diff --git a/contrib/defaults.conf b/contrib/defaults.conf
index a7ca884d7..d3eb190fc 100644
--- a/contrib/defaults.conf
+++ b/contrib/defaults.conf
@@ -149,13 +149,17 @@ FRIENDS = $SERVICEHOME/friends
 
 
 [hostlist]
+# port for hostlist http server
+HTTPPORT = 8080
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-daemon-hostlist
 # consider having "-e" as default as well once implemented
 OPTIONS = -b
 SERVERS = http://gnunet.org:8080/
 # proxy for downloading hostlists
 HTTP-PROXY = 
-# port for hostlist server
-PORT = 8080
 
 
 [datastore]
diff --git a/src/include/gnunet_testing_lib.h b/src/include/gnunet_testing_lib.h
index 459e43314..41dc21f75 100644
--- a/src/include/gnunet_testing_lib.h
+++ b/src/include/gnunet_testing_lib.h
@@ -150,7 +150,7 @@ void GNUNET_TESTING_daemons_connect (struct GNUNET_TESTING_Daemon *d1,
  *        list; va only contains anything if hostname != NULL.
  */
 void
-GNUNET_TESTING_daemons_start_Va (struct GNUNET_SCHEDULER_Handle *sched,
+GNUNET_TESTING_daemons_start_va (struct GNUNET_SCHEDULER_Handle *sched,
 				 struct GNUNET_CONFIGURATION_Handle *cfg,
 				 unsigned int total,
 				 const char *service_home_prefix,