From: Pekka Riikonen <priikone@silcnet.org>
Date: Wed, 16 Jan 2002 20:25:03 +0000 (+0000)
Subject: 	updates.
X-Git-Tag: silc.server.0.7.5~2
X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=264e8212603b1b32980fe5a7e5c66cb1aab0eebe

	updates.
---

diff --git a/CHANGES b/CHANGES
index 19a925b5..6e9082d6 100644
--- 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 1f0545b3..fb29bb9b 100644
--- 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,