Retain the "real" username properly like we do for hostnames.

This introduces the concept of a real username. This value comes
from either the initial USER message or from an ident lookup. Doing
this allows us to use it for bans through vidents and cloaking web
client users using their remote username.

While changing this I also changed all of the uses of "ident" other
than RFC 1413 lookups and some compatibility cases to refer to
usernames as user(name) instead of ident. Our use of ident in these
places was incorrect as that only refers to the RFC 1413 response
and is not commonly used in the way we used it by any other IRC
server implementations.

1 files changed, 10 insertions, 3 deletions

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 32b1ac72b..83bcabb86 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -351,10 +351,10 @@ public:
 						result.append(chan->name);
 					i += 4;
 				}
-				else if (!newline.compare(i, 6, "$ident", 6))
+				else if (!newline.compare(i, 5, "$user", 5))
 				{
-					result.append(user->ident);
-					i += 5;
+					result.append(user->GetRealUser());
+					i += 4;
 				}
 				else if (!newline.compare(i, 6, "$vhost", 6))
 				{
@@ -366,6 +366,13 @@ public:
 					result.append(a.RequiredNick);
 					i += 11;
 				}
+				else if (!newline.compare(i, 6, "$ident", 6))
+				{
+					// TODO: remove this in the next major release.
+					result.append(user->GetRealHost());
+					i += 5;
+				}
+
 				else
 					result.push_back(c);
 			}