Move botserv/administration "metacommand" to a priv. What was I smoking when I wrote this?

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2085 5417fbe8-f217-4b02-8779-1006273d7864

6 files changed, 7 insertions, 7 deletions

diff --git a/src/core/bs_assign.c b/src/core/bs_assign.c
index 8d11dd6c3..8a4c717d0 100644
--- a/src/core/bs_assign.c
+++ b/src/core/bs_assign.c
@@ -67,7 +67,7 @@ class CommandBSAssign : public Command
 			return MOD_CONT;
 		}
 
-		if ((ci->botflags & BS_NOBOT) || (!check_access(u, ci, CA_ASSIGN) && !u->nc->HasCommand("botserv/administration")))
+		if ((ci->botflags & BS_NOBOT) || (!check_access(u, ci, CA_ASSIGN) && !u->nc->HasPriv("botserv/administration")))
 		{
 			notice_lang(s_BotServ, u, PERMISSION_DENIED);
 			return MOD_CONT;
diff --git a/src/core/bs_badwords.c b/src/core/bs_badwords.c
index 1b7007745..ad1bb7e49 100644
--- a/src/core/bs_badwords.c
+++ b/src/core/bs_badwords.c
@@ -261,7 +261,7 @@ class CommandBSBadwords : public Command
 			return MOD_CONT;
 		}
 
-		if (!check_access(u, ci, CA_BADWORDS) && (!need_args || !u->nc->HasCommand("botserv/administration")))
+		if (!check_access(u, ci, CA_BADWORDS) && (!need_args || !u->nc->HasPriv("botserv/administration")))
 		{
 			notice_lang(s_BotServ, u, ACCESS_DENIED);
 			return MOD_CONT;
diff --git a/src/core/bs_info.c b/src/core/bs_info.c
index 9d671c504..3b98e5eb5 100644
--- a/src/core/bs_info.c
+++ b/src/core/bs_info.c
@@ -80,12 +80,12 @@ class CommandBSInfo : public Command
 									BOT_INFO_OPT_NONE));
 			notice_lang(s_BotServ, u, BOT_INFO_BOT_USAGE, bi->chancount);
 
-			if (u->nc->HasCommand("botserv/administration"))
+			if (u->nc->HasPriv("botserv/administration"))
 				this->send_bot_channels(u, bi);
 		}
 		else if ((ci = cs_findchan(query)))
 		{
-			if (!is_founder(u, ci) && !u->nc->HasCommand("botserv/administration"))
+			if (!is_founder(u, ci) && !u->nc->HasPriv("botserv/administration"))
 			{
 				notice_lang(s_BotServ, u, PERMISSION_DENIED);
 				return MOD_CONT;
diff --git a/src/core/bs_kick.c b/src/core/bs_kick.c
index 53485f011..525a6da23 100644
--- a/src/core/bs_kick.c
+++ b/src/core/bs_kick.c
@@ -44,7 +44,7 @@ class CommandBSKick : public Command
 			notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
 		else if (ci->flags & CI_FORBIDDEN)
 			notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan);
-		else if (!check_access(u, ci, CA_SET) && !u->nc->HasCommand("botserv/administration"))
+		else if (!check_access(u, ci, CA_SET) && !u->nc->HasPriv("botserv/administration"))
 			notice_lang(s_BotServ, u, ACCESS_DENIED);
 		else if (!ci->bi)
 			notice_help(s_BotServ, u, BOT_NOT_ASSIGNED);
diff --git a/src/core/bs_set.c b/src/core/bs_set.c
index 3d97f7407..b03b622b1 100644
--- a/src/core/bs_set.c
+++ b/src/core/bs_set.c
@@ -66,7 +66,7 @@ class CommandBSSet : public Command
 			notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
 		else if (ci->flags & CI_FORBIDDEN)
 			notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan);
-		else if (!u->nc->HasCommand("botserv/administration") && !check_access(u, ci, CA_SET))
+		else if (!u->nc->HasPriv("botserv/administration") && !check_access(u, ci, CA_SET))
 			notice_lang(s_BotServ, u, ACCESS_DENIED);
 		else {
 			if (!stricmp(option, "DONTKICKOPS")) {
diff --git a/src/core/bs_unassign.c b/src/core/bs_unassign.c
index 77a14091e..9749f0eb3 100644
--- a/src/core/bs_unassign.c
+++ b/src/core/bs_unassign.c
@@ -36,7 +36,7 @@ class CommandBSUnassign : public Command
 			notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan);
 		else if (ci->flags & CI_FORBIDDEN)
 			notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan);
-		else if (!u->nc->HasCommand("botserv/administration")  && !check_access(u, ci, CA_ASSIGN))
+		else if (!u->nc->HasPriv("botserv/administration")  && !check_access(u, ci, CA_ASSIGN))
 			notice_lang(s_BotServ, u, ACCESS_DENIED);
 		else if (!ci->bi)
 			notice_help(s_BotServ, u, BOT_NOT_ASSIGNED);