Bug #1318 - #1320 - Added support for Hybrid's +S and +O channel modes, and removed support for +a

4 files changed, 17 insertions, 10 deletions

diff --git a/Changes b/Changes
index 856a22d16..bfc89c6d3 100644
--- a/Changes
+++ b/Changes
@@ -4,6 +4,9 @@ Anope Version 1.8 - GIT
 07/23  F Fixed a potential crash in the badwords kicker                  [  #00]
 08/09  F Fixed deopping the first user to join a channel during a burst  [#1287]
 08/10  F Fixed loading bs_fantasy_owner on InspIRCd 2.0 on startup       [  #00]
+08/18  R Removed support for Hybrid's (old) channel mode +a              [#1318]
+08/18  A Added support for Hybrid's channel mode +S                      [#1319]
+08/18  A Added support for Hybrid's channel mode +O                      [#1320]
 
 Anope Version 1.8.6
 -------------------
diff --git a/src/protocol/hybrid.c b/src/protocol/hybrid.c
index 6a27c33ad..bc9df5c11 100644
--- a/src/protocol/hybrid.c
+++ b/src/protocol/hybrid.c
@@ -17,7 +17,7 @@
 #include "version.h"
 
 IRCDVar myIrcd[] = {
-    {"HybridIRCd 7.*",          /* ircd name */
+    {"HybridIRCd 7.3+",          /* ircd name */
      "+o",                      /* nickserv mode */
      "+o",                      /* chanserv mode */
      "+o",                      /* memoserv mode */
@@ -38,7 +38,7 @@ IRCDVar myIrcd[] = {
      "+io",                     /* Global alias mode   */
      "+",                       /* Used by BotServ Bots */
      3,                         /* Chan Max Symbols     */
-     "-ailmnpst",               /* Modes to Remove */
+     "-ilmnpstOS",               /* Modes to Remove */
      "+o",                      /* Channel Umode used by Botserv bots */
      0,                         /* SVSNICK */
      0,                         /* Vhost  */
@@ -360,11 +360,11 @@ CBMode myCbmodes[128] = {
     {0},                        /* L */
     {0},                        /* M */
     {0},                        /* N */
-    {0},                        /* O */
+    {CMODE_O, CBM_NO_USER_MLOCK, NULL, NULL},   /* O */
     {0},                        /* P */
     {0},                        /* Q */
-    {0},
-    {0},                        /* S */
+    {0},                        /* R */
+    {CMODE_S, 0, NULL, NULL},   /* S */
     {0},                        /* T */
     {0},                        /* U */
     {0},                        /* V */
@@ -373,7 +373,7 @@ CBMode myCbmodes[128] = {
     {0},                        /* Y */
     {0},                        /* Z */
     {0}, {0}, {0}, {0}, {0}, {0},
-    {CMODE_a, 0, NULL, NULL},
+    {0},                        /* a */
     {0},                        /* b */
     {0},                        /* c */
     {0},                        /* d */
@@ -403,7 +403,8 @@ CBMode myCbmodes[128] = {
 };
 
 CBModeInfo myCbmodeinfos[] = {
-    {'a', CMODE_a, 0, NULL, NULL},
+    {'O', CMODE_O, 0, NULL, NULL},
+    {'S', CMODE_S, 0, NULL, NULL},
     {'i', CMODE_i, 0, NULL, NULL},
     {'k', CMODE_k, 0, get_key, cs_get_key},
     {'l', CMODE_l, CBM_MINUS_NO_ARG, get_limit, cs_get_limit},
@@ -1606,7 +1607,7 @@ int AnopeInit(int argc, char **argv)
     moduleAddVersion(VERSION_STRING);
     moduleSetType(PROTOCOL);
 
-    pmodule_ircd_version("Hybrid IRCd 7.0");
+    pmodule_ircd_version("Hybrid IRCd 7.3+");
     pmodule_ircd_cap(myIrcdcap);
     pmodule_ircd_var(myIrcd);
     pmodule_ircd_cbmodeinfos(myCbmodeinfos);
diff --git a/src/protocol/hybrid.h b/src/protocol/hybrid.h
index 4a730578a..1fac12b66 100644
--- a/src/protocol/hybrid.h
+++ b/src/protocol/hybrid.h
@@ -38,7 +38,9 @@
 #define CMODE_t 0x00000020     /* Only chanops can change the topic */
 #define CMODE_k 0x00000040     /* Key/password for the channel. */
 #define CMODE_l 0x00000080     /* Limit the number of users in a channel */
-#define CMODE_a 0x00000400     /* Anonymous ops, chanops are hidden */
+/* #define CMODE_a 0x00000400    */ /* Anonymous ops, chanops are hidden */
+#define CMODE_O 0x00000800     /* Oper only channel, as of hybrid7.3 */
+#define CMODE_S 0x00001000     /* SSL only channel, as of hybrid7.3 */
 
 
 #define DEFAULT_MLOCK CMODE_n | CMODE_t
diff --git a/version.log b/version.log
index 58c7174d3..aadd9776a 100644
--- a/version.log
+++ b/version.log
@@ -8,9 +8,10 @@ VERSION_MAJOR="1"
 VERSION_MINOR="8"
 VERSION_PATCH="7"
 VERSION_EXTRA="-git"
-VERSION_BUILD="3078"
+VERSION_BUILD="3079"
 
 # $Log$ # Changes since 1.8.6 Release
+#Revision 3079 - Bug #1318 - #1320 - Added support for Hybrid's +S and +O channel modes, and removed support for +a
 #Revision 3078 - Fixed loading bs_fantasy_owner on startup when using InspIRCd 2.0
 #Revision 3077 - Bug #1287 - Fixed chan_set_correct_modes to not deop the first user from syncing servers
 #Revision 3076 - Bug #1269 - Fixed install.js for Windows 7 builds.