diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/ns_getpass.c | 3 | ||||
| -rw-r--r-- | src/core/ns_group.c | 6 | ||||
| -rw-r--r-- | src/core/ns_identify.c | 6 | ||||
| -rw-r--r-- | src/core/ns_register.c | 6 | ||||
| -rw-r--r-- | src/protocol/bahamut.c | 3 | ||||
| -rw-r--r-- | src/protocol/inspircd11.c | 3 | ||||
| -rw-r--r-- | src/protocol/inspircd12.cpp | 3 | ||||
| -rw-r--r-- | src/protocol/ratbox.c | 3 | ||||
| -rw-r--r-- | src/protocol/unreal32.c | 3 |
9 files changed, 1 insertions, 35 deletions
diff --git a/src/core/ns_getpass.c b/src/core/ns_getpass.c index 036ee82b3..bb395ab8c 100644 --- a/src/core/ns_getpass.c +++ b/src/core/ns_getpass.c @@ -105,8 +105,7 @@ class NSGetPass : public Module **/ void myNickServHelp(User *u) { - if (is_services_admin(u)) - notice_lang(s_NickServ, u, NICK_HELP_CMD_GETPASS); + notice_lang(s_NickServ, u, NICK_HELP_CMD_GETPASS); } MODULE_INIT("ns_getpass", NSGetPass) diff --git a/src/core/ns_group.c b/src/core/ns_group.c index 8d99cbfeb..e9be3fe0d 100644 --- a/src/core/ns_group.c +++ b/src/core/ns_group.c @@ -167,12 +167,6 @@ class CommandNSGroup : public Command { len = strlen(ircd->modeonreg); strncpy(modes, ircd->modeonreg, 512); - if (ircd->rootmodeonid && is_services_root(u)) - strncat(modes, ircd->rootmodeonid, 512 - len); - else if (ircd->adminmodeonid && is_services_admin(u)) - strncat(modes, ircd->adminmodeonid, 512 - len); - else if (ircd->opermodeonid && is_services_oper(u)) - strncat(modes, ircd->opermodeonid, 512 - len); if (ircd->tsonmode) common_svsmode(u, modes, tsbuf); else diff --git a/src/core/ns_identify.c b/src/core/ns_identify.c index 891677d17..153d72fbf 100644 --- a/src/core/ns_identify.c +++ b/src/core/ns_identify.c @@ -82,12 +82,6 @@ class CommandNSIdentify : public Command { len = strlen(ircd->modeonreg); strncpy(modes, ircd->modeonreg, 512); - if (ircd->rootmodeonid && is_services_root(u)) - strncat(modes, ircd->rootmodeonid, 512 - len); - else if (ircd->adminmodeonid && is_services_admin(u)) - strncat(modes, ircd->adminmodeonid, 512 - len); - else if (ircd->opermodeonid && is_services_oper(u)) - strncat(modes, ircd->opermodeonid, 512 - len); if (ircd->tsonmode) common_svsmode(u, modes, tsbuf); else diff --git a/src/core/ns_register.c b/src/core/ns_register.c index 826c58c66..3048b96c7 100644 --- a/src/core/ns_register.c +++ b/src/core/ns_register.c @@ -95,12 +95,6 @@ class CommandNSConfirm : public Command { len = strlen(ircd->modeonreg); strncpy(modes, ircd->modeonreg, 512); - if (ircd->rootmodeonid && is_services_root(u)) - strncat(modes, ircd->rootmodeonid, 512 - len); - else if (ircd->adminmodeonid && is_services_admin(u)) - strncat(modes, ircd->adminmodeonid, 512 - len); - else if (ircd->opermodeonid && is_services_oper(u)) - strncat(modes, ircd->opermodeonid, 512 - len); if (ircd->tsonmode) { diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c index 89fd91740..58ec221a7 100644 --- a/src/protocol/bahamut.c +++ b/src/protocol/bahamut.c @@ -76,9 +76,6 @@ IRCDVar myIrcd[] = { NULL, /* Mode to set for channel admin */ NULL, /* Mode to unset for channel admin */ "+rd", /* Mode On Reg */ - NULL, /* Mode on ID for Roots */ - NULL, /* Mode on ID for Admins */ - NULL, /* Mode on ID for Opers */ "-r+d", /* Mode on UnReg */ "+d", /* Mode on Nick Change */ 1, /* Supports SGlines */ diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c index 340a6dac5..5e93fa68e 100644 --- a/src/protocol/inspircd11.c +++ b/src/protocol/inspircd11.c @@ -85,9 +85,6 @@ IRCDVar myIrcd[] = { "+a", /* Mode to set for channel admin */ "-a", /* Mode to unset for channel admin */ "+r", /* Mode On Reg */ - NULL, /* Mode on ID for Roots */ - NULL, /* Mode on ID for Admins */ - NULL, /* Mode on ID for Opers */ "-r", /* Mode on UnReg */ "-r", /* Mode on Nick Change */ 1, /* Supports SGlines */ diff --git a/src/protocol/inspircd12.cpp b/src/protocol/inspircd12.cpp index ad3551dfd..df7c1220b 100644 --- a/src/protocol/inspircd12.cpp +++ b/src/protocol/inspircd12.cpp @@ -85,9 +85,6 @@ IRCDVar myIrcd[] = { "+a", /* Mode to set for channel admin */ "-a", /* Mode to unset for channel admin */ "+r", /* Mode On Reg */ - NULL, /* Mode on ID for Roots */ - NULL, /* Mode on ID for Admins */ - NULL, /* Mode on ID for Opers */ "-r", /* Mode on UnReg */ "-r", /* Mode on Nick Change */ 0, /* Supports SGlines */ diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c index acde49ac0..3e20f33cf 100644 --- a/src/protocol/ratbox.c +++ b/src/protocol/ratbox.c @@ -61,9 +61,6 @@ IRCDVar myIrcd[] = { NULL, /* Mode to set for chan admin */ NULL, /* Mode to unset for chan admin */ NULL, /* Mode On Reg */ - NULL, /* Mode on ID for Roots */ - NULL, /* Mode on ID for Admins */ - NULL, /* Mode on ID for Opers */ NULL, /* Mode on UnReg */ NULL, /* Mode on Nick Change */ 1, /* Supports SGlines */ diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c index 17a49a75b..24f406dd6 100644 --- a/src/protocol/unreal32.c +++ b/src/protocol/unreal32.c @@ -98,9 +98,6 @@ IRCDVar myIrcd[] = { "+a", /* Mode to set for channel admin */ "-a", /* Mode to unset for channel admin */ "+rd", /* Mode On Reg */ - NULL, /* Mode on ID for Roots */ - NULL, /* Mode on ID for Admins */ - NULL, /* Mode on ID for Opers */ "-r+d", /* Mode on UnReg */ "-r+d", /* Mode on Nick Change */ 1, /* Supports SGlines */ |