Always enable modeless channels.

Modeless channels (+channels) are described in RFC 2811;
so my modifications to
530112b114
('Add support for modeless channels')
to disable +channels for --strict-rfc configurations
were wrong. This reverts those changes.
This commit is contained in:
Florian Westphal 2008-05-01 18:00:33 +02:00 committed by Alexander Barton
parent 60acc62af7
commit f7c2e8223f
3 changed files with 5 additions and 13 deletions

View File

@ -480,14 +480,8 @@ Channel_IsValidName( const char *Name )
{
assert( Name != NULL );
switch (Name[0]) {
case '#': break;
#ifndef STRICT_RFC
case '+': /* modeless channel */
break;
#endif
default: return false;
}
if (strchr("+#", Name[0]) == NULL)
return false;
if (strlen(Name) >= CHANNEL_NAME_LEN)
return false;

View File

@ -242,10 +242,9 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
if (!chan) {
/*
* New Channel: first user will be channel operator
* unless this is a modeless channel... */
#ifndef STRICT_RFC
* unless this is a modeless channel.
*/
if (*channame != '+')
#endif
flags = "o";
} else
if (!join_allowed(Client, target, chan, channame, key))

View File

@ -286,12 +286,11 @@ Channel_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel )
long l;
size_t len;
#ifndef STRICT_RFC
/* Are modes allowed on channel? */
if (Channel_Name(Channel)[0] == '+')
return IRC_WriteStrClient(Client, ERR_NOCHANMODES_MSG,
Client_ID(Client), Channel_Name(Channel));
#endif
/* Mode request: let's answer it :-) */
if (Req->argc <= 1)
return Channel_Mode_Answer_Request(Origin, Channel);