summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2006-09-10 18:23:09 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2006-09-10 18:23:09 +0000
commitc5077c1c908ffb5581b8c54253d63ea6b38c0be0 (patch)
tree25174c1b41a9dc44347e3bba17e86478f5ea7f35 /src
parent452112ed232834a029ee007f7200e36bc235525f (diff)
Dont allow keys of length >= 32
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5206 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src')
-rw-r--r--src/modes/cmode_k.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/modes/cmode_k.cpp b/src/modes/cmode_k.cpp
index 18fb2165b..fd5808b73 100644
--- a/src/modes/cmode_k.cpp
+++ b/src/modes/cmode_k.cpp
@@ -58,13 +58,12 @@ ModeAction ModeChannelKey::OnModeChange(userrec* source, userrec* dest, chanrec*
if (((channel->modes[CM_KEY]) && (strcasecmp(parameter.c_str(),channel->key))) && (IS_LOCAL(source)))
{
/* Key is currently set and the correct key wasnt given */
- ServerInstance->Log(DEBUG,"Key Cond 2");
return MODEACTION_DENY;
}
else if ((!channel->modes[CM_KEY]) || ((adding) && (!IS_LOCAL(source))))
{
/* Key isnt currently set */
- if ((parameter.length()) && (parameter.rfind(' ') == std::string::npos))
+ if ((parameter.length()) && (parameter.length() < 32) && (parameter.rfind(' ') == std::string::npos))
{
strlcpy(channel->key,parameter.c_str(),32);
channel->modes[CM_KEY] = adding;
@@ -80,12 +79,11 @@ ModeAction ModeChannelKey::OnModeChange(userrec* source, userrec* dest, chanrec*
channel->modes[CM_KEY] = adding;
return MODEACTION_ALLOW;
}
- ServerInstance->Log(DEBUG,"Key Cond three");
return MODEACTION_DENY;
}
else
{
- ServerInstance->Log(DEBUG,"Key Condition one");
return MODEACTION_DENY;
}
}
+