From: Patrik Weiskircher <pat@silcnet.org>
Date: Wed, 24 Aug 2005 16:29:39 +0000 (+0000)
Subject: 	Before creating a channel key we need to remove the private key
X-Git-Tag: silc.toolkit.1.0.1~22
X-Git-Url: http://git.silcnet.org/gitweb/?a=commitdiff_plain;h=e6035a7aeba2a9589b64d0bcdea3ce43af880f14;p=silc.git

	Before creating a channel key we need to remove the private key
	mode, otherwise no key is created.
---

diff --git a/CHANGES b/CHANGES
index 751335b1..cd20f109 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+Wed Aug 24 18:27:48 CEST 2005  Patrik Weiskircher <pat@icore.at>
+
+	* Before creating a channel key we need to remove the private key
+	  mode, otherwise no key is created. Affected file
+	  apps/silcd/command.c
+
 Fri Aug 19 15:20:05 CEST 2005  Patrik Weiskircher <pat@icore.at>
 
 	* Before checking ip/hostname of SilcSocketConnection, check
diff --git a/apps/silcd/command.c b/apps/silcd/command.c
index 82bc2f6e..13a0c3ce 100644
--- a/apps/silcd/command.c
+++ b/apps/silcd/command.c
@@ -2966,6 +2966,10 @@ SILC_SERVER_CMD_FUNC(cmode)
 	 new channel key. Clients are not using private channel keys
 	 anymore after this. */
 
+      /* if we don't remove the flag from the mode
+       * silc_server_create_channel_key won't create a new key */
+      channel->mode &= ~SILC_CHANNEL_MODE_PRIVKEY;
+
       /* Re-generate channel key */
       if (!silc_server_create_channel_key(server, channel, 0))
 	goto out;