5 files changed, 14 insertions, 10 deletions
diff --git a/modules/protocol/inspircd12.cpp b/modules/protocol/inspircd12.cpp
index ecac4a4f9..82d43434c 100644
--- a/modules/protocol/inspircd12.cpp
+++ b/modules/protocol/inspircd12.cpp
@@ -768,9 +768,9 @@ class ProtoInspIRCd : public Module
 
 	void OnServerSync(Server *s)
 	{
-		for (patricia_tree<User *, ci::ci_char_traits>::iterator it(UserListByNick); it.next();)
+		for (Anope::insensitive_map<User *>::iterator it = UserListByNick.begin(); it != UserListByNick.end(); ++it)
 		{
-			User *u = *it;
+			User *u = it->second;
 			if (u->server == s && !u->IsIdentified())
 				validate_user(u);
 		}
diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp
index 87fe74c69..575958bd8 100644
--- a/modules/protocol/inspircd20.cpp
+++ b/modules/protocol/inspircd20.cpp
@@ -759,9 +759,9 @@ class ProtoInspIRCd : public Module
 
 	void OnServerSync(Server *s)
 	{
-		for (patricia_tree<User *, ci::ci_char_traits>::iterator it(UserListByNick); it.next();)
+		for (Anope::insensitive_map<User *>::iterator it = UserListByNick.begin(); it != UserListByNick.end(); ++it)
 		{
-			User *u = *it;
+			User *u = it->second;
 			if (u->server == s && !u->IsIdentified())
 				validate_user(u);
 		}
diff --git a/modules/protocol/ngircd.cpp b/modules/protocol/ngircd.cpp
index 94b253a58..6e1f21feb 100644
--- a/modules/protocol/ngircd.cpp
+++ b/modules/protocol/ngircd.cpp
@@ -46,9 +46,13 @@ class ngIRCdProto : public IRCDProto
 	void SendAkill(User *u, const XLine *x)
 	{
 		if (SGLine && u == NULL)
-			for (patricia_tree<User *, ci::ci_char_traits>::iterator it(UserListByNick); it.next();)
-				if (SGLine->Check(*it) != NULL)
+			for (Anope::insensitive_map<User *>::iterator it = UserListByNick.begin(); it != UserListByNick.end();)
+			{
+				u = it->second;
+				++it;
+				if (SGLine->Check(u) != NULL)
 					break;
+			}
 	}
 
 	void SendAkillDel(const XLine*) { }
diff --git a/modules/protocol/plexus.cpp b/modules/protocol/plexus.cpp
index edfdfeec4..3b299e962 100644
--- a/modules/protocol/plexus.cpp
+++ b/modules/protocol/plexus.cpp
@@ -644,9 +644,9 @@ class ProtoPlexus : public Module
 
 	void OnServerSync(Server *s)
 	{
-		for (patricia_tree<User *, ci::ci_char_traits>::iterator it(UserListByNick); it.next();)
+		for (Anope::insensitive_map<User *>::iterator it = UserListByNick.begin(); it != UserListByNick.end(); ++it)
 		{
-			User *u = *it;
+			User *u = it->second;
 			if (u->server == s && !u->IsIdentified())
 				validate_user(u);
 		}
diff --git a/modules/protocol/ratbox.cpp b/modules/protocol/ratbox.cpp
index a5f58057e..62a8d5a72 100644
--- a/modules/protocol/ratbox.cpp
+++ b/modules/protocol/ratbox.cpp
@@ -579,9 +579,9 @@ class ProtoRatbox : public Module
 
 	void OnServerSync(Server *s)
 	{
-		for (patricia_tree<User *, ci::ci_char_traits>::iterator it(UserListByNick); it.next();)
+		for (Anope::insensitive_map<User *>::iterator it = UserListByNick.begin(); it != UserListByNick.end(); ++it)
 		{
-			User *u = *it;
+			User *u = it->second;
 			if (u->server == s && !u->IsIdentified())
 				validate_user(u);
 		}