Update Client_SetHostname() to not use strpbrk()

[ngircd-alex.git] / src / ngircd / channel.c

diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c
index 0b194a0968bae23f89c56798a9f300e13b55fb99..3282a8d0460533301ca0c4f58675548fa35db833 100644 (file)
--- a/src/ngircd/channel.c
+++ b/src/ngircd/channel.c
@@ -130,16 +130,13 @@ Channel_InitPredefined( void )
                                                        conf_chan->name);
                        continue;
                }
-               Log(LOG_INFO, "Created pre-defined channel \"%s\".",
-                                               conf_chan->name);
-
                Channel_ModeAdd(new_chan, 'P');
 
                if (conf_chan->topic[0])
                        Channel_SetTopic(new_chan, NULL, conf_chan->topic);
 
                /* Evaluate modes strings with fake requests */
-               if(conf_chan->modes_num) {
+               if (conf_chan->modes_num) {
                        /* Prepare fake request structure */
                        strlcpy(name, conf_chan->name, sizeof(name));
                        Log(LOG_INFO, "Evaluating predefined channel modes for \"%s\".", name);
@@ -157,17 +154,37 @@ Channel_InitPredefined( void )
                                        Req.argv[Req.argc++] = c;
                                        c = strtok(0, " ");
                                }
-                               if(Req.argc > 1)
+
+                               if (Req.argc > 1) {
+                                       /* Handling of legacy "Key" and "MaxUsers" settings:
+                                        * Enforce setting the respective mode(s), to support
+                                        * the legacy "Mode = kl" notation, which was valid but
+                                        * is an invalid MODE string: key and limit are missing!
+                                        * So set them manually when "k" or "l" are detected in
+                                        * the first MODE parameter ... */
+                                       if (Req.argc > 1 && strchr(Req.argv[1], 'k')) {
+                                               Channel_SetKey(new_chan, conf_chan->key);
+                                               Channel_ModeAdd(new_chan, 'k');
+                                       }
+                                       if (strchr(Req.argv[1], 'l')) {
+                                               Channel_SetMaxUsers(new_chan, conf_chan->maxusers);
+                                               Channel_ModeAdd(new_chan, 'l');
+                                       }
+
                                        IRC_MODE(Client_ThisServer(), &Req);
+                               }
 
                                /* Original channel modes srings are no longer needed */
                                free(conf_chan->modes[n]);
                        }
                }
 
-               Channel_SetKey(new_chan, conf_chan->key);
-               Channel_SetMaxUsers(new_chan, conf_chan->maxusers);
                Set_KeyFile(new_chan, conf_chan->keyfile);
+
+               Log(LOG_INFO,
+                   "Created pre-defined channel \"%s\", mode \"%s\" (key \"%s\", limit %d).",
+                   new_chan->name, new_chan->modes, new_chan->key,
+                   new_chan->maxusers);
        }
        if (channel_count)
                array_free(&Conf_Channels);