Fix some logically dead code which was found by Coverity.

[user/henk/code/inspircd.git] / src / modules / m_userip.cpp

diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index 14a92e068da8177e12f83cf2b136d637d74ba102..33b261ca1bba79f64935c0d79ce6ec24ac0f9b5d 100644 (file)
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -1,16 +1,24 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2005, 2007 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2006 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for USERIP command */
@@ -22,19 +30,37 @@ class CommandUserip : public Command
  public:
        CommandUserip(Module* Creator) : Command(Creator,"USERIP", 1)
        {
-               flags_needed = 'o'; syntax = "<nick>{,<nick>}";
+               syntax = "<nick>{,<nick>}";
        }
 
        CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
-               std::string retbuf = std::string("340 ") + user->nick + " :";
+               std::string retbuf = "340 " + user->nick + " :";
                int nicks = 0;
+               bool checked_privs = false;
+               bool has_privs = false;
 
                for (int i = 0; i < (int)parameters.size(); i++)
                {
-                       User *u = ServerInstance->FindNick(parameters[i]);
+                       User *u = ServerInstance->FindNickOnly(parameters[i]);
                        if ((u) && (u->registered == REG_ALL))
                        {
+                               // Anyone may query their own IP
+                               if (u != user)
+                               {
+                                       if (!checked_privs)
+                                       {
+                                               // Do not trigger the insufficient priviliges message more than once
+                                               checked_privs = true;
+                                               has_privs = user->HasPrivPermission("users/auspex");
+                                               if (!has_privs)
+                                                       user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - You do not have the required operator privileges",user->nick.c_str());
+                                       }
+
+                                       if (!has_privs)
+                                               continue;
+                               }
+
                                retbuf = retbuf + u->nick + (IS_OPER(u) ? "*" : "") + "=";
                                if (IS_AWAY(u))
                                        retbuf += "-";
@@ -48,7 +74,6 @@ class CommandUserip : public Command
                if (nicks != 0)
                        user->WriteServ(retbuf);
 
-               /* Dont send to the network */
                return CMD_SUCCESS;
        }
 };
@@ -57,18 +82,21 @@ class ModuleUserIP : public Module
 {
        CommandUserip cmd;
  public:
-       ModuleUserIP(InspIRCd* Me)
-               : Module(Me), cmd(this)
+       ModuleUserIP()
+               : cmd(this)
        {
-               ServerInstance->AddCommand(&cmd);
-               Implementation eventlist[] = { I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
+       void init()
+       {
+               ServerInstance->Modules->AddService(cmd);
+               Implementation eventlist[] = { I_On005Numeric };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+       }
 
        virtual void On005Numeric(std::string &output)
        {
-               output = output + std::string(" USERIP");
+               output = output + " USERIP";
        }
 
        virtual ~ModuleUserIP()
@@ -77,7 +105,7 @@ class ModuleUserIP : public Module
 
        virtual Version GetVersion()
        {
-               return Version("Provides support for USERIP command",VF_VENDOR,API_VERSION);
+               return Version("Provides support for USERIP command",VF_VENDOR);
        }
 
 };