Send ERR_KEYSET when trying to change a channel key.

Closes #1750.

diff --git a/src/coremods/core_channel/cmode_k.cpp b/src/coremods/core_channel/cmode_k.cpp
index ea4b5241db311b39d172e3e258ccc37ee11f84a8..495af36503a26082b9d862c9bde4a37b40966555 100644 (file)
--- a/src/coremods/core_channel/cmode_k.cpp
+++ b/src/coremods/core_channel/cmode_k.cpp
@@ -46,6 +46,7 @@ ModeAction ModeChannelKey::OnModeChange(User* source, User*, Channel* channel, s
                if (exists && (parameter != *key))
                {
                        /* Key is currently set and the correct key wasn't given */
+                       source->WriteNumeric(ERR_KEYSET, channel->name, "Channel key already set");
                        return MODEACTION_DENY;
                }
        } else {

diff --git a/src/coremods/core_channel/core_channel.h b/src/coremods/core_channel/core_channel.h
index 3701b9a713289d5a4436fcd8e305226886f91655..26b23c3ea5a5c2c93fed9e02a54ba97e40bcc762 100644 (file)
--- a/src/coremods/core_channel/core_channel.h
+++ b/src/coremods/core_channel/core_channel.h
@@ -54,7 +54,8 @@ enum
 {
        // From RFC 1459.
        RPL_BANLIST = 367,
-       RPL_ENDOFBANLIST = 368
+       RPL_ENDOFBANLIST = 368,
+       ERR_KEYSET = 467
 };
 
 /** Handle /INVITE.