Support for server certificate validation on server links [S2S-TLS]

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

diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c
index 3282a8d0460533301ca0c4f58675548fa35db833..2d77ec9c6c7591f463b5b7095473c123dd310f60 100644 (file)
--- a/src/ngircd/channel.c
+++ b/src/ngircd/channel.c
@@ -139,7 +139,7 @@ Channel_InitPredefined( void )
                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";
@@ -148,7 +148,7 @@ 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;
@@ -174,7 +174,7 @@ Channel_InitPredefined( void )
                                        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]);
                        }
                }
@@ -182,12 +182,11 @@ Channel_InitPredefined( void )
                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,
+                   "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")) {
@@ -780,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 */