1
0
mirror of https://github.com/unrealircd/unrealircd.git synced 2026-07-09 11:53:13 +02:00

Don't use custom inet_pton{4,6} functions

[skip ci]
This commit is contained in:
Bram Matthys
2019-09-09 17:08:25 +02:00
parent 078cfa88ea
commit e5f73fdbcd
+3 -3
View File
@@ -4609,9 +4609,9 @@ int _match_user(char *rmask, aClient *acptr, int options)
*/
if (!acptr->ip || !strchr(acptr->ip, ':'))
return 0; /* NOMATCH: hmask is IPv6 address and client is not IPv6 */
if (!inet_pton6(acptr->ip, clientip))
if (!inet_pton(AF_INET6, acptr->ip, clientip))
return 0; /* NOMATCH: unusual failure */
if (!inet_pton6(hmask, maskip))
if (!inet_pton(AF_INET6, hmask, maskip))
return 0; /* NOMATCH: invalid IPv6 IP in hostmask */
if (cidr < 0)
@@ -4630,7 +4630,7 @@ int _match_user(char *rmask, aClient *acptr, int options)
* The exception is CIDR. If we have CIDR mask then don't bother checking for
* virtual hosts and things like that since '/' can never be in a hostname.
*/
if (acptr->ip && inet_pton4(acptr->ip, clientip) && inet_pton4(hmask, maskip))
if (acptr->ip && inet_pton(AF_INET, acptr->ip, clientip) && inet_pton(AF_INET, hmask, maskip))
{
if (cidr < 0)
{