From: Michael Poole <mdpoole@troilus.org>
Date: Sat, 15 May 2004 16:21:48 +0000 (+0000)
Subject: Forward port USERHOST and USERIP self-visibility fixes from 2.10.11.
X-Git-Url: http://git.pk910.de/?a=commitdiff_plain;h=4ae995f1feffd5d98c4b010665072c2fecd53890;p=ircu2.10.12-pk.git

Forward port USERHOST and USERIP self-visibility fixes from 2.10.11.
Give splidge ChangeLog credit for the socket buffer patch.


git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1054 c9e4aea6-c8fd-4c43-8297-357d70d61c8c
---

diff --git a/ChangeLog b/ChangeLog
index 531fa03..b5e99c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-05-15  volta <volta2@gmx.de>
+
+	[Original ChangeLog date: 2003-04-26 -MDP]
+
+         * ircd/m_userip.c, ircd/m_userhost.c: Small fix, that
+         allows users to see their own ip & hostname. (Should solve
+         all problems with dcc)
+
 2004-05-15  Kevin L Mitchell  <klmitch@mit.edu>
 
 	[Original ChangeLog date: 2003-06-13 -MDP]
@@ -50,6 +58,16 @@
 	to off.  if an admin is smart enough to understand these features
 	they can enable them manually.
 
+2004-05-15  splidge  <splidge@quakenet.org>
+
+	[Original ChangeLog date: 2003-03-26 -MDP]
+
+	* ircd/include/ircd_features.h, include/ircd_osdep.h,
+	  ircd/ircd_features.c, ircd/listener.c, ircd/os_bsd.c, 
+	  ircd/os_generic.c, ircd/os_linux.c, ircd/os_openbsd.c
+	  ircd/os_solaris.c, ircd/s_bsd.c: Patch to allow socket bufs to be 
+	  altered via F: lines
+
 2004-05-15  Isomer <isomer@undernet.org>
 
 	[Original ChangeLog date: 2003-11-18 -MDP]
diff --git a/ircd/m_userhost.c b/ircd/m_userhost.c
index 04055d3..9f93381 100644
--- a/ircd/m_userhost.c
+++ b/ircd/m_userhost.c
@@ -97,7 +97,7 @@ static void userhost_formatter(struct Client* cptr, struct Client *sptr, struct
   msgq_append(0, mb, "%s%s=%c%s@%s", cli_name(cptr),
               SeeOper(sptr,cptr) ? "*" : "",
 	      cli_user(cptr)->away ? '-' : '+', cli_user(cptr)->username,
-	      HasHiddenHost(cptr) && !IsAnOper(sptr) ?
+	      HasHiddenHost(cptr) && !IsAnOper(sptr) && (sptr != cptr) ?
 	      cli_user(cptr)->host : cli_user(cptr)->realhost);
 }
 
diff --git a/ircd/m_userip.c b/ircd/m_userip.c
index 52a9db7..3568112 100644
--- a/ircd/m_userip.c
+++ b/ircd/m_userip.c
@@ -98,7 +98,7 @@ static void userip_formatter(struct Client* cptr, struct Client *sptr, struct Ms
   msgq_append(0, mb, "%s%s=%c%s@%s", cli_name(cptr),
 	      SeeOper(sptr,cptr) ? "*" : "",
 	      cli_user(cptr)->away ? '-' : '+', cli_user(cptr)->username,
-	      HasHiddenHost(cptr) && !IsAnOper(sptr) ?
+	      HasHiddenHost(cptr) && !IsAnOper(sptr) && (sptr != cptr) ?
 	      feature_str(FEAT_HIDDEN_IP) :
 	      ircd_ntoa((const char*) &(cli_ip(cptr))));
 }