Author: Alex Badea <vampire@p16.pub.ro> (by way of Kev <klmitch@mit.edu>)

[ircu2.10.12-pk.git] / ircd / m_userip.c

diff --git a/ircd/m_userip.c b/ircd/m_userip.c
index a42cbcc48acf53f1c2888e4f47d9b8fc2ef3d30a..27be218c77b9cd9dfc4686ed306fea504260a391 100644 (file)
--- a/ircd/m_userip.c
+++ b/ircd/m_userip.c
@@ -84,6 +84,7 @@
 #include "client.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
+#include "ircd_features.h"
 #include "msgq.h"
 #include "numeric.h"
 #include "s_user.h"
@@ -91,13 +92,14 @@
 
 #include <assert.h>
 
-static void userip_formatter(struct Client* cptr, struct MsgBuf* mb)
+static void userip_formatter(struct Client* cptr, struct Client *sptr, struct MsgBuf* mb)
 {
   assert(IsUser(cptr));
   msgq_append(0, mb, "%s%s=%c%s@%s", cli_name(cptr),
              HasPriv(cptr, PRIV_DISPLAY) ? "*" : "",
              cli_user(cptr)->away ? '-' : '+', cli_user(cptr)->username,
-             HasHiddenHost(cptr) ? "127.0.0.1" :
+             HasHiddenHost(cptr) && !IsAnOper(sptr) ?
+             feature_str(FEAT_HIDDEN_IP) :
              ircd_ntoa((const char*) &(cli_ip(cptr))));
 }