Make gline.c's count_users() use real host for masked users.

This fixes SourceForge bug #2992886.

diff --git a/ChangeLog b/ChangeLog
index eb654362a6573bba8c6d7aa638bc2f5b205257e8..9d8aa471cf11b351809b6fd9b01c087cfa014439 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-07  Michael Poole <mdpoole@troilus.org>
+
+       * ircd/gline.c (count_users): Use the client's real host, rather
+       than their masked host, for +x users.
+
 2012-04-29  Michael Poole <mdpoole@troilus.org>
 
        * ircd/crule.c (crule_connected): Fix logic for ignoring

diff --git a/ircd/gline.c b/ircd/gline.c
index d25dbfaeab9a630bb2c4ef0e11093a081c85a526..4f95526448498e3b968574027a68d3e2ffff953f 100644 (file)
--- a/ircd/gline.c
+++ b/ircd/gline.c
@@ -371,7 +371,7 @@ count_users(char *mask, int flags)
       continue;
 
     ircd_snprintf(0, namebuf, sizeof(namebuf), "%s@%s",
-                 cli_user(acptr)->username, cli_user(acptr)->host);
+                 cli_user(acptr)->username, cli_user(acptr)->realhost);
     ircd_snprintf(0, ipbuf, sizeof(ipbuf), "%s@%s", cli_user(acptr)->username,
                  ircd_ntoa(&cli_ip(acptr)));