update.

diff --git a/CHANGES b/CHANGES
index e52c265c2853b1e7d8e06d1d49e5d6f4febccbc1..bb850d84952e1ec6fa730db1eeaf80ee5a05e244 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -11,6 +11,14 @@ Thu Feb  1 23:31:21 EET 2001  Pekka Riikonen <priikone@poseidon.pspt.fi>
          separately in the same function earlier.  Affects file
          silcd/packet_send.c and all channel packet sending functions.
 
+        * In USERS reply, res_argv[i] are not allocated, the table
+          is allocated.  Thus changed that free the table, not its
+          internals.
+
+       * In server's whois_check and identify_check if the client is
+         locally connected do not send any WHOIS commands - they are not
+         needed.
+
 Thu Feb  1 21:32:27 EET 2001  Pekka Riikonen <priikone@poseidon.pspt.fi>
 
        * Fixed some minor bugs in client when sending WHOIS command.  The

diff --git a/apps/silcd/command.c b/apps/silcd/command.c
index 31420b44950b2248be275fd32a3c46306c607eff..656cf67ce97084a0279780e0d9824b64df9f3a93 100644 (file)
--- a/apps/silcd/command.c
+++ b/apps/silcd/command.c
@@ -394,6 +394,9 @@ silc_server_command_whois_check(SilcServerCommandContext cmd,
     if (!entry->nickname || !entry->username || !entry->userinfo) {
       SilcBuffer tmpbuf;
       unsigned short old_ident;
+
+      if (!entry->router)
+       continue;
       
       old_ident = silc_command_get_ident(cmd->payload);
       silc_command_set_ident(cmd->payload, silc_rng_get_rn16(server->rng));
@@ -806,6 +809,9 @@ silc_server_command_identify_check(SilcServerCommandContext cmd,
       SilcBuffer tmpbuf;
       unsigned short old_ident;
       
+      if (!entry->router)
+       continue;
+      
       old_ident = silc_command_get_ident(cmd->payload);
       silc_command_set_ident(cmd->payload, silc_rng_get_rn16(server->rng));
       silc_command_set_command(cmd->payload, SILC_COMMAND_WHOIS);

diff --git a/lib/silcclient/client.c b/lib/silcclient/client.c
index 8403f44a30f8dabef3c9e37b1707f633a008bfdc..9b3bba3eb486b1f1054a85994e6f5696cd356287 100644 (file)
--- a/lib/silcclient/client.c
+++ b/lib/silcclient/client.c
@@ -1326,7 +1326,7 @@ void silc_client_notify_by_server(SilcClient client,
       SilcPacketContext *p = silc_packet_context_dup(packet);
       p->context = (void *)client;
       p->sock = sock;
-      silc_client_command_pending(conn,SILC_COMMAND_WHOIS, 0, 
+      silc_client_command_pending(conn, SILC_COMMAND_WHOIS, 0,
                                  silc_client_notify_by_server_pending, p);
       goto out;
     }