diff options
| author | Adam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864> | 2010-03-16 20:21:54 +0000 |
|---|---|---|
| committer | Adam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864> | 2010-03-16 20:21:54 +0000 |
| commit | 72fa53c20e1ffc8abca1dfa4dfa6a3a51453e5f6 (patch) | |
| tree | 6946dc114e562b7482926db807fd72a4f03db9cf /src/core/cs_kick.c | |
| parent | eb0c255fadec7c81bc318c944ada86131f5872bd (diff) | |
Fixed bug #1141, reordered some access checks in cs_kick and cs_modes to hide who is on the channel
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2818 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src/core/cs_kick.c')
| -rw-r--r-- | src/core/cs_kick.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/cs_kick.c b/src/core/cs_kick.c index 3795d7ebd..bf8fe72d0 100644 --- a/src/core/cs_kick.c +++ b/src/core/cs_kick.c @@ -123,8 +123,6 @@ int do_cs_kick(User * u) notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, chan); } else if (is_same ? !(u2 = u) : !(u2 = finduser(params))) { notice_lang(s_ChanServ, u, NICK_X_NOT_IN_USE, params); - } else if (!is_on_chan(c, u2)) { - notice_lang(s_ChanServ, u, NICK_X_NOT_ON_CHAN, u2->nick, c->name); } else if (!is_same ? !check_access(u, ci, CA_KICK) : !check_access(u, ci, CA_KICKME)) { notice_lang(s_ChanServ, u, ACCESS_DENIED); @@ -133,6 +131,8 @@ int do_cs_kick(User * u) notice_lang(s_ChanServ, u, PERMISSION_DENIED); } else if (is_protected(u2)) { notice_lang(s_ChanServ, u, PERMISSION_DENIED); + } else if (!is_on_chan(c, u2)) { + notice_lang(s_ChanServ, u, NICK_X_NOT_ON_CHAN, u2->nick, c->name); } else { char *av[3]; |