diff options
| author | adam- <adam-@5417fbe8-f217-4b02-8779-1006273d7864> | 2009-06-23 16:56:38 +0000 |
|---|---|---|
| committer | adam- <adam-@5417fbe8-f217-4b02-8779-1006273d7864> | 2009-06-23 16:56:38 +0000 |
| commit | dc8f7923f4c9cd685a338072bcc2bb351bf575d9 (patch) | |
| tree | cb55529a96b40d43b2646640a06cc248efa76efb /src/core/cs_kick.c | |
| parent | 59c1a509b4264648a6ef61e96b85f06f735d6dd6 (diff) | |
Adds check for using commands on non-registered channels before the
commands are called
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2336 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src/core/cs_kick.c')
| -rw-r--r-- | src/core/cs_kick.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/core/cs_kick.c b/src/core/cs_kick.c index be30f792f..f7049593d 100644 --- a/src/core/cs_kick.c +++ b/src/core/cs_kick.c @@ -35,7 +35,7 @@ class CommandCSKick : public Command reason = params[2].c_str(); } - Channel *c; + Channel *c = findchan(chan); ChannelInfo *ci; User *u2; @@ -47,10 +47,11 @@ class CommandCSKick : public Command is_same = (target == u->nick) ? 1 : (stricmp(target, u->nick) == 0); - if (!(c = findchan(chan))) { + if (c) + ci = c->ci; + + if (!c) { notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan); - } else if (!(ci = c->ci)) { - notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, chan); } else if (is_same ? !(u2 = u) : !(u2 = finduser(target))) { notice_lang(s_ChanServ, u, NICK_X_NOT_IN_USE, target); } else if (!is_on_chan(c, u2)) { |