Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Branch tags: u2_10_12_branch
Commit time: 2006-02-05 00:50:32 UTC
Modified files:
Tag: u2_10_12_branch
ircd/m_mode.c ircd/m_join.c ChangeLog
Log message:
Remove self-op code for Apass/Upass joins.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.710.2.64 ircu2.10/ChangeLog:1.710.2.65
--- ircu2.10/ChangeLog:1.710.2.64 Thu Jan 12 17:28:11 2006
+++ ircu2.10/ChangeLog Sat Feb 4 16:50:22 2006
@@ -1,3 +1,9 @@
+2006-02-04 Michael Poole <[EMAIL PROTECTED]>
+
+ * ircd/m_join.c (m_join): Remove #if 0 code and update comment.
+
+ * ircd/m_mode.c (ms_mode): Remove self-op support.
+
2006-01-12 Michael Poole <[EMAIL PROTECTED]>
* include/patchlevel.h (PATCHLEVEL): Update for 2.10.12.pre06.
Index: ircu2.10/ircd/m_join.c
diff -u ircu2.10/ircd/m_join.c:1.34.2.8 ircu2.10/ircd/m_join.c:1.34.2.9
--- ircu2.10/ircd/m_join.c:1.34.2.8 Fri Jan 6 16:54:09 2006
+++ ircu2.10/ircd/m_join.c Sat Feb 4 16:50:22 2006
@@ -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.34.2.8 2006/01/07 00:54:09 entrope Exp $
+ * $Id: m_join.c,v 1.34.2.9 2006/02/05 00:50:22 entrope Exp $
*/
#include "config.h"
@@ -246,17 +246,13 @@
joinbuf_join(&join, chptr, flags);
if (flags & CHFL_CHANOP) {
struct ModeBuf mbuf;
-#if 0
- /* Send a MODE to the other servers. If the user used the A/U pass,
- * let his server op him, otherwise let him op himself. */
- modebuf_init(&mbuf, chptr->mode.apass[0] ? &me : sptr, cptr, chptr,
MODEBUF_DEST_SERVER);
-#else
/* Always let the server op him: this is needed on a net with older
servers
because they 'destruct' channels immediately when they become empty
without
sending out a DESTRUCT message. As a result, they would always
bounce a mode
- (as HACK(2)) when the user ops himself. */
+ (as HACK(2)) when the user ops himself.
+ (There is also no particularly good reason to have the user op
himself.)
+ */
modebuf_init(&mbuf, &me, cptr, chptr, MODEBUF_DEST_SERVER);
-#endif
modebuf_mode_client(&mbuf, MODE_ADD | MODE_CHANOP, sptr,
chptr->mode.apass[0] ? ((flags &
CHFL_CHANNEL_MANAGER) ? 0 : 1) : MAXOPLEVEL);
modebuf_flush(&mbuf);
Index: ircu2.10/ircd/m_mode.c
diff -u ircu2.10/ircd/m_mode.c:1.15.2.1 ircu2.10/ircd/m_mode.c:1.15.2.2
--- ircu2.10/ircd/m_mode.c:1.15.2.1 Mon Oct 31 15:16:56 2005
+++ ircu2.10/ircd/m_mode.c Sat Feb 4 16:50:22 2006
@@ -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_mode.c,v 1.15.2.1 2005/10/31 23:16:56 entrope Exp $
+ * $Id: m_mode.c,v 1.15.2.2 2006/02/05 00:50:22 entrope Exp $
*/
/*
@@ -191,9 +191,7 @@
MODE_PARSE_FORCE), /* And force it to be accepted */
NULL);
} else {
- if (!(member = find_member_link(chptr, sptr))
- /* Allow people to op themselves on an empty channel. */
- || (!IsChanOp(member) && chptr->users > 1)) {
+ if (!(member = find_member_link(chptr, sptr))) {
modebuf_init(&mbuf, sptr, cptr, chptr,
(MODEBUF_DEST_SERVER | /* Send mode to server */
MODEBUF_DEST_HACK2 | /* Send a HACK(2) message */
----------------------- End of diff -----------------------
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
