X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=ircd%2Fm_stats.c;h=a68d0d7f804f527093a313202f54db496048843b;hb=refs%2Fheads%2Fupstream;hp=fc3f0afc2f8324915faa1e1f50007a533598c493;hpb=5f2367c5194f03c97e43fea0a331257ad8192fb6;p=ircu2.10.12-pk.git

diff --git a/ircd/m_stats.c b/ircd/m_stats.c
index fc3f0af..a68d0d7 100644
--- a/ircd/m_stats.c
+++ b/ircd/m_stats.c
@@ -119,9 +119,9 @@ int
 m_stats(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
 {
   const struct StatDesc *sd;
-  char *param = 0;
+  char *param;
 
-  /* If we didn't find a descriptor and this is my client, send them help */
+  /* If we didn't find a descriptor, send them help */
   if ((parc < 2) || !(sd = stats_find(parv[1])))
       parv[1] = "*", sd = stats_find("*");
 
@@ -131,19 +131,20 @@ m_stats(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
    * not privileged (server or an operator), then the STAT_FLAG_OPERONLY
    * flag must not be set, and if the STAT_FLAG_OPERFEAT flag is set,
    * then the feature given by sd->sd_control must be off.
+   *
+   * This checks cptr rather than sptr so that a local oper may send
+   * /stats queries to other servers.
    */
   if (!IsPrivileged(cptr) &&
       ((sd->sd_flags & STAT_FLAG_OPERONLY) ||
        ((sd->sd_flags & STAT_FLAG_OPERFEAT) && feature_bool(sd->sd_control))))
-    return send_reply(cptr, ERR_NOPRIVILEGES);
-
-  /* Check if they are a local user */
-  if ((sd->sd_flags & STAT_FLAG_LOCONLY) && !MyUser(cptr))
-    return send_reply(cptr, ERR_NOPRIVILEGES);
+    return send_reply(sptr, ERR_NOPRIVILEGES);
 
   /* Check for extra parameter */
   if ((sd->sd_flags & STAT_FLAG_VARPARAM) && parc > 3 && !EmptyString(parv[3]))
     param = parv[3];
+  else
+    param = NULL;
 
   /* Ok, track down who's supposed to get this... */
   if (hunt_server_cmd(sptr, CMD_STATS, cptr, feature_int(FEAT_HIS_REMOTE),
@@ -151,6 +152,10 @@ m_stats(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
       HUNTED_ISME)
     return 0; /* Someone else--cool :) */
 
+  /* Check if they are a local user */
+  if ((sd->sd_flags & STAT_FLAG_LOCONLY) && !MyUser(sptr))
+    return send_reply(sptr, ERR_NOPRIVILEGES);
+
   assert(sd->sd_func != 0);
 
   /* Ok, dispatch the stats function */