X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_userip.cpp;h=5ea84c04aa8b925c382b48a12db83d0a70ac300e;hb=fd57589b17c7eb5d29346651dd354b790454c68e;hp=c60b2d18ddc4fa2a98dcd64971e198197b43db11;hpb=84a1569cd60daa64b1ae52a1fff62c0dc4d78850;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index c60b2d18d..5ea84c04a 100644
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -30,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 = "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]);
 			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 += "-";
@@ -56,7 +74,6 @@ class CommandUserip : public Command
 		if (nicks != 0)
 			user->WriteServ(retbuf);
 
-		/* Dont send to the network */
 		return CMD_SUCCESS;
 	}
 };
@@ -72,7 +89,7 @@ class ModuleUserIP : public Module
 
 	void init()
 	{
-		ServerInstance->AddCommand(&cmd);
+		ServerInstance->Modules->AddService(cmd);
 		Implementation eventlist[] = { I_On005Numeric };
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}