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
/
server.c
diff --git
a/apps/silcd/server.c
b/apps/silcd/server.c
index d7fc856cef29f6b24d320d0a1f479ca26c20fb70..46900b2fd7ef08b37aaef5980be4658389c0e8a8 100644
(file)
--- a/
apps/silcd/server.c
+++ b/
apps/silcd/server.c
@@
-2877,8
+2877,10
@@
bool silc_server_create_channel_key(SilcServer server,
}
if (!channel->channel_key)
}
if (!channel->channel_key)
- if (!silc_cipher_alloc(SILC_DEFAULT_CIPHER, &channel->channel_key))
+ if (!silc_cipher_alloc(SILC_DEFAULT_CIPHER, &channel->channel_key)) {
+ channel->channel_key = NULL;
return FALSE;
return FALSE;
+ }
if (key_len)
len = key_len;
if (key_len)
len = key_len;
@@
-2999,6
+3001,7
@@
SilcChannelEntry silc_server_save_channel_key(SilcServer server,
/* Create new cipher */
if (!silc_cipher_alloc(cipher, &channel->channel_key)) {
/* Create new cipher */
if (!silc_cipher_alloc(cipher, &channel->channel_key)) {
+ channel->channel_key = NULL;
channel = NULL;
goto out;
}
channel = NULL;
goto out;
}
@@
-3374,7
+3377,7
@@
void silc_server_announce_get_channels(SilcServer server,
(*channel_ids)[i] = NULL;
silc_server_announce_get_channel_users(server, channel,
channel_users,
(*channel_ids)[i] = NULL;
silc_server_announce_get_channel_users(server, channel,
channel_users,
-
channel_users_modes
[i]);
+
&(*channel_users_modes)
[i]);
(*channel_ids)[i] = channel->id;
i++;
(*channel_ids)[i] = channel->id;
i++;