Fixed bug #1202 - Made Anope aware of plexus3's channel mode +z

4 files changed, 10 insertions, 6 deletions

diff --git a/Changes b/Changes
index cda6d288d..d004118a7 100644
--- a/Changes
+++ b/Changes
@@ -11,6 +11,7 @@ Anope Version 1.8.5
 05/23  A Added old nick parameter to EVENT_CHANGE_NICK                   [  #00]
 08/13  A Added forking for mail sending on supporting operating systems  [  #00]
 09/05  A Added InspIRCd 2.0 support                                      [  #00]
+10/31  A Added support for Plexus3's channel mode +z                     [#1202]
 04/15  F Fixed os_info to backup its database on Windows                 [  #00]
 04/15  F Fixed a potential crash in cs_clear ops when using UnrealIRCd   [#1154]
 04/16  F Fixed missing TS6SID on FJOIN in inspircd12                     [  #00]
diff --git a/src/protocol/plexus3.c b/src/protocol/plexus3.c
index d9e4a266f..5e8cadcd9 100644
--- a/src/protocol/plexus3.c
+++ b/src/protocol/plexus3.c
@@ -68,8 +68,8 @@ IRCDVar myIrcd[] = {
    0,				/* SVSMODE unban        */
    1,				/* Has Protect          */
    0,				/* Reverse              */
-   0,				/* Chan Reg             */
-   0,				/* Channel Mode         */
+   1,				/* Chan Reg             */
+   CMODE_z,			/* Channel Mode         */
    0,				/* vidents              */
    1,				/* svshold              */
    1,				/* time stamp on mode   */
@@ -406,7 +406,7 @@ CBMode myCbmodes[128] = {
   {0},				/* w */
   {0},				/* x */
   {0},				/* y */
-  {0},				/* z */
+  {CMODE_z, CBM_NO_MLOCK, NULL, NULL},	/* z */
   {0}, {0}, {0}, {0}
 };
 
@@ -420,6 +420,7 @@ CBModeInfo myCbmodeinfos[] = {
   {'p', CMODE_p, 0, NULL, NULL},
   {'s', CMODE_s, 0, NULL, NULL},
   {'t', CMODE_t, 0, NULL, NULL},
+  {'z', CMODE_z, 0, NULL, NULL},
   {'B', CMODE_B, 0, NULL, NULL},
   {'M', CMODE_M, 0, NULL, NULL},
   {'N', CMODE_N, 0, NULL, NULL},
@@ -1858,7 +1859,7 @@ AnopeInit (int argc, char **argv)
   pmodule_private_cmode (CMODE_p);
   pmodule_key_mode (CMODE_k);
   pmodule_limit_mode (CMODE_l);
-  pmodule_permchan_mode(0);
+  pmodule_permchan_mode(CMODE_z);
 
   moduleAddAnopeCmds ();
   moduleAddIRCDMsgs ();
diff --git a/src/protocol/plexus3.h b/src/protocol/plexus3.h
index 90d8a556e..4d83a2bdb 100644
--- a/src/protocol/plexus3.h
+++ b/src/protocol/plexus3.h
@@ -36,8 +36,9 @@
 #define CMODE_N 0x00010000
 #define CMODE_B 0x00020000
 #define CMODE_S 0x00040000
+#define CMODE_z 0x00080000
 
-#define DEFAULT_MLOCK CMODE_n | CMODE_t
+#define DEFAULT_MLOCK CMODE_n | CMODE_t | CMODE_z
 
 void plexus_set_umode(User * user, int ac, char **av);
 void plexus_cmd_svsnoop(char *server, int set);
diff --git a/version.log b/version.log
index 39aea9ff6..2b794748e 100644
--- a/version.log
+++ b/version.log
@@ -8,9 +8,10 @@ VERSION_MAJOR="1"
 VERSION_MINOR="8"
 VERSION_PATCH="5"
 VERSION_EXTRA="-git"
-VERSION_BUILD="3045"
+VERSION_BUILD="3046"
 
 # $Log$ # Changes since 1.8.5 Release
+#Revision 3046 - Fixed bug #1202 - Made Anope aware of plexus3's channel mode +z
 #Revision 3045 - Fixed some improper english in the HOST_GROUP language strings
 #Revision 3044 - Fixed a potential crash from accessing invalid memory after unbanning people when checking whether a host is akick stuck. Fixes /cs unban not reapplying stuck ban masks.
 #Revision 3043 - Fixed /nickserv saset display to change the nicktracking of the users affected by it, not the user executing it