Module: ngircd.git Branch: master Commit: 95e8320ca99eb9546102d10a329d708458257c56 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=95e83...

Author: Florian Westphal fw@strlen.de Date: Sun Jan 18 00:12:28 2009 +0100

irc.c: Fix handling of channels containing dots

commit 2546a13ad2949192eb70bf21e114ec60af287ee4 ('Cumulative Message Patch') broke PRIVMSG to channels containing dots.

Fix this by switching evaluation order: Check first if the target matches a existing channel and only do a check for target masks if that failed.

PRIVMSG with host/server masks is described in RFC 2812, section 3.3.1.

Makes one wonder how a server is _really_ supposed to tell the difference between hostmasks and channel names.

Sigh.

---

src/ngircd/irc.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index 47f8652..e5f5bbd 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -467,18 +467,18 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors) Req->argv[1])) return DISCONNECTED; } else if (ForceType != CLIENT_SERVICE + && (chan = Channel_Search(currentTarget))) { + /* channel */ + if (!Channel_Write(chan, from, Client, Req->command, + SendErrors, Req->argv[1])) + return DISCONNECTED; + } else if (ForceType != CLIENT_SERVICE && strchr("$#", currentTarget[0]) && strchr(currentTarget, '.')) { /* targetmask */ if (!Send_Message_Mask(from, Req->command, currentTarget, Req->argv[1], SendErrors)) return DISCONNECTED; - } else if (ForceType != CLIENT_SERVICE - && (chan = Channel_Search(currentTarget))) { - /* channel */ - if (!Channel_Write(chan, from, Client, Req->command, - SendErrors, Req->argv[1])) - return DISCONNECTED; } else { if (!SendErrors) return CONNECTED;