From: Pekka Riikonen <priikone@silcnet.org>
Date: Thu, 2 May 2002 07:18:01 +0000 (+0000)
Subject: 	updates.
X-Git-Tag: silc.toolkit.0.9~19
X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=2946cbec7d9cb8448ec01a270399960a1be195eb

	updates.
---

diff --git a/apps/silcd/command.c b/apps/silcd/command.c
index aeecb572..6bf0f49f 100644
--- a/apps/silcd/command.c
+++ b/apps/silcd/command.c
@@ -240,15 +240,15 @@ void silc_server_command_process(SilcServer server,
     if (!fast && ((cmd->flags & SILC_CF_LAG_STRICT) ||
 		  (client->fast_command > 5 && cmd->flags & SILC_CF_LAG)))
       silc_schedule_task_add(server->schedule, sock->sock, 
-			 silc_server_command_process_timeout,
-			 (void *)timeout, 
-			 2 - (time(NULL) - client->last_command), 0,
-			 SILC_TASK_TIMEOUT, SILC_TASK_PRI_NORMAL);
+			     silc_server_command_process_timeout, timeout,
+			     (client->fast_command < 3 ? 0 :
+			      2 - (time(NULL) - client->last_command)),
+			     (client->fast_command < 3 ? 200000 : 0),
+			     SILC_TASK_TIMEOUT, SILC_TASK_PRI_NORMAL);
     else
       silc_schedule_task_add(server->schedule, sock->sock, 
-			 silc_server_command_process_timeout,
-			 (void *)timeout, 0, 1,
-			 SILC_TASK_TIMEOUT, SILC_TASK_PRI_NORMAL);
+			     silc_server_command_process_timeout, timeout,
+			     0, 1, SILC_TASK_TIMEOUT, SILC_TASK_PRI_NORMAL);
     return;
   }
 
diff --git a/lib/silcclient/command_reply.c b/lib/silcclient/command_reply.c
index 35a7e87c..ddb4b0d3 100644
--- a/lib/silcclient/command_reply.c
+++ b/lib/silcclient/command_reply.c
@@ -499,7 +499,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(nick)
   }
 
   argc = silc_argument_get_arg_num(cmd->args);
-  if (argc < 2 || argc > 2) {
+  if (argc < 2 || argc > 3) {
     SAY(cmd->client, conn, SILC_CLIENT_MESSAGE_ERROR,
 	"Cannot set nickname: bad reply to command");
     COMMAND_REPLY_ERROR;