New configuration option "NoIdent" to disable IDENT lookups

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

diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c
index d774e576af95882ae134c9b2341a205752709dc9..609bbf5b5e976c19a30f2ba7e32103b482ee5cbb 100644 (file)
--- a/src/ngircd/channel.c
+++ b/src/ngircd/channel.c
@@ -63,8 +63,16 @@ static bool Delete_Channel PARAMS(( CHANNEL *Chan ));
 GLOBAL void
 Channel_Init( void )
 {
+       CHANNEL *sc;
+
        My_Channels = NULL;
        My_Cl2Chan = NULL;
+
+       sc = Channel_Create("&SERVER");
+       if (sc) {
+               Channel_SetModes(sc, "mnPt");
+               Channel_SetTopic(sc, Client_ThisServer(), "Server Messages");
+       }
 } /* Channel_Init */
 
 
@@ -251,16 +259,20 @@ Channel_Part(CLIENT * Client, CLIENT * Origin, const char *Name, const char *Rea
 } /* Channel_Part */
 
 
-/* Kick user from Channel */
+/**
+ * Kick user from Channel
+ */
 GLOBAL void
-Channel_Kick( CLIENT *Client, CLIENT *Origin, const char *Name, const char *Reason )
+Channel_Kick(CLIENT *Peer, CLIENT *Target, CLIENT *Origin, const char *Name,
+            const char *Reason )
 {
        CHANNEL *chan;
 
-       assert( Client != NULL );
-       assert( Origin != NULL );
-       assert( Name != NULL );
-       assert( Reason != NULL );
+       assert(Peer != NULL);
+       assert(Target != NULL);
+       assert(Origin != NULL);
+       assert(Name != NULL);
+       assert(Reason != NULL);
 
        /* Check that channel exists */
        chan = Channel_Search( Name );
@@ -270,29 +282,32 @@ Channel_Kick( CLIENT *Client, CLIENT *Origin, const char *Name, const char *Reas
                return;
        }
 
-       /* Check that user is on the specified channel */
-       if( ! Channel_IsMemberOf( chan, Origin ))
-       {
-               IRC_WriteStrClient( Origin, ERR_NOTONCHANNEL_MSG, Client_ID( Origin ), Name );
-               return;
-       }
+       if (Client_Type(Peer) != CLIENT_SERVER &&
+           Client_Type(Origin) != CLIENT_SERVICE) {
+               /* Check that user is on the specified channel */
+               if (!Channel_IsMemberOf(chan, Origin)) {
+                       IRC_WriteStrClient( Origin, ERR_NOTONCHANNEL_MSG,
+                                          Client_ID(Origin), Name);
+                       return;
+               }
 
-       /* Check if user has operator status */
-       if( ! strchr( Channel_UserModes( chan, Origin ), 'o' ))
-       {
-               IRC_WriteStrClient( Origin, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( Origin ), Name);
-               return;
+               /* Check if user has operator status */
+               if (!strchr(Channel_UserModes(chan, Origin), 'o')) {
+                       IRC_WriteStrClient(Origin, ERR_CHANOPRIVSNEEDED_MSG,
+                                          Client_ID(Origin), Name);
+                       return;
+               }
        }
 
        /* Check that the client to be kicked is on the specified channel */
-       if( ! Channel_IsMemberOf( chan, Client ))
-       {
-               IRC_WriteStrClient( Origin, ERR_USERNOTINCHANNEL_MSG, Client_ID( Origin ), Client_ID( Client ), Name );
+       if (!Channel_IsMemberOf(chan, Target)) {
+               IRC_WriteStrClient(Origin, ERR_USERNOTINCHANNEL_MSG,
+                                  Client_ID(Origin), Client_ID(Target), Name );
                return;
        }
 
        /* Kick Client from channel */
-       Remove_Client( REMOVE_KICK, chan, Client, Origin, Reason, true);
+       Remove_Client( REMOVE_KICK, chan, Target, Origin, Reason, true);
 } /* Channel_Kick */
 
 
@@ -502,7 +517,7 @@ Channel_IsValidName( const char *Name )
        if (strlen(Name) <= 1)
                return false;
 #endif
-       if (strchr("+#", Name[0]) == NULL)
+       if (strchr("#&+", Name[0]) == NULL)
                return false;
        if (strlen(Name) >= CHANNEL_NAME_LEN)
                return false;
@@ -740,6 +755,10 @@ Can_Send_To_Channel(CHANNEL *Chan, CLIENT *From)
 
        is_member = has_voice = is_op = false;
 
+       /* The server itself always can send messages :-) */
+       if (Client_ThisServer() == From)
+               return true;
+
        if (Channel_IsMemberOf(Chan, From)) {
                is_member = true;
                if (strchr(Channel_UserModes(Chan, From), 'v'))
@@ -868,6 +887,11 @@ Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, const ch
        assert( Origin != NULL );
        assert( Reason != NULL );
 
+       /* Do not inform other servers if the channel is local to this server,
+        * regardless of what the caller requested! */
+       if(InformServer)
+               InformServer = !Channel_IsLocal(Chan);
+
        last_cl2chan = NULL;
        cl2chan = My_Cl2Chan;
        while( cl2chan )
@@ -889,14 +913,16 @@ Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, const ch
        switch( Type )
        {
                case REMOVE_QUIT:
-                       /* QUIT: other servers have already been notified, see Client_Destroy();
-                        * so only inform other clients in same channel. */
+                       /* QUIT: other servers have already been notified, 
+                        * see Client_Destroy(); so only inform other clients
+                        * in same channel. */
                        assert( InformServer == false );
                        LogDebug("User \"%s\" left channel \"%s\" (%s).",
                                        Client_Mask( Client ), c->name, Reason );
                        break;
                case REMOVE_KICK:
-                       /* User was KICKed: inform other servers and all users in channel */
+                       /* User was KICKed: inform other servers (public
+                        * channels) and all users in the channel */
                        if( InformServer )
                                IRC_WriteStrServersPrefix( Client_NextHop( Origin ),
                                        Origin, "KICK %s %s :%s", c->name, Client_ID( Client ), Reason);
@@ -999,6 +1025,26 @@ Channel_ShowInvites( CLIENT *Client, CHANNEL *Channel )
 }
 
 
+/**
+ * Log a message to the local &SERVER channel, if it exists.
+ */
+GLOBAL void
+Channel_LogServer(char *msg)
+{
+       CHANNEL *sc;
+       CLIENT *c;
+
+       assert(msg != NULL);
+
+       sc = Channel_Search("&SERVER");
+       if (!sc)
+               return;
+
+       c = Client_ThisServer();
+       Channel_Write(sc, c, c, "PRIVMSG", false, msg);
+} /* Channel_LogServer */
+
+
 static CL2CHAN *
 Get_First_Cl2Chan( CLIENT *Client, CHANNEL *Chan )
 {
@@ -1055,5 +1101,4 @@ Delete_Channel( CHANNEL *Chan )
        return true;
 } /* Delete_Channel */
 
-
 /* -eof- */