From: Nathan S. Evans <evans@in.tum.de>
Date: Sun, 23 Jan 2011 15:23:45 +0000 (+0000)
Subject: malicious even when settle time = 0 and malicious_after_settle is true
X-Git-Tag: initial-import-from-subversion-38251~19281
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7fc649b003d105b2fbc31aa7a4d10a60c6d64cfe;p=oweals%2Fgnunet.git

malicious even when settle time = 0 and malicious_after_settle is true
---

diff --git a/src/dht/gnunet-dht-driver.c b/src/dht/gnunet-dht-driver.c
index 6f50fa201..cae9bb3db 100644
--- a/src/dht/gnunet-dht-driver.c
+++ b/src/dht/gnunet-dht-driver.c
@@ -2260,7 +2260,7 @@ continue_puts_and_gets (void *cls, const struct GNUNET_SCHEDULER_TaskContext * t
     dhtlog_handle->insert_round(DHT_ROUND_NORMAL, rounds_finished);
 
 #if HAVE_MALICIOUS
-  if ((GNUNET_YES != malicious_after_settle) && (settle_time > 0))
+  if ((GNUNET_YES != malicious_after_settle) || (settle_time == 0))
     {
       GNUNET_SCHEDULER_add_now(&setup_malicious_peers, NULL);
     }