3 files changed, 47 insertions, 2 deletions
diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index 28617c56b..c80c53b72 100644
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -149,7 +149,7 @@ class ModuleIdent : public Module
 	std::string IdentBindIP;
  public:
 	ModuleIdent(InspIRCd *Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		OnRehash(NULL, "");
 	}
diff --git a/src/modules/m_operflood.cpp b/src/modules/m_operflood.cpp
new file mode 100644
index 000000000..390dd1fe1
--- /dev/null
+++ b/src/modules/m_operflood.cpp
@@ -0,0 +1,45 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+#include "inspircd.h"
+#include "users.h"
+#include "channels.h"
+#include "modules.h"
+
+/* $ModDesc: Removes flood limits from users upon opering up. */
+class ModuleOperFlood : public Module
+{
+public:
+	ModuleOperFlood(InspIRCd * Me) : Module(Me) {}
+
+	void Implements(char * List)
+	{
+		List[I_OnPostOper] = 1;
+	}
+
+	Version GetVersion()
+	{
+		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+	}
+
+	void OnPostOper(userrec* user, const std::string &opertype)
+	{
+		if(!IS_LOCAL(user))
+			return;
+
+		user->flood = 0;
+		user->WriteServ("NOTICE %s :*** You are now free from flood limits.", user->nick);
+	}
+};
+
+MODULE_INIT(ModuleOperFlood);
diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 1d6b0dfa8..579276b54 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -1681,7 +1681,7 @@ int TreeSocket::OnIncomingConnection(int newsock, char* ip)
 		if (!found)
 		{
 			Utils->Creator->RemoteMessage(NULL,"Server connection from %s denied (no link blocks with that IP address)", ip);
-			close(newsock);
+			Instance->SE->Close(newsock);
 			return false;
 		}
 	}