At paulr's suggestion, make WHO and WHOIS more similar w.r.t. ERR_QUERYTOOLONG.

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/branches/u2_10_12_branch@1829 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index 043cf2ba801b5eba17279ddb829d591c9b4b74bb..49c14fe6ceaa6ceed89769fbcf56bab5e8fc32dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-13  Michael Poole <mdpoole@troilus.org>
+
+       * ircd/m_who.c (m_who): Reorder responses and change the
+       ERR_QUERYTOOLONG parameter to be consistent with m_whois().
+       
 2007-08-13  Michael Poole <mdpoole@troilus.org>
 
        * ircd/s_user.c (register_user): Initialize umodev[] in a

diff --git a/ircd/m_who.c b/ircd/m_who.c
index 9ee0f074d0bdddc9fa69443e51b231fb09491575..f344e6f2e88587250d73f1e348a1e772c0dfbfb0 100644 (file)
--- a/ircd/m_who.c
+++ b/ircd/m_who.c
@@ -466,11 +466,10 @@ int m_who(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   /* Make a clean mask suitable to be sent in the "end of" */
   if (mask && (p = strchr(mask, ' ')))
     *p = '\0';
-  send_reply(sptr, RPL_ENDOFWHO, BadPtr(mask) ? "*" : mask);
-
   /* Notify the user if we decided that his query was too long */
   if (counter < 0)
-    send_reply(sptr, ERR_QUERYTOOLONG, "WHO");
+    send_reply(sptr, ERR_QUERYTOOLONG, BadPtr(mask) ? "*" : mask);
+  send_reply(sptr, RPL_ENDOFWHO, BadPtr(mask) ? "*" : mask);
 
   return 0;
 }