projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updates.
[silc.git]
/
apps
/
silcd
/
command_reply.c
diff --git
a/apps/silcd/command_reply.c
b/apps/silcd/command_reply.c
index 8192b510e43e50623b343352a3adacf422cd494d..0b4ca602d8a4105fdf7f2bf0da8c2132a16f4fff 100644
(file)
--- a/
apps/silcd/command_reply.c
+++ b/
apps/silcd/command_reply.c
@@
-823,7
+823,6
@@
SILC_SERVER_CMD_REPLY_FUNC(join)
silc_buffer_pull_tail(keyp, SILC_BUFFER_END(keyp));
silc_buffer_put(keyp, tmp, len);
}
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;
id = silc_id_payload_parse_id(id_string, id_len);
if (!id)
goto out;
@@
-873,8
+872,13
@@
SILC_SERVER_CMD_REPLY_FUNC(join)
local list. */
entry = silc_idlist_find_channel_by_name(server->global_list,
channel_name, &cache);
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);
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),
/* Add the channel to our local list. */
entry = silc_idlist_add_channel(server->local_list, strdup(channel_name),