forward port of asuka-nickgline.patch to .12

[irc/quakenet/snircd.git] / ircd / whocmds.c

diff --git a/ircd/whocmds.c b/ircd/whocmds.c
index 195b4b133fa6a6b654f80bd5da51968c4a13d3d2..3da51d15103268c68036ba04d840f544de8ef956 100644 (file)
--- a/ircd/whocmds.c
+++ b/ircd/whocmds.c
@@ -269,17 +269,17 @@ count_users(char *mask)
 {
   struct Client *acptr;
   int count = 0;
-  char namebuf[USERLEN + HOSTLEN + 2];
+  char namebuf[NICKLEN + USERLEN + HOSTLEN + 3];
   char ipbuf[USERLEN + 16 + 2];
 
   for (acptr = GlobalClientList; acptr; acptr = cli_next(acptr)) {
     if (!IsUser(acptr))
       continue;
 
-    ircd_snprintf(0, namebuf, sizeof(namebuf), "%s@%s",
+    ircd_snprintf(0, namebuf, sizeof(namebuf), "%s!%s@%s", cli_name(acptr),
                  cli_user(acptr)->username, cli_user(acptr)->host);
-    ircd_snprintf(0, ipbuf, sizeof(ipbuf), "%s@%s", cli_user(acptr)->username,
-                 ircd_ntoa(&cli_ip(acptr)));
+    ircd_snprintf(0, ipbuf, sizeof(ipbuf), "%s!%s@%s", cli_name(acptr),
+                  cli_user(acptr)->username, ircd_ntoa(&(cli_ip(acptr))));
 
     if (!match(mask, namebuf) || !match(mask, ipbuf))
       count++;