From: Pekka Riikonen <priikone@silcnet.org>
Date: Sat, 28 Feb 2004 15:28:12 +0000 (+0000)
Subject: 	Set user limit to zero when ulimit mode is unset.
X-Git-Tag: silc.toolkit.0.9.12~5
X-Git-Url: http://git.silcnet.org/gitweb/?a=commitdiff_plain;h=19c1bb08df3f9c1ab3940f1f6925cf9b49823c63;p=silc.git

	Set user limit to zero when ulimit mode is unset.
---

diff --git a/lib/silcclient/client_notify.c b/lib/silcclient/client_notify.c
index 5c2639eb..cd4fea9d 100644
--- a/lib/silcclient/client_notify.c
+++ b/lib/silcclient/client_notify.c
@@ -848,6 +848,8 @@ void silc_client_notify_by_server(SilcClient client,
       tmp = silc_argument_get_arg_type(args, 8, &tmp_len);
       if (tmp && tmp_len == 4)
         SILC_GET32_MSB(channel->user_limit, tmp);
+      if (!(channel->mode & SILC_CHANNEL_MODE_ULIMIT))
+        channel->user_limit = 0;
 
       /* Get the channel public key that was added or removed */
       tmp = silc_argument_get_arg_type(args, 7, &tmp_len);
diff --git a/lib/silcclient/command_reply.c b/lib/silcclient/command_reply.c
index d79e6329..6f024acb 100644
--- a/lib/silcclient/command_reply.c
+++ b/lib/silcclient/command_reply.c
@@ -1140,6 +1140,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(join)
   tmp = silc_argument_get_arg_type(cmd->args, 17, &len);
   if (tmp && len == 4)
     SILC_GET32_MSB(channel->user_limit, tmp);
+  if (!(channel->mode & SILC_CHANNEL_MODE_ULIMIT))
+    channel->user_limit = 0;
 
   /* Get channel public key list */
   tmp = silc_argument_get_arg_type(cmd->args, 16, &len);
@@ -1316,6 +1318,8 @@ SILC_CLIENT_CMD_REPLY_FUNC(cmode)
   tmp = silc_argument_get_arg_type(cmd->args, 6, &len);
   if (tmp && len == 4)
     SILC_GET32_MSB(channel->user_limit, tmp);
+  if (!(channel->mode & SILC_CHANNEL_MODE_ULIMIT))
+    channel->user_limit = 0;
 
   /* Get channel public key(s) */
   tmp = silc_argument_get_arg_type(cmd->args, 5, &len);