updates.

diff --git a/CHANGES b/CHANGES
index 19a925b521b569576301cd10467a6fee0b1fd559..6e9082d6a9e4267175f7999ea5d021ff8d012792 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+Wed Jan 16 22:26:30 EET 2002  Pekka Riikonen <priikone@silcnet.org>
+
+       * Call silc_server_save_channel_key only if the key payload
+         was provided in the JOIN command's command reply.  Affected
+         file silcd/command_reply.c.
+
 Tue Jan 15 18:49:41 EET 2002  Pekka Riikonen <priikone@silcnet.org>
 
        * Fixed silc_mp_sizeinbase to return the value correctly with

diff --git a/apps/silcd/command_reply.c b/apps/silcd/command_reply.c
index 1f0545b35ca745729478e322e4552943aa6e2edd..fb29bb9bd85d13536bb4b910081844e242272728 100644 (file)
--- a/apps/silcd/command_reply.c
+++ b/apps/silcd/command_reply.c
@@ -943,10 +943,11 @@ SILC_SERVER_CMD_REPLY_FUNC(join)
   entry->mode = mode;
 
   /* Save channel key */
-  if (!(entry->mode & SILC_CHANNEL_MODE_PRIVKEY))
-    silc_server_save_channel_key(server, keyp, entry);
-  if (keyp)
+  if (keyp) {
+    if (!(entry->mode & SILC_CHANNEL_MODE_PRIVKEY))
+      silc_server_save_channel_key(server, keyp, entry);
     silc_buffer_free(keyp);
+  }
 
   /* Save the users to the channel */
   silc_server_save_users_on_channel(server, cmd->sock, entry,