Automated merge with ssh://hg.atheme.org//hg/charybdis

[irc/rqf/shadowircd.git] / modules / m_invite.c

diff --git a/modules/m_invite.c b/modules/m_invite.c
index 35e392ffaeabeca5bf2c542fd7f574c23e5f7e7f..cff1f83b8a5fc476550cb138e7f3999494bafabc 100644 (file)
--- a/modules/m_invite.c
+++ b/modules/m_invite.c
@@ -25,12 +25,11 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "common.h"
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"
@@ -53,7 +52,6 @@ DECLARE_MODULE_AV1(invite, NULL, NULL, invite_clist, NULL, NULL, "$Revision: 343
 static void add_invite(struct Channel *, struct Client *);
 
 /* m_invite()
- *      parv[0] - sender prefix
  *      parv[1] - user to invite
  *      parv[2] - channel name
  */
@@ -111,6 +109,16 @@ m_invite(struct Client *client_p, struct Client *source_p, int parc, const char
                return 0;
        }
 
+       if(((MyConnect(source_p) && !IsExemptResv(source_p)) ||
+                       (MyConnect(target_p) && !IsExemptResv(target_p))) &&
+               hash_find_resv(parv[2]))
+       {
+               sendto_one_numeric(source_p, ERR_BADCHANNAME,
+                                  form_str(ERR_BADCHANNAME),
+                                  parv[2]);
+               return 0;
+       }
+
        if((chptr = find_channel(parv[2])) == NULL)
        {
                sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL,