updates.

[silc.git] / apps / silcd / command_reply.c

diff --git a/apps/silcd/command_reply.c b/apps/silcd/command_reply.c
index 1f0545b35ca745729478e322e4552943aa6e2edd..0b4ca602d8a4105fdf7f2bf0da8c2132a16f4fff 100644 (file)
--- a/apps/silcd/command_reply.c
+++ b/apps/silcd/command_reply.c
@@ -284,8 +284,11 @@ SILC_SERVER_CMD_REPLY_FUNC(whois)
                        "the entry from cache"));
        client = silc_idlist_find_client_by_id(server->global_list, 
                                               client_id, FALSE, NULL);
-       if (client)
+       if (client) {
+         silc_server_remove_from_channels(server, NULL, client, TRUE, 
+                                          NULL, TRUE);
          silc_idlist_del_client(server->global_list, client);
+       }
        silc_free(client_id);
       }
     }
@@ -642,8 +645,11 @@ SILC_SERVER_CMD_REPLY_FUNC(identify)
                        "the entry from cache"));
        client = silc_idlist_find_client_by_id(server->global_list, 
                                               client_id, FALSE, NULL);
-       if (client)
+       if (client) {
+         silc_server_remove_from_channels(server, NULL, client, TRUE, 
+                                          NULL, TRUE);
          silc_idlist_del_client(server->global_list, client);
+       }
        silc_free(client_id);
       }
     }
@@ -817,7 +823,6 @@ SILC_SERVER_CMD_REPLY_FUNC(join)
     silc_buffer_pull_tail(keyp, SILC_BUFFER_END(keyp));
     silc_buffer_put(keyp, tmp, len);
   }
-
   id = silc_id_payload_parse_id(id_string, id_len);
   if (!id)
     goto out;
@@ -867,8 +872,13 @@ SILC_SERVER_CMD_REPLY_FUNC(join)
        local list. */
     entry = silc_idlist_find_channel_by_name(server->global_list, 
                                             channel_name, &cache);
-    if (entry)
+    if (entry) {
+      if (entry->rekey) {
+       silc_schedule_task_del_by_context(server->schedule, entry->rekey);
+       SILC_LOG_ERROR(("global_list->channels: entry->rekey != NULL, inform Pekka now!!!"));
+      }
       silc_idlist_del_channel(server->global_list, entry);
+    }
 
     /* Add the channel to our local list. */
     entry = silc_idlist_add_channel(server->local_list, strdup(channel_name), 
@@ -943,10 +953,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,