Always cloak client hostname, if needed

Not only cloak the hostname in Client_MaskCloaked(), but also in
Client_HostnameCloaked() -- so move the actual cloaking to this function
and call it in Client_MaskCloaked() to get the (cloaked) hostname.

This fixes USERHOST not displaying the correctly cloaked hostname,
for example.

diff --git a/src/ngircd/client.c b/src/ngircd/client.c
index 0d2d4147345046b87f7f3c6e46fd018749f4da36..4728c7a4672ac802d944dc599d23031f75e50d60 100644 (file)
--- a/src/ngircd/client.c
+++ b/src/ngircd/client.c
@@ -687,18 +687,35 @@ Client_Hostname(CLIENT *Client)
 
 /**
  * Get potentially cloaked hostname of a client.
 
 /**
  * Get potentially cloaked hostname of a client.

+ *

  * If the client has not enabled cloaking, the real hostname is used.
  * If the client has not enabled cloaking, the real hostname is used.

+ * Please note that this function uses a global static buffer, so you can't
+ * nest invocations without overwriting earlier results!
+ *

  * @param Client Pointer to client structure
  * @return Pointer to client hostname
  */
 GLOBAL char *
 Client_HostnameCloaked(CLIENT *Client)
 {
  * @param Client Pointer to client structure
  * @return Pointer to client hostname
  */
 GLOBAL char *
 Client_HostnameCloaked(CLIENT *Client)
 {

+       static char Cloak_Buffer[CLIENT_HOST_LEN];
+

        assert(Client != NULL);
        assert(Client != NULL);

-       if (Client_HasMode(Client, 'x'))
-               return Client_ID(Client->introducer);
-       else
+
+       if (!Client_HasMode(Client, 'x'))

                return Client_Hostname(Client);
                return Client_Hostname(Client);

+
+       /* Do simple mapping to the server ID? */
+       if (!*Conf_CloakHostModeX)
+               return Client_ID(Client->introducer);
+
+       strlcpy(Cloak_Buffer, Client->host, CLIENT_HOST_LEN);
+       strlcat(Cloak_Buffer, Conf_CloakHostSalt, CLIENT_HOST_LEN);
+
+       snprintf(Cloak_Buffer, CLIENT_HOST_LEN, Conf_CloakHostModeX,
+                Hash(Cloak_Buffer));
+
+       return Cloak_Buffer;

 } /* Client_HostnameCloaked */
 
 
 } /* Client_HostnameCloaked */
 
 


@@ -792,10 +809,12 @@ Client_Mask( CLIENT *Client )
 
 /**
  * Return ID of a client with cloaked hostname: "client!user@server-name"
 
 /**
  * Return ID of a client with cloaked hostname: "client!user@server-name"

+ *

  * This client ID is used for IRC prefixes, for example.
  * Please note that this function uses a global static buffer, so you can't
  * nest invocations without overwriting earlier results!
  * If the client has not enabled cloaking, the real hostname is used.
  * This client ID is used for IRC prefixes, for example.
  * Please note that this function uses a global static buffer, so you can't
  * nest invocations without overwriting earlier results!
  * If the client has not enabled cloaking, the real hostname is used.

+ *

  * @param Client Pointer to client structure
  * @return Pointer to global buffer containing the client ID
  */
  * @param Client Pointer to client structure
  * @return Pointer to global buffer containing the client ID
  */


@@ -803,7 +822,6 @@ GLOBAL char *
 Client_MaskCloaked(CLIENT *Client)
 {
        static char Mask_Buffer[GETID_LEN];
 Client_MaskCloaked(CLIENT *Client)
 {
        static char Mask_Buffer[GETID_LEN];

-       char Cloak_Buffer[GETID_LEN];

 
        assert (Client != NULL);
 
 
        assert (Client != NULL);
 


@@ -811,16 +829,8 @@ Client_MaskCloaked(CLIENT *Client)
        if (!Client_HasMode(Client, 'x'))
                return Client_Mask(Client);
 
        if (!Client_HasMode(Client, 'x'))
                return Client_Mask(Client);
 

-       if(*Conf_CloakHostModeX) {
-               strlcpy(Cloak_Buffer, Client->host, GETID_LEN);
-               strlcat(Cloak_Buffer, Conf_CloakHostSalt, GETID_LEN);
-               snprintf(Cloak_Buffer, GETID_LEN, Conf_CloakHostModeX, Hash(Cloak_Buffer));
-       } else {
-               strncpy(Cloak_Buffer, Client_ID(Client->introducer), GETID_LEN);
-       }
-
-       snprintf(Mask_Buffer, GETID_LEN, "%s!%s@%s",
-               Client->id, Client->user, Cloak_Buffer);
+       snprintf(Mask_Buffer, GETID_LEN, "%s!%s@%s", Client->id, Client->user,
+                Client_HostnameCloaked(Client));

 
        return Mask_Buffer;
 } /* Client_MaskCloaked */
 
        return Mask_Buffer;
 } /* Client_MaskCloaked */