forward port of asuka-kX.patch to .12

[irc/quakenet/snircd.git] / ircd / m_join.c

diff --git a/ircd/m_join.c b/ircd/m_join.c
index 1d75c65933e50db61daf3317d52ca6990de1fb5d..641e8e2e52e90e7277da52633c1c4093cf400648 100644 (file)
--- a/ircd/m_join.c
+++ b/ircd/m_join.c
@@ -205,6 +205,14 @@ int m_join(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
       else if (*chptr->mode.key && (!key || strcmp(key, chptr->mode.key)))
         err = ERR_BADCHANNELKEY;
 
+      /*
+       * ASUKA_X:
+       * Allow XtraOpers to join all channels.
+       * --Bigfoot
+       */
+      if (IsXtraOp(sptr))
+        err = 0;
+      
       /* An oper with WALK_LCHAN privilege can join a local channel
        * he otherwise could not join by using "OVERRIDE" as the key.
        * This will generate a HACK(4) notice, but fails if the oper