Merge autogen.sh changes

[ngircd-alex.git] / src / ngircd / irc-mode.c

diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c
index 51eeed7b753673f2af7021e52382498b2590480c..f4e3e0f92696bde34fc02b76de825c99585ed00d 100644 (file)
--- a/src/ngircd/irc-mode.c
+++ b/src/ngircd/irc-mode.c
@@ -280,12 +280,17 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel )
        /* Handle channel and channel-user modes */
 
        char the_modes[COMMAND_LEN], the_args[COMMAND_LEN], x[2], argadd[CLIENT_PASS_LEN], *mode_ptr;
-       bool ok, set, modeok = true, skiponce, use_servermode = false;
+       bool ok, set, modeok = true, skiponce, use_servermode = false, retval;
        int mode_arg, arg_arg;
        CLIENT *client;
        long l;
        size_t len;
 
+       /* Are modes allowed on channel? */
+       if (Channel_Name(Channel)[0] == '+')
+               return IRC_WriteStrClient(Client, ERR_NOCHANMODES_MSG,
+                               Client_ID(Client), Channel_Name(Channel));
+
        /* Mode request: let's answer it :-) */
        if (Req->argc <= 1)
                return Channel_Mode_Answer_Request(Origin, Channel);
@@ -517,42 +522,22 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel )
                        continue;
                }
 
-               if (set) {
-                       /* Set mode */
-                       if (client) {
-                               /* Channel-User-Mode */
-                               if (Channel_UserModeAdd(Channel, client, x[0])) {
-                                       strlcat(the_args, " ", sizeof(the_args));
-                                       strlcat(the_args, Client_ID(client), sizeof(the_args));
-                                       strlcat(the_modes, x, sizeof(the_modes));
-                                       Log(LOG_DEBUG, "User \"%s\": Mode change on %s, now \"%s\"",
-                                               Client_Mask(client), Channel_Name(Channel), Channel_UserModes(Channel, client));
-                               }
-                       } else {
-                               /* Channel-Mode */
-                               if (Channel_ModeAdd( Channel, x[0])) {
-                                       strlcat(the_modes, x, sizeof(the_modes));
-                                       Log(LOG_DEBUG, "Channel %s: Mode change, now \"%s\".", Channel_Name(Channel), Channel_Modes(Channel));
-                               }
+               if (client) {
+                       /* Channel-User-Mode */
+                       retval = set ? Channel_UserModeAdd(Channel, client, x[0]) : Channel_UserModeDel(Channel, client, x[0]);
+                       if (retval) {
+                               strlcat(the_args, " ", sizeof(the_args));
+                               strlcat(the_args, Client_ID(client), sizeof(the_args));
+                               strlcat(the_modes, x, sizeof(the_modes));
+                               Log(LOG_DEBUG, "User \"%s\": Mode change on %s, now \"%s\"",
+                                       Client_Mask(client), Channel_Name(Channel), Channel_UserModes(Channel, client));
                        }
                } else {
-                       /* Unset mode */
-                       if (client) {
-                               /* Channel-User-Mode */
-                               if (Channel_UserModeDel(Channel, client, x[0])) {
-                                       strlcat(the_args, " ", sizeof(the_args));
-                                       strlcat(the_args, Client_ID(client), sizeof(the_args));
-                                       strlcat(the_modes, x, sizeof(the_modes));
-                                       Log(LOG_DEBUG, "User \"%s\": Mode change on %s, now \"%s\"",
-                                               Client_Mask(client), Channel_Name(Channel), Channel_UserModes(Channel, client));
-                               }
-                       } else {
-                               /* Channel-Mode */
-                               if (Channel_ModeDel(Channel, x[0])) {
-                                       strlcat(the_modes, x, sizeof(the_modes));
-                                       Log(LOG_DEBUG, "Channel %s: Mode change, now \"%s\".",
-                                               Channel_Name(Channel), Channel_Modes(Channel));
-                               }
+                       /* Channel-Mode */
+                       retval = set ? Channel_ModeAdd(Channel, x[0]) : Channel_ModeDel(Channel, x[0]);
+                       if (retval) {
+                               strlcat(the_modes, x, sizeof(the_modes));
+                               Log(LOG_DEBUG, "Channel %s: Mode change, now \"%s\".", Channel_Name(Channel), Channel_Modes(Channel));
                        }
                }