updates

diff --git a/CHANGES b/CHANGES
index 4101f61865a68e2044c90aad2d4064edf2fb22a0..00c6b56db2351e182df15c7bed934529787c8817 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+Thu Mar 28 12:17:21 CET 2002  Pekka Riikonen <priikone@silcnet.org>
+
+       * Fixed the TOPIC_SET notify to not cras.  It changed the topic
+         too early, before getting the channel entry.  Affected file
+         is silcd/packet_receive.c.
+
 Thu Mar 28 09:58:16 CET 2002  Johnny Mnemonic <johnny@themnemonic.org>
 
        * Added functions silc_server_config_[ref/unref], these are used

diff --git a/apps/silcd/packet_receive.c b/apps/silcd/packet_receive.c
index 972e60be2e268adcd5812d043e3030ad7ff944ed..3787196a1d1f6a6a7f94c7580b748e3edb452428 100644 (file)
--- a/apps/silcd/packet_receive.c
+++ b/apps/silcd/packet_receive.c
@@ -378,9 +378,6 @@ void silc_server_notify(SilcServer server,
       goto out;
     }
 
-    if (channel->topic && !strcmp(channel->topic, tmp))
-      goto out;
-
     if (!channel_id) {
       channel_id = silc_id_str2id(packet->dst_id, packet->dst_id_len,
                                  packet->dst_id_type);
@@ -400,6 +397,9 @@ void silc_server_notify(SilcServer server,
       }
     }
 
+    if (channel->topic && !strcmp(channel->topic, tmp))
+      goto out;
+
     /* Get user's channel entry and check that topic set is allowed. */
     if (!silc_server_client_on_channel(client, channel, &chl))
       goto out;