Allow hostmask cloaking when rDNS is disabled

[ngircd-alex.git] / src / ngircd / client.c

diff --git a/src/ngircd/client.c b/src/ngircd/client.c
index 7e6ff68afd4b8cf84e68d116f2ebe3bcd64d0fc3..1c7bd1ead0cc510a814d59f0c43d12c1e1bb65da 100644 (file)
--- a/src/ngircd/client.c
+++ b/src/ngircd/client.c
@@ -337,7 +337,11 @@ Client_SetHostname( CLIENT *Client, const char *Hostname )
        assert(Client != NULL);
        assert(Hostname != NULL);
 
-       if (Conf_CloakHost[0]) {
+       /* Only cloak the hostmask if it has not yet been cloaked.
+        * The period or colon indicates it's still an IP address.
+        * An empty string means a rDNS lookup did not happen (yet).
+         */
+       if (Conf_CloakHost[0] && (!Client->host[0] || strpbrk(Client->host, ".:"))) {
                char cloak[GETID_LEN];
 
                strlcpy(cloak, Hostname, GETID_LEN);