diff options
| author | Adam <Adam@anope.org> | 2011-08-18 17:23:14 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2011-08-18 17:23:14 -0400 |
| commit | 0982becd982ce652444ab65ecaadd34d8178d721 (patch) | |
| tree | 119183dcaec611aab283c385975f93fa69ed3300 /src | |
| parent | f83096c729c0f3f33ab0a0dfc019e6bad8aa30bc (diff) | |
Bug #1318 - #1320 - Added support for Hybrid's +S and +O channel modes, and removed support for +a
Diffstat (limited to 'src')
| -rw-r--r-- | src/protocol/hybrid.c | 17 | ||||
| -rw-r--r-- | src/protocol/hybrid.h | 4 |
2 files changed, 12 insertions, 9 deletions
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 |