return 0;
if (gl->flags & GLINE_IPMASK) {
- if (!ipmask_check(&gl->ip, &np->p_ipaddr, gl->bits))
+ if (!ipmask_check(&gl->ip, &np->ipaddress, gl->bits))
return 0;
} else {
if (gl->host && match(gl->host->content, np->host->name->content) != 0)
if ((gla->flags & GLINE_REALNAME) != (glb->flags & GLINE_REALNAME))
return 0;
- if ((gla->flags & GLINE_IPMASK) != (glb->flags & GLINE_IPMASK))
- return 0;
-
if (gla->nick && !glb->nick)
return 0;
if (gla->user && glb->user && match(gla->user->content, glb->user->content) != 0)
return 0;
- if (gla->flags & GLINE_IPMASK) {
+ if (gla->flags & GLINE_IPMASK && glb->flags & GLINE_IPMASK) {
if (gla->bits > glb->bits)
return 0;