Someone please bp this

[user/henk/code/inspircd.git] / src / cmd_stats.cpp

diff --git a/src/cmd_stats.cpp b/src/cmd_stats.cpp
index 9a0dc5ef7196bd41445f64fdaab4f0b401b81c12..73ba2844c3363be0d890b3182eda9fe9b897e756 100644 (file)
--- a/src/cmd_stats.cpp
+++ b/src/cmd_stats.cpp
@@ -12,12 +12,15 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
 #ifndef WIN32
 #include <sys/resource.h>
+
+/* This is just to be completely certain that the change which fixed getrusage on RH7 doesn't break anything else -- Om */
+#ifndef RUSAGE_SELF
+#define RUSAGE_SELF 0
+#endif
+
 #endif
-#include "users.h"
-#include "modules.h"
 #include "xline.h"
 #include "commands/cmd_stats.h"
 #include "commands/cmd_whowas.h"
@@ -45,9 +48,13 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user,
 {
        std::string sn = ServerInstance->Config->ServerName;
 
-       if ((*ServerInstance->Config->UserStats) && !IS_OPER(user) && !strchr(ServerInstance->Config->UserStats,statschar))
+       if ((!*ServerInstance->Config->UserStats) || (!IS_OPER(user) && !ServerInstance->ULine(user->server) && !strchr(ServerInstance->Config->UserStats,statschar)))
        {
-               results.push_back(sn+std::string(" 481 ")+user->nick+" :Permission denied - STATS "+statschar+" is oper-only");
+               ServerInstance->SNO->WriteToSnoMask('t',
+                               "%s '%c' denied for %s (%s@%s)",
+                               (IS_LOCAL(user) ? "Stats" : "Remote stats"),
+                               statschar, user->nick, user->ident, user->host);
+               results.push_back(sn + " 481 " + user->nick + " :Permission denied - STATS " + statschar + " is oper-only");
                return;
        }
        
@@ -65,7 +72,7 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user,
                        {
                                std::string ip = ServerInstance->Config->ports[i]->GetIP();
                                if (ip.empty())
-                                       ip = "*";
+                                       ip.assign("*");
 
                                results.push_back(sn+" 249 "+user->nick+" :"+ ip + ":"+ConvToStr(ServerInstance->Config->ports[i]->GetPort())+" (client, " +
                                                ServerInstance->Config->ports[i]->GetDescription() + ")");
@@ -189,8 +196,8 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user,
                        }
 
                        results.push_back(sn+" 249 "+user->nick+" :MOTD(VECTOR) "+ConvToStr(ServerInstance->Config->MOTD.size())+", RULES(VECTOR) "+ConvToStr(ServerInstance->Config->RULES.size()));
-                       results.push_back(sn+" 249 "+user->nick+" :Modules(VECTOR) "+ConvToStr(ServerInstance->modules.size())+" ("+ConvToStr(ServerInstance->modules.size()*sizeof(Module))+" bytes)");
-                       results.push_back(sn+" 249 "+user->nick+" :ClassFactories(VECTOR) "+ConvToStr(ServerInstance->factory.size())+" ("+ConvToStr(ServerInstance->factory.size()*sizeof(ircd_module))+" bytes)");
+                       results.push_back(sn+" 249 "+user->nick+" :Modules(VECTOR) "+ConvToStr(ServerInstance->Modules->modules.size())+" ("+ConvToStr(ServerInstance->Modules->modules.size()*sizeof(Module))+" bytes)");
+                       results.push_back(sn+" 249 "+user->nick+" :ModuleHandles(VECTOR) "+ConvToStr(ServerInstance->Modules->handles.size())+" ("+ConvToStr(ServerInstance->Modules->handles.size()*sizeof(ircd_module))+" bytes)");
 
 #ifndef WIN32
                        /* Moved this down here so all the not-windows stuff (look w00tie, I didn't say win32!) is in one ifndef.
@@ -305,8 +312,7 @@ DllExport void DoStats(InspIRCd* ServerInstance, char statschar, userrec* user,
        }
 
        results.push_back(sn+" 219 "+user->nick+" "+statschar+" :End of /STATS report");
-       ServerInstance->SNO->WriteToSnoMask('t',"%s '%c' requested by %s (%s@%s)",(!strcmp(user->server,ServerInstance->Config->ServerName) ? "Stats" : "Remote stats"),statschar,user->nick,user->ident,user->host);
-
+       ServerInstance->SNO->WriteToSnoMask('t',"%s '%c' requested by %s (%s@%s)",
+               (IS_LOCAL(user) ? "Stats" : "Remote stats"), statschar, user->nick, user->ident, user->host);
        return;
 }
-