Fix CommandCSMode::CanSet letting everyone set voice

2 files changed, 6 insertions, 6 deletions

diff --git a/modules/commands/cs_mode.cpp b/modules/commands/cs_mode.cpp
index 5a6a51d4e..8c2845178 100644
--- a/modules/commands/cs_mode.cpp
+++ b/modules/commands/cs_mode.cpp
@@ -25,7 +25,7 @@ class CommandCSMode : public Command
 		const Anope::string modes[] = { "VOICE", "HALFOP", "OP", "PROTECT", "OWNER" };
 		ChannelModeStatus *cms = anope_dynamic_static_cast<ChannelModeStatus *>(cm);
 		AccessGroup access = source.AccessFor(ci);
-		unsigned short u_level = 0;
+		short u_level = -1;
 
 		for (int i = 0; !accesses[i].empty(); ++i)
 			if (access.HasPriv(self ? accesses_self[i] : accesses[i]))
@@ -34,11 +34,11 @@ class CommandCSMode : public Command
 				if (cm2 == NULL || cm2->type != MODE_STATUS)
 					continue;
 				ChannelModeStatus *cms2 = anope_dynamic_static_cast<ChannelModeStatus *>(cm2);
-				if (cms2->Level > u_level)
-					u_level = cms2->Level;
+				if (cms2->level > u_level)
+					u_level = cms2->level;
 			}
 
-		return u_level >= cms->Level;
+		return u_level >= cms->level;
 	}
 
 	void DoLock(CommandSource &source, ChannelInfo *ci, const std::vector<Anope::string> &params)
diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp
index 2c6e562f1..9815438fa 100644
--- a/modules/protocol/inspircd20.cpp
+++ b/modules/protocol/inspircd20.cpp
@@ -454,7 +454,7 @@ struct IRCDMessageCapab : Message::Capab
 				{
 					Anope::string modes(capab.begin() + 8, capab.begin() + capab.find(')'));
 					Anope::string chars(capab.begin() + capab.find(')') + 1, capab.end());
-					unsigned short level = modes.length() - 1;
+					short level = modes.length() - 1;
 
 					for (size_t t = 0, end = modes.length(); t < end; ++t)
 					{
@@ -466,7 +466,7 @@ struct IRCDMessageCapab : Message::Capab
 						}
 
 						ChannelModeStatus *cms = anope_dynamic_static_cast<ChannelModeStatus *>(cm);
-						cms->Level = level--;
+						cms->level = level--;
 					}
 				}
 			}