Show SSL status in WHOIS, numeric 275

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

diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c
index 2c142288fd446d04dd48322c9da121a960a138a5..d22d32f01acc3c82a787ecc375a6fe041cc57e39 100644 (file)
--- a/src/ngircd/irc-mode.c
+++ b/src/ngircd/irc-mode.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2008 Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2010 Alexander Barton (alex@barton.de)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -284,14 +284,13 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
 {
        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, retval;
+       bool connected, 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] == '+')
+       if (Channel_IsModeless(Channel))
                return IRC_WriteStrClient(Client, ERR_NOCHANMODES_MSG,
                                Client_ID(Client), Channel_Name(Channel));
 
@@ -345,7 +344,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
        the_args[0] = '\0';
 
        x[1] = '\0';
-       ok = CONNECTED;
+       connected = CONNECTED;
        while (mode_ptr) {
                if (!skiponce)
                        mode_ptr++;
@@ -402,10 +401,11 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
                case 'n': /* Only members can write */
                case 's': /* Secret channel */
                case 't': /* Topic locked */
+               case 'z': /* Secure connections only */
                        if (modeok)
                                x[0] = *mode_ptr;
                        else
-                               ok = IRC_WriteStrClient(Origin,
+                               connected = IRC_WriteStrClient(Origin,
                                        ERR_CHANOPRIVSNEEDED_MSG,
                                        Client_ID(Origin), Channel_Name(Channel));
                        break;
@@ -414,7 +414,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
                                if (modeok)
                                        x[0] = *mode_ptr;
                                else
-                                       ok = IRC_WriteStrClient(Origin,
+                                       connected = IRC_WriteStrClient(Origin,
                                                ERR_CHANOPRIVSNEEDED_MSG,
                                                Client_ID(Origin),
                                                Channel_Name(Channel));
@@ -429,7 +429,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
                                                sizeof(argadd));
                                        x[0] = *mode_ptr;
                                } else {
-                                       ok = IRC_WriteStrClient(Origin,
+                                       connected = IRC_WriteStrClient(Origin,
                                                ERR_CHANOPRIVSNEEDED_MSG,
                                                Client_ID(Origin),
                                                Channel_Name(Channel));
@@ -437,9 +437,10 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
                                Req->argv[arg_arg][0] = '\0';
                                arg_arg++;
                        } else {
-                               ok = IRC_WriteStrClient(Origin,
+                               connected = IRC_WriteStrClient(Origin,
                                        ERR_NEEDMOREPARAMS_MSG,
                                        Client_ID(Origin), Req->command);
+                               goto chan_exit;
                        }
                        break;
                case 'l': /* Member limit */
@@ -447,7 +448,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
                                if (modeok)
                                        x[0] = *mode_ptr;
                                else
-                                       ok = IRC_WriteStrClient(Origin,
+                                       connected = IRC_WriteStrClient(Origin,
                                                ERR_CHANOPRIVSNEEDED_MSG,
                                                Client_ID(Origin),
                                                Channel_Name(Channel));
@@ -464,7 +465,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
                                                x[0] = *mode_ptr;
                                        }
                                } else {
-                                       ok = IRC_WriteStrClient(Origin,
+                                       connected = IRC_WriteStrClient(Origin,
                                                ERR_CHANOPRIVSNEEDED_MSG,
                                                Client_ID(Origin),
                                                Channel_Name(Channel));
@@ -472,9 +473,10 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
                                Req->argv[arg_arg][0] = '\0';
                                arg_arg++;
                        } else {
-                               ok = IRC_WriteStrClient(Origin,
+                               connected = IRC_WriteStrClient(Origin,
                                        ERR_NEEDMOREPARAMS_MSG,
                                        Client_ID(Origin), Req->command);
+                               goto chan_exit;
                        }
                        break;
                case 'P': /* Persistent channel */
@@ -483,13 +485,13 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
                                 * set the 'P' channel mode! */
                                if (set && !(Client_OperByMe(Client)
                                    || Client_Type(Client) == CLIENT_SERVER))
-                                       ok = IRC_WriteStrClient(Origin,
+                                       connected = IRC_WriteStrClient(Origin,
                                                ERR_NOPRIVILEGES_MSG,
                                                Client_ID(Origin));
                                else
                                        x[0] = 'P';
                        } else
-                               ok = IRC_WriteStrClient(Origin,
+                               connected = IRC_WriteStrClient(Origin,
                                        ERR_CHANOPRIVSNEEDED_MSG,
                                        Client_ID(Origin),
                                        Channel_Name(Channel));
@@ -503,12 +505,12 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
                                        if (client)
                                                x[0] = *mode_ptr;
                                        else
-                                               ok = IRC_WriteStrClient(Client,
+                                               connected = IRC_WriteStrClient(Client,
                                                        ERR_NOSUCHNICK_MSG,
                                                        Client_ID(Client),
                                                        Req->argv[arg_arg]);
                                } else {
-                                       ok = IRC_WriteStrClient(Origin,
+                                       connected = IRC_WriteStrClient(Origin,
                                                ERR_CHANOPRIVSNEEDED_MSG,
                                                Client_ID(Origin),
                                                Channel_Name(Channel));
@@ -516,9 +518,10 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
                                Req->argv[arg_arg][0] = '\0';
                                arg_arg++;
                        } else {
-                               ok = IRC_WriteStrClient(Origin,
+                               connected = IRC_WriteStrClient(Origin,
                                        ERR_NEEDMOREPARAMS_MSG,
                                        Client_ID(Origin), Req->command);
+                               goto chan_exit;
                        }
                        break;
                /* --- Channel lists --- */
@@ -527,7 +530,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
                        if (arg_arg > mode_arg) {
                                /* modify list */
                                if (modeok) {
-                                       ok = set
+                                       connected = set
                                           ? Add_Ban_Invite(*mode_ptr, Origin,
                                                Client, Channel,
                                                Req->argv[arg_arg])
@@ -535,7 +538,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
                                                Client, Channel,
                                                Req->argv[arg_arg]);
                                } else {
-                                       ok = IRC_WriteStrClient(Origin,
+                                       connected = IRC_WriteStrClient(Origin,
                                                ERR_CHANOPRIVSNEEDED_MSG,
                                                Client_ID(Origin),
                                                Channel_Name(Channel));
@@ -555,7 +558,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
                            set ? '+' : '-', *mode_ptr, Client_ID(Origin),
                            Channel_Name(Channel));
                        if (Client_Type(Client) != CLIENT_SERVER)
-                               ok = IRC_WriteStrClient(Origin,
+                               connected = IRC_WriteStrClient(Origin,
                                        ERR_UMODEUNKNOWNFLAG2_MSG,
                                        Client_ID(Origin),
                                        set ? '+' : '-', *mode_ptr);
@@ -563,7 +566,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
                        goto chan_exit;
                }       /* switch() */
 
-               if (!ok)
+               if (!connected)
                        break;
 
                /* Is there a valid mode change? */
@@ -644,7 +647,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
                        if (use_servermode)
                                Origin = Client_ThisServer();
                        /* Send reply to client and inform other servers and channel users */
-                       ok = IRC_WriteStrClientPrefix(Client, Origin,
+                       connected = IRC_WriteStrClientPrefix(Client, Origin,
                                        "MODE %s %s%s", Channel_Name(Channel),
                                        the_modes, the_args);
                        /* Only forward requests for non-local channels */
@@ -659,7 +662,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
        }
 
        IRC_SetPenalty(Client, 1);
-       return CONNECTED;
+       return connected;
 } /* Channel_Mode */
 
 
@@ -669,12 +672,10 @@ IRC_AWAY( CLIENT *Client, REQUEST *Req )
        assert( Client != NULL );
        assert( Req != NULL );
 
-       /* Falsche Anzahl Parameter? */
        if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
        if(( Req->argc == 1 ) && (Req->argv[0][0] ))
        {
-               /* AWAY setzen */
                Client_SetAway( Client, Req->argv[0] );
                Client_ModeAdd( Client, 'a' );
                IRC_WriteStrServersPrefix( Client, Client, "MODE %s :+a", Client_ID( Client ));
@@ -682,7 +683,6 @@ IRC_AWAY( CLIENT *Client, REQUEST *Req )
        }
        else
        {
-               /* AWAY loeschen */
                Client_ModeDel( Client, 'a' );
                IRC_WriteStrServersPrefix( Client, Client, "MODE %s :-a", Client_ID( Client ));
                return IRC_WriteStrClient( Client, RPL_UNAWAY_MSG, Client_ID( Client ));
@@ -750,21 +750,19 @@ Del_Ban_Invite(int what, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, const
 static bool
 Send_ListChange( char *Mode, CLIENT *Prefix, CLIENT *Client, CHANNEL *Channel, const char *Mask )
 {
-       /* Bestaetigung an Client schicken & andere Server sowie Channel-User informieren */
-
        bool ok;
 
        if( Client_Type( Client ) == CLIENT_USER )
        {
-               /* Bestaetigung an Client */
+               /* send confirmation to client */
                ok = IRC_WriteStrClientPrefix( Client, Prefix, "MODE %s %s %s", Channel_Name( Channel ), Mode, Mask );
        }
        else ok = true;
 
-       /* an andere Server */
+       /* to other servers */
        IRC_WriteStrServersPrefix( Client, Prefix, "MODE %s %s %s", Channel_Name( Channel ), Mode, Mask );
 
-       /* und lokale User im Channel */
+       /* and local users in channel */
        IRC_WriteStrChannelPrefix( Client, Channel, Prefix, false, "MODE %s %s %s", Channel_Name( Channel ), Mode, Mask );
        
        return ok;