X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/7baa37a9ef4c66708d7505dfda182339461232cf..1c78029cd4a17c75b0cf8197736493860c46bfd1:/modules/m_userhost.c

diff --git a/modules/m_userhost.c b/modules/m_userhost.c
index cbda1b33..0199f415 100644
--- a/modules/m_userhost.c
+++ b/modules/m_userhost.c
@@ -20,8 +20,6 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
- *  $Id: m_userhost.c 254 2005-09-21 23:35:12Z nenolod $
  */
 
 #include "stdinc.h"
@@ -35,10 +33,14 @@
 #include "parse.h"
 #include "modules.h"
 #include "s_conf.h"
+#include "s_newconf.h"
+
+static const char userhost_desc[] =
+	"Provides the USERHOST command to show a user's host";
 
 static char buf[BUFSIZE];
 
-static int m_userhost(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void m_userhost(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
 struct Message userhost_msgtab = {
 	"USERHOST", 0, 0, 0, 0,
@@ -46,14 +48,15 @@ struct Message userhost_msgtab = {
 };
 
 mapi_clist_av1 userhost_clist[] = { &userhost_msgtab, NULL };
-DECLARE_MODULE_AV1(userhost, NULL, NULL, userhost_clist, NULL, NULL, "$Revision: 254 $");
+
+DECLARE_MODULE_AV2(userhost, NULL, NULL, userhost_clist, NULL, NULL, NULL, NULL, userhost_desc);
 
 /*
  * m_userhost added by Darren Reed 13/8/91 to aid clients and reduce
  * the need for complicated requests like WHOIS. It returns user/host
  * information only (no spurious AWAY labels or channels).
  */
-static int
+static void
 m_userhost(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	struct Client *target_p;
@@ -73,26 +76,20 @@ m_userhost(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sour
 
 		if((target_p = find_person(parv[i])) != NULL)
 		{
-			/*
-			 * Show real IP for USERHOST on yourself.
-			 * This is needed for things like mIRC, which do a server-based
-			 * lookup (USERHOST) to figure out what the clients' local IP
-			 * is.  Useful for things like NAT, and dynamic dial-up users.
-			 */
-			if(MyClient(target_p) && (target_p == source_p))
+			if (MyClient(target_p) && target_p == source_p)
 			{
 				rl = sprintf(response, "%s%s=%c%s@%s ",
 						target_p->name,
-						IsOper(target_p) ? "*" : "",
+						SeesOper(target_p, source_p) ? "*" : "",
 						(target_p->user->away) ? '-' : '+',
 						target_p->username,
-						target_p->sockhost);
+						IsIPSpoof(target_p) ? target_p->orighost : target_p->sockhost);
 			}
 			else
 			{
 				rl = sprintf(response, "%s%s=%c%s@%s ",
 						target_p->name,
-						IsOper(target_p) ? "*" : "",
+						SeesOper(target_p, source_p) ? "*" : "",
 						(target_p->user->away) ? '-' : '+',
 						target_p->username, target_p->host);
 			}
@@ -109,6 +106,4 @@ m_userhost(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sour
 	}
 
 	sendto_one(source_p, "%s", buf);
-
-	return 0;
 }