X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=acl.c;h=2c90052658eda947ea586a55f292dc85f24e68f7;hp=75fdc55b12842890136afec74e70125f81b6318c;hb=5ceb90b647125035d52ae935a7fdae037b5b50a4;hpb=f17981539ec6877f404b1dfb2e59b55467886e67 diff --git a/acl.c b/acl.c index 75fdc55b..2c900526 100644 --- a/acl.c +++ b/acl.c @@ -101,14 +101,18 @@ static void acl_del_entry(struct list_head *acl, char *addr, unsigned netmask) struct access_info *ai, *tmp; struct in_addr to_delete; + PARA_NOTICE_LOG("removing entries matching %s/%u\n", addr, netmask); inet_pton(AF_INET, addr, &to_delete); list_for_each_entry_safe(ai, tmp, acl, node) { - if (v4_addr_match(to_delete.s_addr, ai->addr.s_addr, PARA_MIN(netmask, ai->netmask))) { - PARA_NOTICE_LOG("removing %s/%u from access list\n", - addr, ai->netmask); + char dst[INET_ADDRSTRLEN + 1]; + const char *p = inet_ntop(AF_INET, &ai->addr.s_addr, + dst, sizeof(dst)); + if (p) + PARA_INFO_LOG("removing %s/%u\n", p, + ai->netmask); list_del(&ai->node); free(ai); }