Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2005-10-31 02:55:16 UTC
Modified files:
ChangeLog ircd/m_join.c
Log message:
Make walk_lchan logic match code on u2_10_12_branch.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.730 ircu2.10/ChangeLog:1.731
--- ircu2.10/ChangeLog:1.730 Sun Oct 30 18:14:47 2005
+++ ircu2.10/ChangeLog Sun Oct 30 18:55:06 2005
@@ -1,5 +1,10 @@
2005-10-30 Michael Poole <[EMAIL PROTECTED]>
+ * ircd/m_join.c (m_join): Reorganize to reduce edit distance from
+ previous version and match code on u2_10_12_branch.
+
+2005-10-30 Michael Poole <[EMAIL PROTECTED]>
+
* .cvsignore: Add autom4te.cache.
* ircd/.cvsignore: Add convert-conf.
Index: ircu2.10/ircd/m_join.c
diff -u ircu2.10/ircd/m_join.c:1.36 ircu2.10/ircd/m_join.c:1.37
--- ircu2.10/ircd/m_join.c:1.36 Sat Oct 29 18:28:57 2005
+++ ircu2.10/ircd/m_join.c Sun Oct 30 18:55:06 2005
@@ -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_join.c,v 1.36 2005/10/30 01:28:57 a1kmm Exp $
+ * $Id: m_join.c,v 1.37 2005/10/31 02:55:06 entrope Exp $
*/
#include "config.h"
@@ -212,28 +212,27 @@
&& !(flags & CHFL_CHANOP)
&& key && !strcmp(key, "OVERRIDE"))
{
- if (err == 0 && strcmp(chptr->mode.key, "OVERRIDE") &&
- strcmp(chptr->mode.apass, "OVERRIDE") &&
- strcmp(chptr->mode.upass, "OVERRIDE"))
- {
- send_reply(sptr, ERR_DONTCHEAT, chptr->chname);
- continue;
- }
- if (err != 0)
- {
- switch (err) {
- case ERR_INVITEONLYCHAN: err = 'i'; break;
- case ERR_CHANNELISFULL: err = 'l'; break;
- case ERR_BANNEDFROMCHAN: err = 'b'; break;
- case ERR_BADCHANNELKEY: err = 'k'; break;
- case ERR_NEEDREGGEDNICK: err = 'r'; break;
- default: err = '?'; break;
+ switch (err) {
+ case 0:
+ if (strcmp(chptr->mode.key, "OVERRIDE")
+ && strcmp(chptr->mode.apass, "OVERRIDE")
+ && strcmp(chptr->mode.upass, "OVERRIDE")) {
+ send_reply(sptr, err, chptr->chname);
+ continue;
}
- /* send accountability notice */
+ break;
+ case ERR_INVITEONLYCHAN: err = 'i'; break;
+ case ERR_CHANNELISFULL: err = 'l'; break;
+ case ERR_BANNEDFROMCHAN: err = 'b'; break;
+ case ERR_BADCHANNELKEY: err = 'k'; break;
+ case ERR_NEEDREGGEDNICK: err = 'r'; break;
+ default: err = '?'; break;
+ }
+ /* send accountability notice */
+ if (err)
sendto_opmask_butone(0, SNO_HACK4, "OPER JOIN: %C JOIN %H "
"(overriding +%c)", sptr, chptr, err);
- err = 0;
- }
+ err = 0;
}
/* Is there some reason the user may not join? */
----------------------- End of diff -----------------------
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
