added basic ssl support to ircu

[ircu2.10.12-pk.git] / ircd / m_lusers.c

diff --git a/ircd/m_lusers.c b/ircd/m_lusers.c
index d06ffdb4eca4d82350c9fd7c308db5447274a7ff..573fa52c58c83edc55f365a7321e791595a2ec5c 100644 (file)
--- a/ircd/m_lusers.c
+++ b/ircd/m_lusers.c
@@ -81,17 +81,10 @@
  */
 #include "config.h"
 
-#if 0
-/*
- * No need to include handlers.h here the signatures must match
- * and we don't need to force a rebuild of all the handlers everytime
- * we add a new one to the list. --Bleep
- */
-#include "handlers.h"
-#endif /* 0 */
 #include "client.h"
 #include "ircd.h"
-#include "ircd_policy.h"
+#include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "msg.h"
@@ -102,7 +95,7 @@
 #include "s_serv.h"
 #include "send.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 
 /*
  * m_lusers - generic message handler
@@ -115,11 +108,14 @@ int m_lusers(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
 {
   int longoutput = MyUser(sptr) || IsOper(sptr);
   if (parc > 2)
-    if (hunt_server_cmd(sptr, CMD_LUSERS, cptr, HEAD_IN_SAND_REMOTE, "%s :%C",
-                       2, parc, parv) != HUNTED_ISME)
+    if (hunt_server_cmd(sptr, CMD_LUSERS, cptr, feature_int(FEAT_HIS_REMOTE),
+                        "%s :%C", 2, parc, parv) != HUNTED_ISME)
       return 0;
 
-  send_reply(sptr, RPL_LUSERCLIENT, UserStats.clients - UserStats.inv_clients,
+  assert(UserStats.inv_clients <= UserStats.clients + UserStats.unknowns);
+
+  send_reply(sptr, RPL_LUSERCLIENT, 
+            UserStats.clients - UserStats.inv_clients + UserStats.unknowns,
             UserStats.inv_clients, UserStats.servers);
   if (longoutput && UserStats.opers)
     send_reply(sptr, RPL_LUSEROP, UserStats.opers);
@@ -169,46 +165,3 @@ int ms_lusers(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
 
   return 0;
 }
-
-  
-#if 0
-/*
- * m_lusers
- *
- * parv[0] = sender
- * parv[1] = ignored
- * parv[2] = server to query
- */
-int m_lusers(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
-{
-  int longoutput = MyUser(sptr) || IsOper(sptr);
-  if (parc > 2)
-    if (hunt_server(0, cptr, sptr, "%s%s " TOK_LUSERS " %s :%s", 2, parc, parv) != /* XXX DEAD */
-        HUNTED_ISME)
-      return 0;
-
-  sendto_one(sptr, rpl_str(RPL_LUSERCLIENT), me.name, parv[0], /* XXX DEAD */
-      UserStats.clients - UserStats.inv_clients, UserStats.inv_clients, UserStats.servers);
-  if (longoutput && UserStats.opers)
-    sendto_one(sptr, rpl_str(RPL_LUSEROP), me.name, parv[0], UserStats.opers); /* XXX DEAD */
-  if (UserStats.unknowns > 0)
-    sendto_one(sptr, rpl_str(RPL_LUSERUNKNOWN), me.name, parv[0], /* XXX DEAD */
-        UserStats.unknowns);
-  if (longoutput && UserStats.channels > 0)
-    sendto_one(sptr, rpl_str(RPL_LUSERCHANNELS), me.name, parv[0], /* XXX DEAD */
-        UserStats.channels);
-  sendto_one(sptr, rpl_str(RPL_LUSERME), me.name, parv[0], UserStats.local_clients, /* XXX DEAD */
-      UserStats.local_servers);
-
-  if (MyUser(sptr) || Protocol(cptr) < 10)
-    sendto_one(sptr, /* XXX DEAD */
-        ":%s NOTICE %s :Highest connection count: %d (%d clients)",
-        me.name, parv[0], max_connection_count, max_client_count);
-  else
-    sendto_one(sptr, /* XXX DEAD */
-        "%s NOTICE %s%s :Highest connection count: %d (%d clients)",
-        NumServ(&me), NumNick(sptr), max_connection_count, max_client_count);
-
-  return 0;
-}
-#endif /* 0 */