diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/core/cs_sendpass.c | 2 | ||||
-rw-r--r-- | src/core/cs_suspend.c | 6 | ||||
-rw-r--r-- | src/core/ns_saset.c | 30 | ||||
-rw-r--r-- | src/core/ns_sendpass.c | 2 | ||||
-rw-r--r-- | src/core/ns_suspend.c | 6 | ||||
-rw-r--r-- | src/core/os_admin.c | 9 | ||||
-rw-r--r-- | src/core/os_chanlist.c | 6 | ||||
-rw-r--r-- | src/core/os_global.c | 4 | ||||
-rw-r--r-- | src/core/os_logonnews.c | 4 | ||||
-rw-r--r-- | src/core/os_oper.c | 10 | ||||
-rw-r--r-- | src/core/os_opernews.c | 4 | ||||
-rw-r--r-- | src/core/os_quit.c | 4 | ||||
-rw-r--r-- | src/core/os_randomnews.c | 4 | ||||
-rw-r--r-- | src/core/os_raw.c | 2 | ||||
-rw-r--r-- | src/core/os_reload.c | 4 | ||||
-rw-r--r-- | src/core/os_restart.c | 4 | ||||
-rw-r--r-- | src/core/os_session.c | 6 | ||||
-rw-r--r-- | src/core/os_set.c | 4 | ||||
-rw-r--r-- | src/core/os_shutdown.c | 4 | ||||
-rw-r--r-- | src/core/os_stats.c | 8 | ||||
-rw-r--r-- | src/core/os_update.c | 4 | ||||
-rw-r--r-- | src/core/os_userlist.c | 6 |
22 files changed, 59 insertions, 74 deletions
diff --git a/src/core/cs_sendpass.c b/src/core/cs_sendpass.c index ee31287df..c676ff749 100644 --- a/src/core/cs_sendpass.c +++ b/src/core/cs_sendpass.c @@ -78,7 +78,7 @@ int do_sendpass(User * u) if (!chan) { syntax_error(s_ChanServ, u, "SENDPASS", CHAN_SENDPASS_SYNTAX); - } else if (RestrictMail && !is_oper(u)) { + } else if (RestrictMail && !is_services_oper(u)) { notice_lang(s_ChanServ, u, PERMISSION_DENIED); } else if (!(ci = cs_findchan(chan)) || !(founder = ci->founder)) { notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan); diff --git a/src/core/cs_suspend.c b/src/core/cs_suspend.c index 7abf9e730..851e160f6 100644 --- a/src/core/cs_suspend.c +++ b/src/core/cs_suspend.c @@ -33,11 +33,11 @@ int AnopeInit(int argc, char **argv) moduleAddVersion("$Id$"); moduleSetType(CORE); - c = createCommand("SUSPEND", do_suspend, is_services_admin, -1, -1, -1, + c = createCommand("SUSPEND", do_suspend, is_services_oper, -1, -1, -1, CHAN_SERVADMIN_HELP_SUSPEND, CHAN_SERVADMIN_HELP_SUSPEND); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); - c = createCommand("UNSUSPEND", do_unsuspend, is_services_admin, -1, -1, + c = createCommand("UNSUSPEND", do_unsuspend, is_services_oper, -1, -1, -1, CHAN_SERVADMIN_HELP_UNSUSPEND, CHAN_SERVADMIN_HELP_UNSUSPEND); moduleAddCommand(CHANSERV, c, MOD_UNIQUE); @@ -61,7 +61,7 @@ void AnopeFini(void) **/ void myChanServHelp(User * u) { - if (is_services_admin(u)) { + if (is_services_oper(u)) { notice_lang(s_ChanServ, u, CHAN_HELP_CMD_SUSPEND); notice_lang(s_ChanServ, u, CHAN_HELP_CMD_UNSUSPEND); } diff --git a/src/core/ns_saset.c b/src/core/ns_saset.c index f4bffeb17..47a37179d 100644 --- a/src/core/ns_saset.c +++ b/src/core/ns_saset.c @@ -46,47 +46,47 @@ int AnopeInit(int argc, char **argv) moduleAddVersion("$Id: ns_set.c 850 2005-08-07 14:52:04Z geniusdex $"); moduleSetType(CORE); - c = createCommand("SASET", do_saset, is_services_admin, -1, -1, -1, + c = createCommand("SASET", do_saset, is_services_oper, -1, -1, -1, NICK_HELP_SASET, NICK_HELP_SASET); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SASET DISPLAY", NULL, is_services_admin, + c = createCommand("SASET DISPLAY", NULL, is_services_oper, NICK_HELP_SASET_DISPLAY, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SASET PASSWORD", NULL, is_services_admin, + c = createCommand("SASET PASSWORD", NULL, is_services_oper, NICK_HELP_SASET_PASSWORD, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SASET URL", NULL, is_services_admin, + c = createCommand("SASET URL", NULL, is_services_oper, NICK_HELP_SASET_URL, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SASET EMAIL", NULL, is_services_admin, + c = createCommand("SASET EMAIL", NULL, is_services_oper, NICK_HELP_SASET_EMAIL, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SASET ICQ", NULL, is_services_admin, + c = createCommand("SASET ICQ", NULL, is_services_oper, NICK_HELP_SASET_ICQ, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SASET GREET", NULL, is_services_admin, + c = createCommand("SASET GREET", NULL, is_services_oper, NICK_HELP_SASET_GREET, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SASET KILL", NULL, is_services_admin, + c = createCommand("SASET KILL", NULL, is_services_oper, NICK_HELP_SASET_KILL, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SASET SECURE", NULL, is_services_admin, + c = createCommand("SASET SECURE", NULL, is_services_oper, NICK_HELP_SASET_SECURE, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SASET PRIVATE", NULL, is_services_admin, + c = createCommand("SASET PRIVATE", NULL, is_services_oper, NICK_HELP_SASET_PRIVATE, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SASET MSG", NULL, is_services_admin, + c = createCommand("SASET MSG", NULL, is_services_oper, NICK_HELP_SASET_MSG, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SASET HIDE", NULL, is_services_admin, + c = createCommand("SASET HIDE", NULL, is_services_oper, NICK_HELP_SASET_HIDE, -1, -1, -1, -1); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SASET NOEXPIRE", NULL, is_services_admin, -1, -1, + c = createCommand("SASET NOEXPIRE", NULL, is_services_oper, -1, -1, -1, NICK_HELP_SASET_NOEXPIRE, NICK_HELP_SASET_NOEXPIRE); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SASET AUTOOP", NULL, is_services_admin, -1, -1, + c = createCommand("SASET AUTOOP", NULL, is_services_oper, -1, -1, -1, NICK_HELP_SASET_AUTOOP, NICK_HELP_SASET_AUTOOP); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); @@ -112,7 +112,7 @@ void AnopeFini(void) **/ void myNickServHelp(User * u) { - if (is_services_admin(u)) + if (is_services_oper(u)) notice_lang(s_NickServ, u, NICK_HELP_CMD_SASET); } diff --git a/src/core/ns_sendpass.c b/src/core/ns_sendpass.c index ce12c21f7..e030856ea 100644 --- a/src/core/ns_sendpass.c +++ b/src/core/ns_sendpass.c @@ -75,7 +75,7 @@ int do_sendpass(User * u) if (!nick) { syntax_error(s_NickServ, u, "SENDPASS", NICK_SENDPASS_SYNTAX); - } else if (RestrictMail && !is_oper(u)) { + } else if (RestrictMail && !is_services_oper(u)) { notice_lang(s_NickServ, u, PERMISSION_DENIED); } else if (!(na = findnick(nick))) { notice_lang(s_NickServ, u, NICK_X_NOT_REGISTERED, nick); diff --git a/src/core/ns_suspend.c b/src/core/ns_suspend.c index ba48c2175..ee1484f05 100644 --- a/src/core/ns_suspend.c +++ b/src/core/ns_suspend.c @@ -33,11 +33,11 @@ int AnopeInit(int argc, char **argv) moduleAddVersion("$Id$"); moduleSetType(CORE); - c = createCommand("SUSPEND", do_suspend, is_services_admin, -1, -1, -1, + c = createCommand("SUSPEND", do_suspend, is_services_oper, -1, -1, -1, NICK_SERVADMIN_HELP_SUSPEND, NICK_SERVADMIN_HELP_SUSPEND); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("UNSUSPEND", do_unsuspend, is_services_admin, -1, -1, + c = createCommand("UNSUSPEND", do_unsuspend, is_services_oper, -1, -1, -1, NICK_SERVADMIN_HELP_UNSUSPEND, NICK_SERVADMIN_HELP_UNSUSPEND); moduleAddCommand(NICKSERV, c, MOD_UNIQUE); @@ -61,7 +61,7 @@ void AnopeFini(void) **/ void myNickServHelp(User * u) { - if (is_services_admin(u)) { + if (is_services_oper(u)) { notice_lang(s_NickServ, u, NICK_HELP_CMD_SUSPEND); notice_lang(s_NickServ, u, NICK_HELP_CMD_UNSUSPEND); } diff --git a/src/core/os_admin.c b/src/core/os_admin.c index 9760b98bd..681cca084 100644 --- a/src/core/os_admin.c +++ b/src/core/os_admin.c @@ -60,9 +60,7 @@ void AnopeFini(void) **/ void myOperServHelp(User * u) { - if (is_oper(u) || is_services_root(u)) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_ADMIN); - } + notice_lang(s_OperServ, u, OPER_HELP_CMD_ADMIN); } /** @@ -173,11 +171,6 @@ int do_admin(User * u) } else if (!stricmp(cmd, "LIST")) { int sent_header = 0; - if (!is_oper(u)) { - notice_lang(s_OperServ, u, PERMISSION_DENIED); - return MOD_CONT; - } - if (servadmins.count == 0) { notice_lang(s_OperServ, u, OPER_ADMIN_LIST_EMPTY); return MOD_CONT; diff --git a/src/core/os_chanlist.c b/src/core/os_chanlist.c index 36d86b769..ca2cf8410 100644 --- a/src/core/os_chanlist.c +++ b/src/core/os_chanlist.c @@ -35,7 +35,7 @@ int AnopeInit(int argc, char **argv) moduleAddVersion("$Id$"); moduleSetType(CORE); - c = createCommand("CHANLIST", do_chanlist, is_services_admin, + c = createCommand("CHANLIST", do_chanlist, NULL, OPER_HELP_CHANLIST, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); @@ -60,9 +60,7 @@ void AnopeFini(void) **/ void myOperServHelp(User * u) { - if (is_services_admin(u)) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_CHANLIST); - } + notice_lang(s_OperServ, u, OPER_HELP_CMD_CHANLIST); } /** diff --git a/src/core/os_global.c b/src/core/os_global.c index 37ddcca78..17039f490 100644 --- a/src/core/os_global.c +++ b/src/core/os_global.c @@ -32,7 +32,7 @@ int AnopeInit(int argc, char **argv) moduleAddVersion("$Id$"); moduleSetType(CORE); - c = createCommand("GLOBAL", do_global, is_services_oper, + c = createCommand("GLOBAL", do_global, is_services_admin, OPER_HELP_GLOBAL, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); moduleSetOperHelp(myOperServHelp); @@ -55,7 +55,7 @@ void AnopeFini(void) **/ void myOperServHelp(User * u) { - if (is_services_oper(u)) { + if (is_services_admin(u)) { notice_lang(s_OperServ, u, OPER_HELP_CMD_GLOBAL); } } diff --git a/src/core/os_logonnews.c b/src/core/os_logonnews.c index 31d482574..0f1762041 100644 --- a/src/core/os_logonnews.c +++ b/src/core/os_logonnews.c @@ -35,7 +35,7 @@ int AnopeInit(int argc, char **argv) * For some unknown reason, do_logonnews is actaully defined in news.c * we can look at moving it here later **/ - c = createCommand("LOGONNEWS", do_logonnews, is_services_oper, + c = createCommand("LOGONNEWS", do_logonnews, is_services_admin, NEWS_HELP_LOGON, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); @@ -59,7 +59,7 @@ void AnopeFini(void) **/ void myOperServHelp(User * u) { - if (is_services_oper(u)) { + if (is_services_admin(u)) { notice_lang(s_OperServ, u, OPER_HELP_CMD_LOGONNEWS); } } diff --git a/src/core/os_oper.c b/src/core/os_oper.c index a0f71f5ff..fe2930ff9 100644 --- a/src/core/os_oper.c +++ b/src/core/os_oper.c @@ -58,9 +58,7 @@ void AnopeFini(void) **/ void myOperServHelp(User * u) { - if (is_oper(u) || is_services_admin(u)) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_OPER); - } + notice_lang(s_OperServ, u, OPER_HELP_CMD_OPER); } /** @@ -83,7 +81,7 @@ int do_oper(User * u) if (!cmd || (!nick && stricmp(cmd, "LIST") && stricmp(cmd, "CLEAR"))) { syntax_error(s_OperServ, u, "OPER", OPER_OPER_SYNTAX); } else if (!stricmp(cmd, "ADD")) { - if (!is_services_admin(u)) { + if (!is_services_root(u)) { notice_lang(s_OperServ, u, PERMISSION_DENIED); return MOD_CONT; } @@ -127,7 +125,7 @@ int do_oper(User * u) if (readonly) notice_lang(s_OperServ, u, READ_ONLY_MODE); } else if (!stricmp(cmd, "DEL")) { - if (!is_services_admin(u)) { + if (!is_services_root(u)) { notice_lang(s_OperServ, u, PERMISSION_DENIED); return MOD_CONT; } @@ -208,7 +206,7 @@ int do_oper(User * u) } } } else if (!stricmp(cmd, "CLEAR")) { - if (!is_services_admin(u)) { + if (!is_services_root(u)) { notice_lang(s_OperServ, u, PERMISSION_DENIED); return MOD_CONT; } diff --git a/src/core/os_opernews.c b/src/core/os_opernews.c index 671016f19..ab958f766 100644 --- a/src/core/os_opernews.c +++ b/src/core/os_opernews.c @@ -35,7 +35,7 @@ int AnopeInit(int argc, char **argv) * For some unknown reason, do_opernews is actaully defined in news.c * we can look at moving it here later **/ - c = createCommand("OPERNEWS", do_opernews, is_services_oper, + c = createCommand("OPERNEWS", do_opernews, is_services_admin, NEWS_HELP_OPER, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); @@ -59,7 +59,7 @@ void AnopeFini(void) **/ void myOperServHelp(User * u) { - if (is_services_oper(u)) { + if (is_services_admin(u)) { notice_lang(s_OperServ, u, OPER_HELP_CMD_OPERNEWS); } } diff --git a/src/core/os_quit.c b/src/core/os_quit.c index 6b7fe8f79..60e3e352a 100644 --- a/src/core/os_quit.c +++ b/src/core/os_quit.c @@ -32,7 +32,7 @@ int AnopeInit(int argc, char **argv) moduleAddVersion("$Id$"); moduleSetType(CORE); - c = createCommand("QUIT", do_os_quit, is_services_admin, + c = createCommand("QUIT", do_os_quit, is_services_root, OPER_HELP_QUIT, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); @@ -56,7 +56,7 @@ void AnopeFini(void) **/ void myOperServHelp(User * u) { - if (is_services_admin(u)) { + if (is_services_root(u)) { notice_lang(s_OperServ, u, OPER_HELP_CMD_QUIT); } } diff --git a/src/core/os_randomnews.c b/src/core/os_randomnews.c index 3a2693e2a..e6a3ef466 100644 --- a/src/core/os_randomnews.c +++ b/src/core/os_randomnews.c @@ -36,7 +36,7 @@ int AnopeInit(int argc, char **argv) * For some unknown reason, do_randomnews is actaully defined in news.c * we can look at moving it here later **/ - c = createCommand("RANDOMNEWS", do_randomnews, is_services_oper, + c = createCommand("RANDOMNEWS", do_randomnews, is_services_admin, NEWS_HELP_RANDOM, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); @@ -60,7 +60,7 @@ void AnopeFini(void) **/ void myOperServHelp(User * u) { - if (is_services_oper(u)) { + if (is_services_admin(u)) { notice_lang(s_OperServ, u, OPER_HELP_CMD_RANDOMNEWS); } } diff --git a/src/core/os_raw.c b/src/core/os_raw.c index c91df3dde..96e77704f 100644 --- a/src/core/os_raw.c +++ b/src/core/os_raw.c @@ -31,7 +31,7 @@ int AnopeInit(int argc, char **argv) moduleAddVersion("$Id$"); moduleSetType(CORE); - c = createCommand("RAW", do_raw, is_services_admin, OPER_HELP_RAW, -1, + c = createCommand("RAW", do_raw, is_services_root, OPER_HELP_RAW, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); diff --git a/src/core/os_reload.c b/src/core/os_reload.c index 2ea882b6c..0ecfae7e6 100644 --- a/src/core/os_reload.c +++ b/src/core/os_reload.c @@ -32,7 +32,7 @@ int AnopeInit(int argc, char **argv) moduleAddVersion("$Id$"); moduleSetType(CORE); - c = createCommand("RELOAD", do_reload, is_services_admin, + c = createCommand("RELOAD", do_reload, is_services_root, OPER_HELP_RELOAD, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); @@ -56,7 +56,7 @@ void AnopeFini(void) **/ void myOperServHelp(User * u) { - if (is_services_admin(u)) { + if (is_services_root(u)) { notice_lang(s_OperServ, u, OPER_HELP_CMD_RELOAD); } } diff --git a/src/core/os_restart.c b/src/core/os_restart.c index 8f2af8a5a..7711e6b13 100644 --- a/src/core/os_restart.c +++ b/src/core/os_restart.c @@ -36,7 +36,7 @@ int AnopeInit(int argc, char **argv) moduleAddAuthor("Anope"); moduleAddVersion("$Id$"); moduleSetType(CORE); - c = createCommand("RESTART", do_restart, is_services_admin, + c = createCommand("RESTART", do_restart, is_services_root, OPER_HELP_RESTART, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); @@ -60,7 +60,7 @@ void AnopeFini(void) **/ void myOperServHelp(User * u) { - if (is_services_admin(u)) { + if (is_services_root(u)) { notice_lang(s_OperServ, u, OPER_HELP_CMD_RESTART); } } diff --git a/src/core/os_session.c b/src/core/os_session.c index 6be2dfb26..b772666ee 100644 --- a/src/core/os_session.c +++ b/src/core/os_session.c @@ -34,10 +34,10 @@ int AnopeInit(int argc, char **argv) /** * do_session/do_exception are exported from sessions.c - we just want to provide an interface. **/ - c = createCommand("SESSION", do_session, is_services_admin, + c = createCommand("SESSION", do_session, is_services_oper, OPER_HELP_SESSION, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); - c = createCommand("EXCEPTION", do_exception, is_services_admin, + c = createCommand("EXCEPTION", do_exception, is_services_oper, OPER_HELP_EXCEPTION, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); @@ -61,7 +61,7 @@ void AnopeFini(void) **/ void myOperServHelp(User * u) { - if (is_services_admin(u)) { + if (is_services_oper(u)) { notice_lang(s_OperServ, u, OPER_HELP_CMD_SESSION); notice_lang(s_OperServ, u, OPER_HELP_CMD_EXCEPTION); } diff --git a/src/core/os_set.c b/src/core/os_set.c index 616d65a57..0092f6283 100644 --- a/src/core/os_set.c +++ b/src/core/os_set.c @@ -32,7 +32,7 @@ int AnopeInit(int argc, char **argv) moduleAddVersion("$Id$"); moduleSetType(CORE); - c = createCommand("SET", do_set, is_services_admin, OPER_HELP_SET, -1, + c = createCommand("SET", do_set, is_services_root, OPER_HELP_SET, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); c = createCommand("SET LIST", NULL, NULL, OPER_HELP_SET_LIST, -1, -1, @@ -82,7 +82,7 @@ void AnopeFini(void) **/ void myOperServHelp(User * u) { - if (is_services_admin(u)) { + if (is_services_root(u)) { notice_lang(s_OperServ, u, OPER_HELP_CMD_SET); } } diff --git a/src/core/os_shutdown.c b/src/core/os_shutdown.c index 74e61436c..449da571d 100644 --- a/src/core/os_shutdown.c +++ b/src/core/os_shutdown.c @@ -32,7 +32,7 @@ int AnopeInit(int argc, char **argv) moduleAddVersion("$Id$"); moduleSetType(CORE); - c = createCommand("SHUTDOWN", do_shutdown, is_services_admin, + c = createCommand("SHUTDOWN", do_shutdown, is_services_root, OPER_HELP_SHUTDOWN, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); @@ -56,7 +56,7 @@ void AnopeFini(void) **/ void myOperServHelp(User * u) { - if (is_services_admin(u)) { + if (is_services_root(u)) { notice_lang(s_OperServ, u, OPER_HELP_CMD_SHUTDOWN); } } diff --git a/src/core/os_stats.c b/src/core/os_stats.c index ddd104e07..bdfddc748 100644 --- a/src/core/os_stats.c +++ b/src/core/os_stats.c @@ -35,10 +35,10 @@ int AnopeInit(int argc, char **argv) moduleAddVersion("$Id$"); moduleSetType(CORE); - c = createCommand("STATS", do_stats, is_services_oper, OPER_HELP_STATS, + c = createCommand("STATS", do_stats, NULL, OPER_HELP_STATS, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); - c = createCommand("UPTIME", do_stats, is_services_oper, + c = createCommand("UPTIME", do_stats, NULL, OPER_HELP_STATS, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); @@ -62,9 +62,7 @@ void AnopeFini(void) **/ void myOperServHelp(User * u) { - if (is_services_oper(u)) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_STATS); - } + notice_lang(s_OperServ, u, OPER_HELP_CMD_STATS); } /** diff --git a/src/core/os_update.c b/src/core/os_update.c index 2ec18ebde..3045d3e0b 100644 --- a/src/core/os_update.c +++ b/src/core/os_update.c @@ -32,7 +32,7 @@ int AnopeInit(int argc, char **argv) moduleAddVersion("$Id$"); moduleSetType(CORE); - c = createCommand("UPDATE", do_update, is_services_admin, + c = createCommand("UPDATE", do_update, is_services_root, OPER_HELP_UPDATE, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); @@ -56,7 +56,7 @@ void AnopeFini(void) **/ void myOperServHelp(User * u) { - if (is_services_admin(u)) { + if (is_services_root(u)) { notice_lang(s_OperServ, u, OPER_HELP_CMD_UPDATE); } } diff --git a/src/core/os_userlist.c b/src/core/os_userlist.c index 215128ff4..a92993947 100644 --- a/src/core/os_userlist.c +++ b/src/core/os_userlist.c @@ -37,7 +37,7 @@ int AnopeInit(int argc, char **argv) moduleAddVersion("$Id$"); moduleSetType(CORE); - c = createCommand("USERLIST", do_userlist, is_services_admin, + c = createCommand("USERLIST", do_userlist, NULL, OPER_HELP_USERLIST, -1, -1, -1, -1); moduleAddCommand(OPERSERV, c, MOD_UNIQUE); @@ -61,9 +61,7 @@ void AnopeFini(void) **/ void myOperServHelp(User * u) { - if (is_services_admin(u)) { - notice_lang(s_OperServ, u, OPER_HELP_CMD_USERLIST); - } + notice_lang(s_OperServ, u, OPER_HELP_CMD_USERLIST); } /** |