Author: Carlo Wood (run@alinoe.com> (Via Isomer>

[ircu2.10.12-pk.git] / ircd / m_mode.c

diff --git a/ircd/m_mode.c b/ircd/m_mode.c
index 54abb04587ea7c8ddef28bb0da7c6ff74bfa02f4..474f39b3f3f9fd1b8ae5840b49cb3c1d72263fbc 100644 (file)
--- a/ircd/m_mode.c
+++ b/ircd/m_mode.c
@@ -79,6 +79,8 @@
  *            note:   it is guaranteed that parv[0]..parv[parc-1] are all
  *                    non-NULL pointers.
  */
+#include "config.h"
+
 #include "handlers.h"
 #include "channel.h"
 #include "client.h"
@@ -116,39 +118,40 @@ m_mode(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
 
   cli_flags(sptr) &= ~FLAGS_TS8;
 
+  member = find_member_link(chptr, sptr);
+
   if (parc < 3) {
     char modebuf[MODEBUFLEN];
     char parabuf[MODEBUFLEN];
 
     *modebuf = *parabuf = '\0';
     modebuf[1] = '\0';
-    channel_modes(sptr, modebuf, parabuf, chptr);
+    channel_modes(sptr, modebuf, parabuf, sizeof(parabuf), chptr, member);
     send_reply(sptr, RPL_CHANNELMODEIS, chptr->chname, modebuf, parabuf);
     send_reply(sptr, RPL_CREATIONTIME, chptr->chname, chptr->creationtime);
     return 0;
   }
 
-  if (!(member = find_member_link(chptr, sptr)) || !IsChanOp(member)) {
-#ifdef OPER_MODE_LCHAN
-    if (IsOperOnLocalChannel(sptr, chptr->chname)) {
+  if (!member || !IsChanOp(member)) {
+    if (IsLocalChannel(chptr->chname) && HasPriv(sptr, PRIV_MODE_LCHAN)) {
       modebuf_init(&mbuf, sptr, cptr, chptr,
                   (MODEBUF_DEST_CHANNEL | /* Send mode to channel */
                    MODEBUF_DEST_HACK4));  /* Send HACK(4) notice */
       mode_parse(&mbuf, cptr, sptr, chptr, parc - 2, parv + 2,
                 (MODE_PARSE_SET |    /* Set the mode */
-                 MODE_PARSE_FORCE)); /* Force it to take */
+                 MODE_PARSE_FORCE),  /* Force it to take */
+                 member);
       return modebuf_flush(&mbuf);
     } else
-#endif
       mode_parse(0, cptr, sptr, chptr, parc - 2, parv + 2,
-                (member ? MODE_PARSE_NOTOPER : MODE_PARSE_NOTMEMBER));
+                (member ? MODE_PARSE_NOTOPER : MODE_PARSE_NOTMEMBER), member);
     return 0;
   }
 
   modebuf_init(&mbuf, sptr, cptr, chptr,
               (MODEBUF_DEST_CHANNEL | /* Send mode to channel */
                MODEBUF_DEST_SERVER)); /* Send mode to servers */
-  mode_parse(&mbuf, cptr, sptr, chptr, parc - 2, parv + 2, MODE_PARSE_SET);
+  mode_parse(&mbuf, cptr, sptr, chptr, parc - 2, parv + 2, MODE_PARSE_SET, member);
   return modebuf_flush(&mbuf);
 }
 
@@ -177,15 +180,19 @@ ms_mode(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
                    MODEBUF_DEST_SERVER  | /* Send mode to servers */
                    MODEBUF_DEST_HACK4));  /* Send a HACK(4) message */
     else
+      /* Servers need to be able to op people who join using the Apass
+       * or upass, therefore we accept modes for channels with an Apass
+       * without generating a HACK3. */
       modebuf_init(&mbuf, sptr, cptr, chptr,
                   (MODEBUF_DEST_CHANNEL | /* Send mode to clients */
-                   MODEBUF_DEST_SERVER  | /* Send mode to servers */
-                   MODEBUF_DEST_HACK3));  /* Send a HACK(3) message */
+                   MODEBUF_DEST_SERVER |   /* Send mode to servers */
+                   (*chptr->mode.apass ? 0 : MODEBUF_DEST_HACK3)));
 
     mode_parse(&mbuf, cptr, sptr, chptr, parc - 2, parv + 2,
               (MODE_PARSE_SET    | /* Set the mode */
                MODE_PARSE_STRICT | /* Interpret it strictly */
-               MODE_PARSE_FORCE)); /* And force it to be accepted */
+               MODE_PARSE_FORCE),  /* And force it to be accepted */
+               NULL);
   } else {
     if (!(member = find_member_link(chptr, sptr)) || !IsChanOp(member)) {
       modebuf_init(&mbuf, sptr, cptr, chptr,
@@ -195,7 +202,8 @@ ms_mode(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
                    MODEBUF_DEST_BOUNCE)); /* And bounce the MODE */
       mode_parse(&mbuf, cptr, sptr, chptr, parc - 2, parv + 2,
                 (MODE_PARSE_STRICT |  /* Interpret it strictly */
-                 MODE_PARSE_BOUNCE)); /* And bounce the MODE */
+                 MODE_PARSE_BOUNCE),  /* And bounce the MODE */
+                 member);
     } else {
       modebuf_init(&mbuf, sptr, cptr, chptr,
                   (MODEBUF_DEST_CHANNEL | /* Send mode to clients */
@@ -203,7 +211,8 @@ ms_mode(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
       mode_parse(&mbuf, cptr, sptr, chptr, parc - 2, parv + 2,
                 (MODE_PARSE_SET    | /* Set the mode */
                  MODE_PARSE_STRICT | /* Interpret it strictly */
-                 MODE_PARSE_FORCE)); /* And force it to be accepted */
+                 MODE_PARSE_FORCE),  /* And force it to be accepted */
+                 member);
     }
   }