From: Alexander Barton <alex@barton.de>
Date: Sun, 3 May 2020 22:55:25 +0000 (+0200)
Subject: Update Client_SetHostname() to not use strpbrk()
X-Git-Tag: rel-26-rc1~12
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=commitdiff_plain;h=52d8fa2c09c36632c1cacd8242e22e9de920ec9f

Update Client_SetHostname() to not use strpbrk()

Not sure about the portability of strpbrk() in really ancient OS, and
this was the only place where it became used recently in ngIRCd ...
So let's play it safe! ;-)
---

diff --git a/src/ngircd/client.c b/src/ngircd/client.c
index 1c7bd1ea..67c02604 100644
--- a/src/ngircd/client.c
+++ b/src/ngircd/client.c
@@ -339,9 +339,9 @@ Client_SetHostname( CLIENT *Client, const char *Hostname )
 
 	/* 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, ".:"))) {
+	 * An empty string means a rDNS lookup did not happen (yet). */
+	if (Conf_CloakHost[0] && (!Client->host[0] || strchr(Client->host, '.')
+				  || strchr(Client->host, ':'))) {
 		char cloak[GETID_LEN];
 
 		strlcpy(cloak, Hostname, GETID_LEN);