Added options:nomlock

2 files changed, 3 insertions, 1 deletions

diff --git a/include/config.h b/include/config.h
index 4a5fc0d97..f923b76b0 100644
--- a/include/config.h
+++ b/include/config.h
@@ -544,6 +544,8 @@ class CoreExport ServerConfig
 	unsigned NewsCount;
 	/* Default mlock modes */
 	Anope::string MLock;
+	/* Unmlockable modes */
+	Anope::string NoMLock;
 	/* Default botmodes on channels, defaults to ao */
 	Anope::string BotModes;
 	/* THe actual modes */
diff --git a/include/modes.h b/include/modes.h
index 2ecf6f1ec..868feab81 100644
--- a/include/modes.h
+++ b/include/modes.h
@@ -195,7 +195,7 @@ class CoreExport ChannelMode : public Mode
 	 * NOTE: User CAN be NULL, this is for checking if it can be locked with defcon
 	 * @param u The user, or NULL
 	 */
-	virtual bool CanSet(User *u) const { return true; }
+	bool CanSet(User *u) const;
 };