From: Pekka Riikonen <priikone@silcnet.org>
Date: Sun, 3 Apr 2005 07:45:09 +0000 (+0000)
Subject: 	Handle the reply in WATCH in backup correctly.
X-Git-Tag: silc.server.0.9.19~12
X-Git-Url: http://git.silcnet.org/gitweb/?a=commitdiff_plain;h=a38b57d21ce250bfc397be7715375544ffca9d86;p=silc.git

	Handle the reply in WATCH in backup correctly.
---

diff --git a/apps/silcd/command.c b/apps/silcd/command.c
index c2aecf8e..e33a8cef 100644
--- a/apps/silcd/command.c
+++ b/apps/silcd/command.c
@@ -4123,20 +4123,12 @@ SILC_SERVER_CMD_FUNC(watch)
 			      SILC_PACKET_COMMAND, cmd->packet->flags,
 			      tmpbuf->data, tmpbuf->len, TRUE);
 
-      /* If we are backup router, we're not expecting reply as router
-	 won't be sending it. */
-      if (server->server_type != SILC_BACKUP_ROUTER) {
-	/* Reprocess this packet after received reply from router */
-	silc_server_command_pending(server, SILC_COMMAND_WATCH,
-				    silc_command_get_ident(cmd->payload),
-				    silc_server_command_watch,
-				    silc_server_command_dup(cmd));
-	cmd->pending = TRUE;
-	silc_command_set_ident(cmd->payload, old_ident);
-	silc_buffer_free(tmpbuf);
-	goto out;
-      }
-
+      /* Reprocess this packet after received reply from router */
+      silc_server_command_pending(server, SILC_COMMAND_WATCH,
+				  silc_command_get_ident(cmd->payload),
+				  silc_server_command_watch,
+				  silc_server_command_dup(cmd));
+      cmd->pending = TRUE;
       silc_command_set_ident(cmd->payload, old_ident);
       silc_buffer_free(tmpbuf);
     } else if (context2) {
@@ -4148,8 +4140,8 @@ SILC_SERVER_CMD_FUNC(watch)
       silc_command_get_status(reply->payload, &status, NULL);
       silc_server_command_send_status_reply(cmd, SILC_COMMAND_WATCH, status,
 					    0);
-      goto out;
     }
+    goto out;
   }
 
   /* We are router and keep the watch list for local cell */