summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2017-03-07 23:44:57 +0100
committerChristian Grothoff <christian@grothoff.org>2017-03-07 23:44:57 +0100
commit0e592870059883b779d02a14fa5ea13be5f50595 (patch)
tree3b4168dba92f70cdd22183f340e3b3e093f89a36
parentf64bd0cae02eb4a1e8e3dfdd911260f7185ffd37 (diff)
parent542de3e5df8dbe2bfc3d4290e75f5684e0deaf59 (diff)
Merge branch 'master' of git+ssh://gnunet.org/gnunet
-rw-r--r--src/consensus/Makefile.am5
-rw-r--r--src/fs/fs_unindex.c3
-rw-r--r--src/secretsharing/Makefile.am6
3 files changed, 8 insertions, 6 deletions
diff --git a/src/consensus/Makefile.am b/src/consensus/Makefile.am
index 2b1987fbc..c0205ee5d 100644
--- a/src/consensus/Makefile.am
+++ b/src/consensus/Makefile.am
@@ -18,8 +18,6 @@ if USE_COVERAGE
AM_CFLAGS = -fprofile-arcs -ftest-coverage
endif
-bin_PROGRAMS = \
- gnunet-consensus-profiler
libexec_PROGRAMS = \
gnunet-service-consensus
@@ -86,6 +84,9 @@ libgnunet_plugin_block_consensus_la_LDFLAGS = \
if HAVE_TESTING
+bin_PROGRAMS = \
+ gnunet-consensus-profiler
+
check_PROGRAMS = \
test_consensus_api
diff --git a/src/fs/fs_unindex.c b/src/fs/fs_unindex.c
index a672b84d5..ad1499f00 100644
--- a/src/fs/fs_unindex.c
+++ b/src/fs/fs_unindex.c
@@ -454,7 +454,8 @@ continue_after_remove (void *cls,
* Function called from datastore with result from us looking for
* a UBlock. There are four cases:
* 1) no result, means we move on to the next keyword
- * 2) UID is the same as the first UID, means we move on to next keyword
+ * 2) data hash is the same as an already seen data hash, means we move on to
+ * next keyword
* 3) UBlock for a different CHK, means we keep looking for more
* 4) UBlock is for our CHK, means we remove the block and then move
* on to the next keyword
diff --git a/src/secretsharing/Makefile.am b/src/secretsharing/Makefile.am
index 485183e36..4b9a06c40 100644
--- a/src/secretsharing/Makefile.am
+++ b/src/secretsharing/Makefile.am
@@ -17,9 +17,6 @@ if USE_COVERAGE
endif
-bin_PROGRAMS = \
- gnunet-secretsharing-profiler
-
libexec_PROGRAMS = \
gnunet-service-secretsharing
@@ -57,6 +54,9 @@ libgnunetsecretsharing_la_LDFLAGS = \
$(GN_LIB_LDFLAGS)
if HAVE_TESTING
+bin_PROGRAMS = \
+ gnunet-secretsharing-profiler
+
check_PROGRAMS = \
test_secretsharing_api