Stop waiting for backuup connection through timeout

diff --git a/CHANGES b/CHANGES
index 870d3413443acccf75e2f1cf69e551fc1e732e2f..e559274feb257cd3de0403ab63a17a510c590709 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+Thu Jun 27 11:27:07 CEST 2002 Pekka Riikonen <priikone@silcnet.org>
+
+       * Stop waiting for backup router through the timeout, not
+         directly after backup router has arrived.  Affected file
+         silcd/server.c.
+
 Wed Jun 26 15:14:12 EEST 2002 Pekka Riikonen <priikone@silcnet.org>
 
        * Stop for a couple seconds after badkup router has become

diff --git a/apps/silcd/server.c b/apps/silcd/server.c
index c568368b56f44dc81e1781cf8b61835b9cbbd104..1f6a778910c0aeb76782a77a747ad55dfe68a2f5 100644 (file)
--- a/apps/silcd/server.c
+++ b/apps/silcd/server.c
@@ -1636,7 +1636,9 @@ SILC_TASK_CALLBACK(silc_server_accept_new_connection_second)
                           SILC_TASK_PRI_LOW);
 }
 
-/* After this is called, server don't wait for backup router anymore */
+/* After this is called, server don't wait for backup router anymore.  
+   This gets called automatically even after we have backup router
+   connection established. */
 
 SILC_TASK_CALLBACK(silc_server_backup_router_wait)
 {
@@ -1915,7 +1917,6 @@ SILC_TASK_CALLBACK(silc_server_accept_new_connection_final)
          ctx->conn_type = SILC_SOCKET_TYPE_SERVER;
 
        new_server->server_type = SILC_BACKUP_ROUTER;
-       server->wait_backup = FALSE;
       }
 
       /* Statistics */