diff options
32 files changed, 57 insertions, 199 deletions
diff --git a/src/core/os_admin.c b/src/core/os_admin.c index dc4695880..c14a542b6 100644 --- a/src/core/os_admin.c +++ b/src/core/os_admin.c @@ -34,7 +34,7 @@ class CommandOSAdmin : public Command return MOD_CONT; } - if (!is_services_root(u)) + if (!u->nc->HasCommand("operserv/admin")) { notice_lang(s_OperServ, u, PERMISSION_DENIED); return MOD_CONT; @@ -97,12 +97,6 @@ class CommandOSAdmin : public Command return MOD_CONT; } - if (!is_services_root(u)) - { - notice_lang(s_OperServ, u, PERMISSION_DENIED); - return MOD_CONT; - } - if (!servadmins.count) { notice_lang(s_OperServ, u, OPER_ADMIN_LIST_EMPTY); @@ -195,12 +189,6 @@ class CommandOSAdmin : public Command CommandReturn DoClear(User *u, std::vector<std::string> ¶ms) { - if (!is_services_root(u)) - { - notice_lang(s_OperServ, u, PERMISSION_DENIED); - return MOD_CONT; - } - if (!servadmins.count) { notice_lang(s_OperServ, u, OPER_ADMIN_LIST_EMPTY); @@ -221,6 +209,12 @@ class CommandOSAdmin : public Command { const char *cmd = params[0].c_str(); + if (!u->nc->HasCommand("operserv/admin")) + { + notice_lang(s_OperServ, u, PERMISSION_DENIED); + return MOD_CONT; + } + if (!stricmp(cmd, "ADD")) return this->DoAdd(u, params); else if (!stricmp(cmd, "DEL")) diff --git a/src/core/os_akill.c b/src/core/os_akill.c index 19ce880b0..e3ac8d5e8 100644 --- a/src/core/os_akill.c +++ b/src/core/os_akill.c @@ -312,9 +312,6 @@ class CommandOSAKill : public Command bool OnHelp(User *u, const std::string &subcommand) { - if (!is_services_oper(u)) - return false; - notice_help(s_OperServ, u, OPER_HELP_AKILL); return true; } @@ -345,8 +342,7 @@ class OSAKill : public Module **/ void myOperServHelp(User *u) { - if (is_services_oper(u)) - notice_lang(s_OperServ, u, OPER_HELP_CMD_AKILL); + notice_lang(s_OperServ, u, OPER_HELP_CMD_AKILL); } int akill_view(int number, Akill *ak, User *u, int *sent_header) diff --git a/src/core/os_chankill.c b/src/core/os_chankill.c index 3f65570de..7ab8cf637 100644 --- a/src/core/os_chankill.c +++ b/src/core/os_chankill.c @@ -92,9 +92,6 @@ class CommandOSChanKill : public Command bool OnHelp(User *u, const std::string &subcommand) { - if (!is_services_admin(u)) - return false; - notice_help(s_OperServ, u, OPER_HELP_CHANKILL); return true; } @@ -126,8 +123,7 @@ class OSChanKill : public Module **/ void myOperServHelp(User *u) { - if (is_services_admin(u)) - notice_lang(s_OperServ, u, OPER_HELP_CMD_CHANKILL); + notice_lang(s_OperServ, u, OPER_HELP_CMD_CHANKILL); } MODULE_INIT("os_chankill", OSChanKill) diff --git a/src/core/os_chanlist.c b/src/core/os_chanlist.c index 3ba0e9d18..6a21a1ec3 100644 --- a/src/core/os_chanlist.c +++ b/src/core/os_chanlist.c @@ -74,9 +74,6 @@ class CommandOSChanList : public Command bool OnHelp(User *u, const std::string &subcommand) { - if (!is_services_oper(u)) - return false; - notice_help(s_OperServ, u, OPER_HELP_CHANLIST); return true; } diff --git a/src/core/os_clearmodes.c b/src/core/os_clearmodes.c index 379299179..546bcaf37 100644 --- a/src/core/os_clearmodes.c +++ b/src/core/os_clearmodes.c @@ -235,9 +235,6 @@ class CommandOSClearModes : public Command bool OnHelp(User *u, const std::string &subcommand) { - if (!is_services_oper(u)) - return false; - notice_help(s_OperServ, u, OPER_HELP_CLEARMODES); return true; } @@ -269,8 +266,7 @@ class OSClearModes : public Module **/ void myOperServHelp(User *u) { - if (is_services_oper(u)) - notice_lang(s_OperServ, u, OPER_HELP_CMD_CLEARMODES); + notice_lang(s_OperServ, u, OPER_HELP_CMD_CLEARMODES); } MODULE_INIT("os_clearmodes", OSClearModes) diff --git a/src/core/os_defcon.c b/src/core/os_defcon.c index cb73627eb..fdd95843b 100644 --- a/src/core/os_defcon.c +++ b/src/core/os_defcon.c @@ -78,9 +78,6 @@ class CommandOSDEFCON : public Command bool OnHelp(User *u, const std::string &subcommand) { - if (!is_services_admin(u)) - return false; - notice_help(s_OperServ, u, OPER_HELP_DEFCON); return true; } @@ -112,8 +109,7 @@ class OSDEFCON : public Module **/ void myOperServHelp(User *u) { - if (is_services_admin(u)) - notice_lang(s_OperServ, u, OPER_HELP_CMD_DEFCON); + notice_lang(s_OperServ, u, OPER_HELP_CMD_DEFCON); } /** diff --git a/src/core/os_global.c b/src/core/os_global.c index 09e4062d6..4e897e186 100644 --- a/src/core/os_global.c +++ b/src/core/os_global.c @@ -36,9 +36,6 @@ class CommandOSGlobal : public Command bool OnHelp(User *u, const std::string &subcommand) { - if (!is_services_admin(u)) - return false; - notice_help(s_OperServ, u, OPER_HELP_GLOBAL, s_GlobalNoticer); return true; } @@ -69,8 +66,7 @@ class OSGlobal : public Module **/ void myOperServHelp(User *u) { - if (is_services_admin(u)) - notice_lang(s_OperServ, u, OPER_HELP_CMD_GLOBAL); + notice_lang(s_OperServ, u, OPER_HELP_CMD_GLOBAL); } MODULE_INIT("os_global", OSGlobal) diff --git a/src/core/os_ignore.c b/src/core/os_ignore.c index c2932a227..46e57a3d9 100644 --- a/src/core/os_ignore.c +++ b/src/core/os_ignore.c @@ -122,9 +122,6 @@ class CommandOSIgnore : public Command bool OnHelp(User *u, const std::string &subcommand) { - if (!is_services_admin(u)) - return false; - notice_help(s_OperServ, u, OPER_HELP_IGNORE); return true; } @@ -155,8 +152,7 @@ class OSIgnore : public Module **/ void myOperServHelp(User *u) { - if (is_services_admin(u)) - notice_lang(s_OperServ, u, OPER_HELP_CMD_IGNORE); + notice_lang(s_OperServ, u, OPER_HELP_CMD_IGNORE); } MODULE_INIT("os_ignore", OSIgnore) diff --git a/src/core/os_jupe.c b/src/core/os_jupe.c index 36dbc4376..3dfc420cb 100644 --- a/src/core/os_jupe.c +++ b/src/core/os_jupe.c @@ -47,9 +47,6 @@ class CommandOSJupe : public Command bool OnHelp(User *u, const std::string &subcommand) { - if (!is_services_admin(u)) - return false; - notice_help(s_OperServ, u, OPER_HELP_JUPE); return true; } @@ -81,8 +78,7 @@ class OSJupe : public Module **/ void myOperServHelp(User *u) { - if (is_services_admin(u)) - notice_lang(s_OperServ, u, OPER_HELP_CMD_JUPE); + notice_lang(s_OperServ, u, OPER_HELP_CMD_JUPE); } MODULE_INIT("os_jupe", OSJupe) diff --git a/src/core/os_kick.c b/src/core/os_kick.c index e815f9fc6..6e8d82237 100644 --- a/src/core/os_kick.c +++ b/src/core/os_kick.c @@ -55,9 +55,6 @@ class CommandOSKick : public Command bool OnHelp(User *u, const std::string &subcommand) { - if (!is_services_oper(u)) - return false; - notice_help(s_OperServ, u, OPER_HELP_KICK); return true; } @@ -89,8 +86,7 @@ class OSKick : public Module **/ void myOperServHelp(User *u) { - if (is_services_oper(u)) - notice_lang(s_OperServ, u, OPER_HELP_CMD_KICK); + notice_lang(s_OperServ, u, OPER_HELP_CMD_KICK); } MODULE_INIT("os_kick", OSKick) diff --git a/src/core/os_mode.c b/src/core/os_mode.c index 7dc291bb1..dcfc525c9 100644 --- a/src/core/os_mode.c +++ b/src/core/os_mode.c @@ -35,8 +35,6 @@ class CommandOSMode : public Command notice_lang(s_OperServ, u, CHAN_X_NOT_IN_USE, chan); else if (c->bouncy_modes) notice_lang(s_OperServ, u, OPER_BOUNCY_MODES_U_LINE); - else if (ircd->adminmode && !is_services_admin(u) && (c->mode & ircd->adminmode)) - notice_lang(s_OperServ, u, PERMISSION_DENIED); else { ircdproto->SendMode(findbot(s_OperServ), chan, "%s", modes); @@ -53,9 +51,6 @@ class CommandOSMode : public Command bool OnHelp(User *u, const std::string &subcommand) { - if (!is_services_oper(u)) - return false; - notice_help(s_OperServ, u, OPER_HELP_MODE); return true; } @@ -87,8 +82,7 @@ class OSMode : public Module **/ void myOperServHelp(User *u) { - if (is_services_oper(u)) - notice_lang(s_OperServ, u, OPER_HELP_CMD_MODE); + notice_lang(s_OperServ, u, OPER_HELP_CMD_MODE); } MODULE_INIT("os_mode", OSMode) diff --git a/src/core/os_modload.c b/src/core/os_modload.c index 3f8166c83..2f7fcd868 100644 --- a/src/core/os_modload.c +++ b/src/core/os_modload.c @@ -46,9 +46,6 @@ class CommandOSModLoad : public Command bool OnHelp(User *u, const std::string &subcommand) { - if (!is_services_root(u)) - return false; - notice_help(s_OperServ, u, OPER_HELP_MODLOAD); return true; } @@ -82,8 +79,7 @@ class OSModLoad : public Module **/ void myOperServHelp(User *u) { - if (is_services_root(u)) - notice_lang(s_OperServ, u, OPER_HELP_CMD_MODLOAD); + notice_lang(s_OperServ, u, OPER_HELP_CMD_MODLOAD); } MODULE_INIT("os_modload", OSModLoad) diff --git a/src/core/os_modunload.c b/src/core/os_modunload.c index 1906e8884..8c9bc5ade 100644 --- a/src/core/os_modunload.c +++ b/src/core/os_modunload.c @@ -48,9 +48,6 @@ class CommandOSModUnLoad : public Command bool OnHelp(User *u, const std::string &subcommand) { - if (!is_services_root(u)) - return false; - notice_help(s_OperServ, u, OPER_HELP_MODUNLOAD); return true; } @@ -84,8 +81,7 @@ class OSModUnLoad : public Module **/ void myOperServHelp(User *u) { - if (is_services_root(u)) - notice_lang(s_OperServ, u, OPER_HELP_CMD_MODUNLOAD); + notice_lang(s_OperServ, u, OPER_HELP_CMD_MODUNLOAD); } MODULE_INIT("os_modunload", OSModUnLoad) diff --git a/src/core/os_news.c b/src/core/os_news.c index 1e122d303..432907359 100644 --- a/src/core/os_news.c +++ b/src/core/os_news.c @@ -196,11 +196,16 @@ class NewsBase : public Command CommandReturn DoNews(User *u, std::vector<std::string> ¶ms, short type) { - int is_servadmin = is_services_admin(u); const char *cmd = params[0].c_str(); const char *type_name; int *msgs; + if (!u->nc->HasCommand("operserv/news")) + { + notice_lang(s_OperServ, u, PERMISSION_DENIED); + return MOD_CONT; + } + msgs = findmsgs(type, &type_name); if (!msgs) { @@ -212,17 +217,11 @@ class NewsBase : public Command return this->DoList(u, params, type, msgs); else if (!stricmp(cmd, "ADD")) { - if (is_servadmin) - return this->DoAdd(u, params, type, msgs); - else - notice_lang(s_OperServ, u, PERMISSION_DENIED); + return this->DoAdd(u, params, type, msgs); } else if (!stricmp(cmd, "DEL")) { - if (is_servadmin) - return this->DoDel(u, params, type, msgs); - else - notice_lang(s_OperServ, u, PERMISSION_DENIED); + return this->DoDel(u, params, type, msgs); } else this->OnSyntaxError(u); @@ -267,9 +266,6 @@ class CommandOSLogonNews : public NewsBase bool OnHelp(User *u, const std::string &subcommand) { - if (!is_services_admin(u)) - return false; - notice_help(s_OperServ, u, NEWS_HELP_LOGON, this->help_param1); return true; } @@ -313,9 +309,6 @@ class CommandOSOperNews : public NewsBase bool OnHelp(User *u, const std::string &subcommand) { - if (!is_services_admin(u)) - return false; - notice_help(s_OperServ, u, NEWS_HELP_OPER, this->help_param1); return true; } @@ -351,9 +344,6 @@ class CommandOSRandomNews : public NewsBase bool OnHelp(User *u, const std::string &subcommand) { - if (!is_services_admin(u)) - return false; - notice_help(s_OperServ, u, NEWS_HELP_RANDOM); return true; } @@ -397,12 +387,9 @@ class OSNews : public Module **/ void myOperServHelp(User *u) { - if (is_services_admin(u)) - { - notice_lang(s_OperServ, u, OPER_HELP_CMD_LOGONNEWS); - notice_lang(s_OperServ, u, OPER_HELP_CMD_OPERNEWS); - notice_lang(s_OperServ, u, OPER_HELP_CMD_RANDOMNEWS); - } + notice_lang(s_OperServ, u, OPER_HELP_CMD_LOGONNEWS); + notice_lang(s_OperServ, u, OPER_HELP_CMD_OPERNEWS); + notice_lang(s_OperServ, u, OPER_HELP_CMD_RANDOMNEWS); } diff --git a/src/core/os_noop.c b/src/core/os_noop.c index 12d5ff53f..cd0745713 100644 --- a/src/core/os_noop.c +++ b/src/core/os_noop.c @@ -63,9 +63,6 @@ class CommandOSNOOP : public Command bool OnHelp(User *u, const std::string &subcommand) { - if (!is_services_admin(u)) - return false; - notice_help(s_OperServ, u, OPER_HELP_NOOP); return true; } @@ -99,8 +96,7 @@ class OSNOOP : public Module **/ void myOperServHelp(User *u) { - if (is_services_admin(u)) - notice_lang(s_OperServ, u, OPER_HELP_CMD_NOOP); + notice_lang(s_OperServ, u, OPER_HELP_CMD_NOOP); } MODULE_INIT("os_noop", OSNOOP) diff --git a/src/core/os_oline.c b/src/core/os_oline.c index 9f44ac499..822461c75 100644 --- a/src/core/os_oline.c +++ b/src/core/os_oline.c @@ -62,9 +62,6 @@ class CommandOSOLine : public Command bool OnHelp(User *u, const std::string &subcommand) { - if (!is_services_root(u)) - return false; - notice_help(s_OperServ, u, OPER_HELP_OLINE); return true; } @@ -101,8 +98,7 @@ class OSOLine : public Module **/ void myOperServHelp(User *u) { - if (is_services_admin(u) && u->isSuperAdmin) - notice_lang(s_OperServ, u, OPER_HELP_CMD_OLINE); + notice_lang(s_OperServ, u, OPER_HELP_CMD_OLINE); } MODULE_INIT("os_oline", OSOLine) diff --git a/src/core/os_oper.c b/src/core/os_oper.c index c65dd77ed..82dde2795 100644 --- a/src/core/os_oper.c +++ b/src/core/os_oper.c @@ -34,12 +34,6 @@ class CommandOSOper : public Command return MOD_CONT; } - if (!is_services_root(u)) - { - notice_lang(s_OperServ, u, PERMISSION_DENIED); - return MOD_CONT; - } - if (!(na = findnick(nick))) { notice_lang(s_OperServ, u, NICK_X_NOT_REGISTERED, nick); @@ -68,11 +62,6 @@ class CommandOSOper : public Command { if (na->nc->flags & NI_SERVICES_ADMIN && (res = slist_indexof(&servadmins, na->nc)) != -1) { - if (!is_services_root(u)) - { - notice_lang(s_OperServ, u, PERMISSION_DENIED); - return MOD_CONT; - } slist_delete(&servadmins, res); na->nc->flags |= NI_SERVICES_OPER; notice_lang(s_OperServ, u, OPER_OPER_MOVED, nick); @@ -102,12 +91,6 @@ class CommandOSOper : public Command return MOD_CONT; } - if (!is_services_root(u)) - { - notice_lang(s_OperServ, u, PERMISSION_DENIED); - return MOD_CONT; - } - if (isdigit(*nick) && strspn(nick, "1234567890,-") == strlen(nick)) { /* Deleting a range */ @@ -202,12 +185,6 @@ class CommandOSOper : public Command CommandReturn DoClear(User *u, std::vector<std::string> ¶ms) { - if (!is_services_root(u)) - { - notice_lang(s_OperServ, u, PERMISSION_DENIED); - return MOD_CONT; - } - if (!servopers.count) { notice_lang(s_OperServ, u, OPER_OPER_LIST_EMPTY); @@ -228,6 +205,12 @@ class CommandOSOper : public Command { const char *cmd = params[0].c_str(); + if (!u->nc->HasCommand("operserv/oper")) + { + notice_lang(s_OperServ, u, PERMISSION_DENIED); + return MOD_CONT; + } + if (!stricmp(cmd, "ADD")) return this->DoAdd(u, params); else if (!stricmp(cmd, "DEL")) diff --git a/src/core/os_quit.c b/src/core/os_quit.c index 6d9fc4f4d..2e13e68af 100644 --- a/src/core/os_quit.c +++ b/src/core/os_quit.c @@ -75,8 +75,7 @@ class OSQuit : public Module **/ void myOperServHelp(User *u) { - if (is_services_root(u)) - notice_lang(s_OperServ, u, OPER_HELP_CMD_QUIT); + notice_lang(s_OperServ, u, OPER_HELP_CMD_QUIT); } MODULE_INIT("os_quit", OSQuit) diff --git a/src/core/os_reload.c b/src/core/os_reload.c index c7f651825..7b06b80a1 100644 --- a/src/core/os_reload.c +++ b/src/core/os_reload.c @@ -43,9 +43,6 @@ class CommandOSReload : public Command bool OnHelp(User *u, const std::string &subcommand) { - if (!is_services_root(u)) - return false; - notice_help(s_OperServ, u, OPER_HELP_RELOAD); return true; } @@ -73,8 +70,7 @@ class OSReload : public Module **/ void myOperServHelp(User *u) { - if (is_services_root(u)) - notice_lang(s_OperServ, u, OPER_HELP_CMD_RELOAD); + notice_lang(s_OperServ, u, OPER_HELP_CMD_RELOAD); } MODULE_INIT("os_reload", OSReload) diff --git a/src/core/os_restart.c b/src/core/os_restart.c index d5b668101..013c53ed2 100644 --- a/src/core/os_restart.c +++ b/src/core/os_restart.c @@ -78,8 +78,7 @@ class OSRestart : public Module **/ void myOperServHelp(User *u) { - if (is_services_root(u)) - notice_lang(s_OperServ, u, OPER_HELP_CMD_RESTART); + notice_lang(s_OperServ, u, OPER_HELP_CMD_RESTART); } MODULE_INIT("os_restart", OSRestart) diff --git a/src/core/os_session.c b/src/core/os_session.c index e740a7059..8f1eea071 100644 --- a/src/core/os_session.c +++ b/src/core/os_session.c @@ -85,9 +85,6 @@ class CommandOSSession : public Command bool OnHelp(User *u, const std::string &subcommand) { - if (!is_services_oper(u)) - return false; - notice_help(s_OperServ, u, OPER_HELP_SESSION); return true; } @@ -446,9 +443,6 @@ class CommandOSException : public Command bool OnHelp(User *u, const std::string &subcommand) { - if (!is_services_oper(u)) - return false; - notice_help(s_OperServ, u, OPER_HELP_EXCEPTION); return true; } @@ -481,11 +475,8 @@ class OSSession : public Module **/ void myOperServHelp(User *u) { - if (is_services_oper(u)) - { - notice_lang(s_OperServ, u, OPER_HELP_CMD_SESSION); - notice_lang(s_OperServ, u, OPER_HELP_CMD_EXCEPTION); - } + notice_lang(s_OperServ, u, OPER_HELP_CMD_SESSION); + notice_lang(s_OperServ, u, OPER_HELP_CMD_EXCEPTION); } MODULE_INIT("os_session", OSSession) diff --git a/src/core/os_set.c b/src/core/os_set.c index 362db0194..8c666190c 100644 --- a/src/core/os_set.c +++ b/src/core/os_set.c @@ -264,9 +264,6 @@ class CommandOSSet : public Command bool OnHelp(User *u, const std::string &subcommand) { - if (!is_services_root(u)) - return false; - if (subcommand.empty()) notice_help(s_OperServ, u, OPER_HELP_SET); else if (subcommand == "LIST") @@ -316,8 +313,7 @@ class OSSet : public Module **/ void myOperServHelp(User *u) { - if (is_services_root(u)) - notice_lang(s_OperServ, u, OPER_HELP_CMD_SET); + notice_lang(s_OperServ, u, OPER_HELP_CMD_SET); } MODULE_INIT("os_set", OSSet) diff --git a/src/core/os_sgline.c b/src/core/os_sgline.c index 637435cc7..958e2547a 100644 --- a/src/core/os_sgline.c +++ b/src/core/os_sgline.c @@ -309,9 +309,6 @@ class CommandOSSGLine : public Command bool OnHelp(User *u, const std::string &subcommand) { - if (!is_services_oper(u)) - return false; - notice_help(s_OperServ, u, OPER_HELP_SGLINE); return true; } @@ -347,8 +344,7 @@ class OSSGLine : public Module **/ void myOperServHelp(User *u) { - if (is_services_oper(u)) - notice_lang(s_OperServ, u, OPER_HELP_CMD_SGLINE); + notice_lang(s_OperServ, u, OPER_HELP_CMD_SGLINE); } /* Lists an SGLINE entry, prefixing it with the header if needed */ diff --git a/src/core/os_shutdown.c b/src/core/os_shutdown.c index 52e2c8e74..96b157f82 100644 --- a/src/core/os_shutdown.c +++ b/src/core/os_shutdown.c @@ -76,8 +76,7 @@ class OSShutdown : public Module **/ void myOperServHelp(User *u) { - if (is_services_root(u)) - notice_lang(s_OperServ, u, OPER_HELP_CMD_SHUTDOWN); + notice_lang(s_OperServ, u, OPER_HELP_CMD_SHUTDOWN); } MODULE_INIT("os_shutdown", OSShutdown) diff --git a/src/core/os_sqline.c b/src/core/os_sqline.c index fcb0c9fe4..e5b054ac8 100644 --- a/src/core/os_sqline.c +++ b/src/core/os_sqline.c @@ -296,9 +296,6 @@ class CommandOSSQLine : public Command bool OnHelp(User *u, const std::string &subcommand) { - if (!is_services_oper(u)) - return false; - notice_help(s_OperServ, u, OPER_HELP_SQLINE); return true; } @@ -333,8 +330,7 @@ class OSSQLine : public Module **/ void myOperServHelp(User *u) { - if (is_services_oper(u)) - notice_lang(s_OperServ, u, OPER_HELP_CMD_SQLINE); + notice_lang(s_OperServ, u, OPER_HELP_CMD_SQLINE); } int sqline_view(int number, SXLine *sx, User *u, int *sent_header) diff --git a/src/core/os_stats.c b/src/core/os_stats.c index 1adb02528..aa9ee92ff 100644 --- a/src/core/os_stats.c +++ b/src/core/os_stats.c @@ -126,13 +126,8 @@ class CommandOSStats : public Command CommandReturn DoStatsReset(User *u, std::vector<std::string> ¶ms) { - if (is_services_admin(u)) - { - maxusercnt = usercnt; - notice_lang(s_OperServ, u, OPER_STATS_RESET); - } - else - notice_lang(s_OperServ, u, PERMISSION_DENIED); + maxusercnt = usercnt; + notice_lang(s_OperServ, u, OPER_STATS_RESET); return MOD_CONT; } @@ -302,10 +297,10 @@ class CommandOSStats : public Command if (!extra || (stricmp(extra, "MEMORY") && stricmp(extra, "UPLINK"))) this->DoStatsUptime(u, params); - if (extra && (!stricmp(extra, "ALL") || !stricmp(extra, "UPLINK")) && is_services_admin(u)) + if (extra && (!stricmp(extra, "ALL") || !stricmp(extra, "UPLINK"))) this->DoStatsUplink(u, params); - if (extra && (!stricmp(extra, "ALL") || !stricmp(extra, "MEMORY")) && is_services_admin(u)) + if (extra && (!stricmp(extra, "ALL") || !stricmp(extra, "MEMORY"))) this->DoStatsMemory(u, params); return MOD_CONT; diff --git a/src/core/os_svsnick.c b/src/core/os_svsnick.c index 9d81830a3..1c6cc4f4d 100644 --- a/src/core/os_svsnick.c +++ b/src/core/os_svsnick.c @@ -80,9 +80,6 @@ class CommandOSSVSNick : public Command bool OnHelp(User *u, const std::string &subcommand) { - if (!is_services_root(u)) - return false; - notice_help(s_OperServ, u, OPER_HELP_SVSNICK); return true; } @@ -117,8 +114,7 @@ class OSSVSNick : public Module **/ void myOperServHelp(User *u) { - if (is_services_admin(u) && u->isSuperAdmin) - notice_lang(s_OperServ, u, OPER_HELP_CMD_SVSNICK); + notice_lang(s_OperServ, u, OPER_HELP_CMD_SVSNICK); } MODULE_INIT("os_svsnick", OSSVSNick) diff --git a/src/core/os_szline.c b/src/core/os_szline.c index 2ab0c8d9d..95a5b97c9 100644 --- a/src/core/os_szline.c +++ b/src/core/os_szline.c @@ -295,9 +295,6 @@ class CommandOSSZLine : public Command bool OnHelp(User *u, const std::string &subcommand) { - if (!is_services_oper(u)) - return false; - notice_help(s_OperServ, u, OPER_HELP_SZLINE); return true; } @@ -332,8 +329,7 @@ class OSSZLine : public Module **/ void myOperServHelp(User *u) { - if (is_services_oper(u)) - notice_lang(s_OperServ, u, OPER_HELP_CMD_SZLINE); + notice_lang(s_OperServ, u, OPER_HELP_CMD_SZLINE); } int szline_view(int number, SXLine *sx, User *u, int *sent_header) diff --git a/src/core/os_umode.c b/src/core/os_umode.c index 5575715be..f21bb33de 100644 --- a/src/core/os_umode.c +++ b/src/core/os_umode.c @@ -66,9 +66,6 @@ class CommandOSUMode : public Command bool OnHelp(User *u, const std::string &subcommand) { - if (!is_services_root(u)) - return false; - notice_help(s_OperServ, u, OPER_HELP_UMODE); return true; } @@ -103,8 +100,7 @@ class OSUMode : public Module **/ void myOperServHelp(User *u) { - if (is_services_admin(u) && u->isSuperAdmin) - notice_lang(s_OperServ, u, OPER_HELP_CMD_UMODE); + notice_lang(s_OperServ, u, OPER_HELP_CMD_UMODE); } MODULE_INIT("os_umode", OSUMode) diff --git a/src/core/os_update.c b/src/core/os_update.c index d50d510ed..865a41203 100644 --- a/src/core/os_update.c +++ b/src/core/os_update.c @@ -33,9 +33,6 @@ class CommandOSUpdate : public Command bool OnHelp(User *u, const std::string &subcommand) { - if (!is_services_root(u)) - return false; - notice_help(s_OperServ, u, OPER_HELP_UPDATE); return true; } @@ -63,8 +60,7 @@ class OSUpdate : public Module **/ void myOperServHelp(User *u) { - if (is_services_root(u)) - notice_lang(s_OperServ, u, OPER_HELP_CMD_UPDATE); + notice_lang(s_OperServ, u, OPER_HELP_CMD_UPDATE); } MODULE_INIT("os_update", OSUpdate) diff --git a/src/modules/cs_appendtopic.c b/src/modules/cs_appendtopic.c index 5e28f09a5..5475cb17e 100644 --- a/src/modules/cs_appendtopic.c +++ b/src/modules/cs_appendtopic.c @@ -73,7 +73,7 @@ class CommandCSAppendTopic : public Command notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, c->name); else if (ci->flags & CI_FORBIDDEN) notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, ci->name); - else if (!is_services_admin(u) && !check_access(u, ci, CA_TOPIC)) + else if (!check_access(u, ci, CA_TOPIC)) notice_lang(s_ChanServ, u, PERMISSION_DENIED); else { @@ -98,7 +98,7 @@ class CommandCSAppendTopic : public Command else c->topic_time = ci->last_topic_time; - if (is_services_admin(u) && !check_access(u, ci, CA_TOPIC)) + if (!check_access(u, ci, CA_TOPIC)) alog("%s: %s!%s@%s changed topic of %s as services admin.", s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, c->name); if (ircd->join2set) { diff --git a/src/modules/ns_maxemail.c b/src/modules/ns_maxemail.c index ccb624947..cb4684998 100644 --- a/src/modules/ns_maxemail.c +++ b/src/modules/ns_maxemail.c @@ -148,7 +148,7 @@ int count_email_in_use(const char *email, User * u) bool check_email_limit_reached(const char *email, User * u) { - if (NSEmailMax < 1 || !email || is_services_admin(u)) + if (NSEmailMax < 1 || !email) return false; if (count_email_in_use(email, u) < NSEmailMax) |