Don't allow SQUERY to send to "target masks" and channels; only services!

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index 8d2291fe20a0dabdbfe0e0ac109bf1cc18c346a5..b88d5d7db7cc7a1320eb94027ca6835518c9a4cc 100644 (file)
--- a/src/ngircd/irc.c
+++ b/src/ngircd/irc.c
@@ -454,13 +454,15 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors)
                                                      Req->command, Client_ID(cl),
                                                      Req->argv[1]))
                                return DISCONNECTED;
-               } else if (strchr("$#", currentTarget[0])
+               } 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 ((chan = Channel_Search(currentTarget))) {
+               } else if (ForceType != CLIENT_SERVICE
+                          && (chan = Channel_Search(currentTarget))) {
                        /* channel */
                        if (!Channel_Write(chan, from, Client, Req->command,
                                           SendErrors, Req->argv[1]))