summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/ns_getpass.c3
-rw-r--r--src/core/ns_group.c6
-rw-r--r--src/core/ns_identify.c6
-rw-r--r--src/core/ns_register.c6
4 files changed, 1 insertions, 20 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)
{