} /* 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 );
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 */
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;
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 )
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);
return true;
} /* Delete_Channel */
-
/* -eof- */