Don't abort startup when setgid/setuid() fails with EINVAL

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

diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c
index 0b194a0968bae23f89c56798a9f300e13b55fb99..2d77ec9c6c7591f463b5b7095473c123dd310f60 100644 (file)
--- a/src/ngircd/channel.c
+++ b/src/ngircd/channel.c
@@ -130,19 +130,16 @@ 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);
+                       LogDebug("Evaluating predefined channel modes for \"%s\" ...", name);
                        Req.argv[0] = name;
                        Req.prefix = Client_ID(Client_ThisServer());
                        Req.command = "MODE";
@@ -151,26 +148,45 @@ Channel_InitPredefined( void )
                        for (n = 0; n < conf_chan->modes_num; n++) {
                                Req.argc = 1;
                                strlcpy(modes, conf_chan->modes[n], sizeof(modes));
-                               Log(LOG_DEBUG, "Evaluate \"MODE %s %s\".", name, modes);
+                               LogDebug("Evaluate \"MODE %s %s\".", name, modes);
                                c = strtok(modes, " ");
                                while (c && Req.argc < 15) {
                                        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 */
+                               /* Original channel modes strings 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\" (%s, user limit %d).",
+                   new_chan->name, new_chan->modes,
+                   new_chan->key[0] ? "channel key set" : "no channel key",
+                   new_chan->maxusers);
        }
-       if (channel_count)
-               array_free(&Conf_Channels);
 
        /* Make sure the local &SERVER channel exists */
        if (!Channel_Search("&SERVER")) {
@@ -763,10 +779,28 @@ Channel_UserModes( CHANNEL *Chan, CLIENT *Client )
 } /* Channel_UserModes */
 
 
+/**
+ * Test if a user has a given channel user mode.
+ *
+ * @param Chan The channel to check.
+ * @param Client The client to check.
+ * @param Mode The channel user mode to test for.
+ * @return true if the user has the given channel user mode set.
+ */
 GLOBAL bool
 Channel_UserHasMode( CHANNEL *Chan, CLIENT *Client, char Mode )
 {
-       return strchr(Channel_UserModes(Chan, Client), Mode) != NULL;
+       char *channel_user_modes;
+
+       assert(Chan != NULL);
+       assert(Client != NULL);
+       assert(Mode > 0);
+
+       channel_user_modes = Channel_UserModes(Chan, Client);
+       if (!channel_user_modes || !*channel_user_modes)
+               return false;
+
+       return strchr(channel_user_modes, Mode) != NULL;
 } /* Channel_UserHasMode */