updates.

diff --git a/CHANGES b/CHANGES
index bcd3fb84deba88facf5689842e979f640156d752..c02b602f37189d23ffff842895e8b07ca756bfbd 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+Tue Sep 18 22:50:41 EEST 2001  Pekka Riikonen <priikone@silcnet.org>
+
+       * Do not show the private channels on the WHOIS channel list
+         as it is not allowed by the protocol.  The affected file is
+         silcd/server.c.
+
 Sun Sep 16 12:32:58 EEST 2001  Pekka Riikonen <priikone@silcnet.org>
 
        * Assure that the packet length digged from the actual packet

diff --git a/TODO b/TODO
index 244d257e371e8607602c2f2fd44c9ad6af251246..6ff015e301b6d05aac03ff56927c1f7c771433b8 100644 (file)
--- a/TODO
+++ b/TODO
@@ -44,9 +44,6 @@ TODO/bugs In SILC Client Library
 TODO/bugs In SILC Server
 ========================
 
- o Private channels are shown on the USERS channel list. They must not
-   be shown.
-
  o Add perhaps /var/run/silcd.pid for PID information for the server.
 
  o Add a timeout to handling incmoing JOIN commands.  It should be 

diff --git a/apps/silcd/server.c b/apps/silcd/server.c
index 5c93bed5ff664308ecffe150b7bc1ed49fdcecec..f3022c2dd544006ecd398a6a42f01c465e408e38 100644 (file)
--- a/apps/silcd/server.c
+++ b/apps/silcd/server.c
@@ -3905,7 +3905,8 @@ SilcBuffer silc_server_get_client_channel_list(SilcServer server,
   while (silc_hash_table_get(&htl, NULL, (void *)&chl)) {
     channel = chl->channel;
 
-    if (channel->mode & SILC_CHANNEL_MODE_SECRET)
+    if (channel->mode & SILC_CHANNEL_MODE_SECRET ||
+       channel->mode & SILC_CHANNEL_MODE_PRIVATE)
       continue;
 
     cid = silc_id_id2str(channel->id, SILC_ID_CHANNEL);
@@ -4028,7 +4029,7 @@ SILC_TASK_CALLBACK_GLOBAL(silc_server_rekey_final)
   SILC_LOG_DEBUG(("Start"));
 
   if (protocol->state == SILC_PROTOCOL_STATE_ERROR ||
-      protocol->state == SILC_PROTOCOL_STATE_FAILURE) {
+       protocol->state == SILC_PROTOCOL_STATE_FAILURE) {
     /* Error occured during protocol */
     silc_protocol_cancel(protocol, server->schedule);
     silc_protocol_free(protocol);