From: pk910 <philipp@zoelle1.de>
Date: Wed, 20 Jul 2011 11:40:44 +0000 (+0200)
Subject: fixed FAKEIDENT handling
X-Git-Tag: WGN5~13
X-Git-Url: http://git.pk910.de/?p=ircu2.10.12-pk.git;a=commitdiff_plain;h=b3bbea610a36c482ab63e9da97bf77d538be90a8

fixed FAKEIDENT handling
---

diff --git a/include/numeric.h b/include/numeric.h
index ebabc1c..522b123 100644
--- a/include/numeric.h
+++ b/include/numeric.h
@@ -319,7 +319,7 @@ extern const struct Numeric* get_error_numeric(int err);
 /*      RPL_END_USERS        394        Dalnet/EFnet/IRCnet */
 /*      RPL_NOUSERS          395        Dalnet/EFnet/IRCnet */
 #define RPL_HOSTHIDDEN       396	/* UMODE +x completed succesfuly */
-#define RPL_HOSTIDENTHIDDEN  397	/* UMODE +x completed succesfuly (with USERNAME change) */
+#define RPL_HOSTUSERHIDDEN  397	/* UMODE +x completed succesfuly (with USERNAME change) */
 
 /*
  * Errors are in the range from 400-599 currently and are grouped by what
diff --git a/ircd/m_fakehost.c b/ircd/m_fakehost.c
index fa8ff3b..a73dd53 100644
--- a/ircd/m_fakehost.c
+++ b/ircd/m_fakehost.c
@@ -300,9 +300,8 @@ int ms_fakehost2(struct Client *cptr, struct Client *sptr, int parc, char *parv[
     }
 
     /* Set fakehost and propagate the changed host. */
-    ircd_strncpy(cli_user(target)->username, parv[2], USERLEN);
     ircd_strncpy(cli_user(target)->fakehost, parv[3], HOSTLEN);
-    hide_hostmask(target, FLAG_FAKEHOST);
+    hide_ident_hostmask(target, FLAG_FAKEHOST, parv[2]);
 
     sendcmdto_serv_butone(sptr, CMD_FAKEHOST2, cptr, "%C %s %s", target, parv[2], parv[3]);
 
diff --git a/ircd/s_err.c b/ircd/s_err.c
index e088771..49f8a8a 100644
--- a/ircd/s_err.c
+++ b/ircd/s_err.c
@@ -826,7 +826,7 @@ static Numeric replyTable[] = {
 /* 396 */
   { RPL_HOSTHIDDEN, "%s :is now your hidden host", "396" },
 /* 397 */
-  { RPL_HOSTIDENTHIDDEN, "%s@%s :is now your hidden username@host", "397" },
+  { RPL_HOSTUSERHIDDEN, "%s@%s :is now your hidden username@host", "397" },
 /* 398 */
   { 0 },
 /* 399 */
diff --git a/ircd/s_user.c b/ircd/s_user.c
index 3855fbc..ccaed50 100644
--- a/ircd/s_user.c
+++ b/ircd/s_user.c
@@ -972,14 +972,14 @@ void send_user_info(struct Client* sptr, char* names, int rpl, InfoFormatter fmt
  * @param[in] flag Some flag that affects host-hiding (FLAG_HIDDENHOST, FLAG_ACCOUNT, FLAG_FAKEHOST).
  * @return Zero.
  */
-
+ 
 int
 hide_hostmask(struct Client *cptr, unsigned int flag) {
-  return hide_hostmask(chptr, flag, NULL);
+  return hide_ident_hostmask(cptr, flag, NULL);
 }
 
 int
-hide_hostmask(struct Client *cptr, unsigned int flag, char *username)
+hide_ident_hostmask(struct Client *cptr, unsigned int flag, char *username)
 {
   struct Membership *chan;
   char buf[HOSTLEN];