X-Git-Url: https://jfr.im/git/irc/quakenet/snircd.git/blobdiff_plain/189935b1376a47e65bed629c0ec9552e7c791e61..8172bdd452da043e22658c9df1f8f61755e97a79:/ircd/m_userip.c

diff --git a/ircd/m_userip.c b/ircd/m_userip.c
index 062fe68..dd04810 100644
--- a/ircd/m_userip.c
+++ b/ircd/m_userip.c
@@ -95,6 +95,7 @@
 
 static void userip_formatter(struct Client* cptr, struct Client *sptr, struct MsgBuf* mb)
 {
+  /* !!FIXME!! */
   assert(IsUser(cptr));
   msgq_append(0, mb, "%s%s=%c%s@%s", cli_name(cptr),
 	      SeeOper(sptr,cptr) ? "*" : "",
@@ -105,7 +106,7 @@ static void userip_formatter(struct Client* cptr, struct Client *sptr, struct Ms
 	       * of +x.  If an oper wants the real IP, he should go to
 	       * /whois to get it.
 	       */
-	      HasHiddenHost(cptr) && (sptr != cptr) ?
+	      (HasHiddenHost(cptr) || HasSetHost(cptr)) && !IsAnOper(sptr) ?
 	      feature_str(FEAT_HIDDEN_IP) :
 	      ircd_ntoa(&cli_ip(cptr)));
 }