Fix this to display the channel name when overriding a ban, and to properly display +i overrides in the right way

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5541 e03df62e-2008-0410-955e-edbf42e46eb7

2 files changed, 8 insertions, 10 deletions

diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index ccc8191a6..edfffcca4 100644
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -248,20 +248,18 @@ class ModuleOverride : public Module
 			{
 				if ((chan->modes[CM_INVITEONLY]) && (CanOverride(user,"INVITE")))
 				{
-					if (NoisyOverride)
+					irc::string x = chan->name;
+					if (!user->IsInvited(x))
 					{
-						irc::string x = chan->name;
-						if (!user->IsInvited(x))
-						{
-							/* XXX - Ugly cast for a parameter that isn't used? :< - Om */
+						/* XXX - Ugly cast for a parameter that isn't used? :< - Om */
+						if (NoisyOverride)
 							chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper-override to bypass invite-only", cname, user->nick);
-						}
+						ServerInstance->SNO->WriteToSnoMask('O',std::string(user->nick)+" used operoverride to bypass +i on "+std::string(cname));
 					}
-					ServerInstance->SNO->WriteToSnoMask('O',std::string(user->nick)+" used operoverride to bypass +i on "+std::string(cname));
 					return -1;
 				}
 				
-				if ((chan->key[0]) && (CanOverride(user,"KEY")))
+				if ((*chan->key) && (CanOverride(user,"KEY")))
 				{
 					if (NoisyOverride)
 						chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper-override to bypass the channel key", cname, user->nick);
@@ -283,7 +281,7 @@ class ModuleOverride : public Module
 					{
 						if (NoisyOverride)
 							chan->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s used oper-override to bypass channel ban", cname, user->nick);
-						ServerInstance->SNO->WriteToSnoMask('O',"%s used oper-override to bypass channel ban", user->nick);
+						ServerInstance->SNO->WriteToSnoMask('O',"%s used oper-override to bypass channel ban on %s", user->nick, cname);
 					}
 					return -1;
 				}
diff --git a/src/socketengine_epoll.cpp b/src/socketengine_epoll.cpp
index 63b1fc10d..3d0b7dee0 100644
--- a/src/socketengine_epoll.cpp
+++ b/src/socketengine_epoll.cpp
@@ -115,7 +115,7 @@ int EPollEngine::GetRemainingFds()
 
 int EPollEngine::DispatchEvents()
 {
-	int i = epoll_wait(EngineHandle, events, MAX_DESCRIPTORS, 50);
+	int i = epoll_wait(EngineHandle, events, MAX_DESCRIPTORS, 150);
 	for (int j = 0; j < i; j++)
 	{
 		ServerInstance->Log(DEBUG,"Handle %s event on fd %d",ref[events[j].data.fd]->Readable() ? "read" : "write", ref[events[j].data.fd]->GetFd());