projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged silc_1_0_branch to trunk.
[silc.git]
/
apps
/
silcd
/
server_util.c
diff --git
a/apps/silcd/server_util.c
b/apps/silcd/server_util.c
index 1f202168f5e55317be877f49083c5c4e1d1caa16..05197afcf13eeed65a0a360372def2b7bdfbc8c4 100644
(file)
--- a/
apps/silcd/server_util.c
+++ b/
apps/silcd/server_util.c
@@
-1893,11
+1893,16
@@
bool silc_server_inviteban_process(SilcServer server, SilcHashTable list,
tmp = silc_argument_get_first_arg(args, &type, &len);
while (tmp) {
if (type == 1) {
tmp = silc_argument_get_first_arg(args, &type, &len);
while (tmp) {
if (type == 1) {
- /* Check validity of the string */
+ /* Check validity of the string. Actually we should parse the
+ whole string and verify all components individually. */
if (!silc_utf8_valid(tmp, len) || !len) {
tmp = silc_argument_get_next_arg(args, &type, &len);
continue;
}
if (!silc_utf8_valid(tmp, len) || !len) {
tmp = silc_argument_get_next_arg(args, &type, &len);
continue;
}
+ if (strchr(tmp, ',')) {
+ tmp = silc_argument_get_next_arg(args, &type, &len);
+ continue;
+ }
/* Check if the string is added already */
silc_hash_table_list(list, &htl);
/* Check if the string is added already */
silc_hash_table_list(list, &htl);
@@
-1978,11
+1983,16
@@
bool silc_server_inviteban_process(SilcServer server, SilcHashTable list,
tmp = silc_argument_get_first_arg(args, &type, &len);
while (tmp) {
if (type == 1) {
tmp = silc_argument_get_first_arg(args, &type, &len);
while (tmp) {
if (type == 1) {
- /* Check validity of the string */
+ /* Check validity of the string. Actually we should parse the
+ whole string and verify all components individually. */
if (!silc_utf8_valid(tmp, len)) {
tmp = silc_argument_get_next_arg(args, &type, &len);
continue;
}
if (!silc_utf8_valid(tmp, len)) {
tmp = silc_argument_get_next_arg(args, &type, &len);
continue;
}
+ if (strchr(tmp, ',')) {
+ tmp = silc_argument_get_next_arg(args, &type, &len);
+ continue;
+ }
/* Delete from the list */
silc_hash_table_list(list, &htl);
/* Delete from the list */
silc_hash_table_list(list, &htl);
@@
-2097,8
+2107,8
@@
silc_server_process_channel_pk(SilcServer server,
if (type == 0x00) {
/* Add new public key to channel public key list */
if (type == 0x00) {
/* Add new public key to channel public key list */
- SILC_LOG_DEBUG(("Add new channel public key to channel %s",
- channel->channel_name));
+ SILC_LOG_DEBUG(("Add new channel public key
%s
to channel %s",
+ ch
pk->identifier, ch
annel->channel_name));
/* Check for resource limit */
if (silc_hash_table_count(channel->channel_pubkeys) > 64) {
/* Check for resource limit */
if (silc_hash_table_count(channel->channel_pubkeys) > 64) {