Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2004-05-15 15:36:21 UTC
Modified files:
ChangeLog ircd/m_invite.c
Log message:
Forward port /invite changes from 2.10.11.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.402 ircu2.10/ChangeLog:1.403
--- ircu2.10/ChangeLog:1.402 Sat May 15 08:19:09 2004
+++ ircu2.10/ChangeLog Sat May 15 08:36:10 2004
@@ -1,3 +1,15 @@
+2004-05-15 Isomer <[EMAIL PROTECTED]>
+
+ [Original ChangeLog date: 2004-03-20 -MDP]
+
+ * ircd/m_invite.c: Disallow invites to non existant channels
+
+2004-05-15 David Mansell <[EMAIL PROTECTED]>
+
+ [Original ChangeLog date: 2003-04-26 -MDP]
+
+ * ircd/m_invite.c: let +k users invite into channels they aren't on.
+
2004-05-15 hikari <[EMAIL PROTECTED]>
[Original ChangeLog date: 2003-07-13 -MDP]
Index: ircu2.10/ircd/m_invite.c
diff -u ircu2.10/ircd/m_invite.c:1.12 ircu2.10/ircd/m_invite.c:1.13
--- ircu2.10/ircd/m_invite.c:1.12 Tue Jan 7 02:06:41 2003
+++ ircu2.10/ircd/m_invite.c Sat May 15 08:36:11 2004
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: m_invite.c,v 1.12 2003/01/07 10:06:41 a1kmm Exp $
+ * $Id: m_invite.c,v 1.13 2004/05/15 15:36:11 entrope Exp $
*/
/*
@@ -146,25 +146,7 @@
return 0;
if (!(chptr = FindChannel(parv[2]))) {
- if (IsLocalChannel(parv[2]))
- {
- send_reply(sptr, ERR_NOTONCHANNEL, parv[2]);
- return 0;
- }
-
- /* Do not disallow to invite to non-existant #channels, otherwise they
- would simply first be created, causing only MORE bandwidth usage. */
-
- if (check_target_limit(sptr, acptr, cli_name(acptr), 0))
- return 0;
-
- send_reply(sptr, RPL_INVITING, cli_name(acptr), parv[2]);
-
- if (cli_user(acptr)->away)
- send_reply(sptr, RPL_AWAY, cli_name(acptr), cli_user(acptr)->away);
-
- sendcmdto_one(sptr, CMD_INVITE, acptr, "%s :%s", cli_name(acptr), parv[2]);
-
+ send_reply(sptr, ERR_NOTONCHANNEL, parv[2]);
return 0;
}
@@ -237,7 +219,7 @@
protocol_violation(sptr,"Too few arguments to invite");
return need_more_params(sptr,"INVITE");
}
- if ('#' != *parv[2]) {
+ if (!IsGlobalChannel(parv[2])) {
/*
* should not be sent
*/
@@ -267,7 +249,7 @@
return 0;
}
- if (!find_channel_member(sptr, chptr)) {
+ if (!IsChannelService(sptr) && !find_channel_member(sptr, chptr)) {
send_reply(sptr, ERR_NOTONCHANNEL, chptr->chname);
return 0;
}
----------------------- End of diff -----------------------
