Implement IRC commands SERVICE, SERVLIST, and SQUERY as dummy functions

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

diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c
index 32f911a200f6269eed0f51420a8523ea980c0b78..c923404bff904382db95359a444ec6501129ec85 100644 (file)
--- a/src/ngircd/channel.c
+++ b/src/ngircd/channel.c
@@ -237,7 +237,7 @@ Channel_Part(CLIENT * Client, CLIENT * Origin, const char *Name, const char *Rea
 
 
 GLOBAL void
-Channel_Kick( CLIENT *Client, CLIENT *Origin, char *Name, char *Reason )
+Channel_Kick( CLIENT *Client, CLIENT *Origin, const char *Name, const char *Reason )
 {
        CHANNEL *chan;
 
@@ -480,7 +480,10 @@ Channel_IsValidName( const char *Name )
 {
        assert( Name != NULL );
 
-       if(( Name[0] != '#' ) || ( strlen( Name ) >= CHANNEL_NAME_LEN )) return false;
+       if (strchr("+#", Name[0]) == NULL)
+               return false;
+       if (strlen(Name) >= CHANNEL_NAME_LEN)
+               return false;
 
        return Name[strcspn(Name, " ,:\007")] == 0;
 } /* Channel_IsValidName */
@@ -892,7 +895,7 @@ Remove_Client( int Type, CHANNEL *Chan, CLIENT *Client, CLIENT *Origin, const ch
                                IRC_WriteStrClientPrefix(Client, Origin, "KICK %s %s :%s",
                                                                c->name, Client_ID( Client ), Reason);
                        }
-                       LogDebug("User \"%s\" has been kicked of \"%s\" by \"%s\": %s.",
+                       LogDebug("User \"%s\" has been kicked off \"%s\" by \"%s\": %s.",
                                Client_Mask( Client ), c->name, Client_ID(Origin), Reason);
                        break;
                default: /* PART */