X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=acl.c;h=560ff9999d191f418c35695f4a6629b45436f49f;hp=7762a990d38a090ae661371cdee1066fb075c429;hb=ce9e297eb91a932a11f81890c800d0380b5bc9c9;hpb=d87806284b9f6be9aab71ccbf0280d273b57eeb3 diff --git a/acl.c b/acl.c index 7762a990..560ff999 100644 --- a/acl.c +++ b/acl.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2013 Andre Noll + * Copyright (C) 2005 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -18,6 +18,7 @@ #include "string.h" #include "list.h" #include "net.h" +#include "acl.h" /** * Describes one entry in the blacklist/whitelist of a paraslash sender. @@ -86,7 +87,7 @@ static void acl_add_entry(struct list_head *acl, char *addr, int netmask) inet_pton(AF_INET, addr, &ai->addr); ai->netmask = netmask; - PARA_INFO_LOG("adding %s/%i to access list\n", addr, ai->netmask); + PARA_INFO_LOG("adding %s/%u to access list\n", addr, ai->netmask); para_list_add(&ai->node, acl); } @@ -108,7 +109,7 @@ static void acl_del_entry(struct list_head *acl, char *addr, unsigned netmask) if (v4_addr_match(to_delete.s_addr, ai->addr.s_addr, PARA_MIN(netmask, ai->netmask))) { - PARA_NOTICE_LOG("removing %s/%i from access list\n", + PARA_NOTICE_LOG("removing %s/%u from access list\n", addr, ai->netmask); list_del(&ai->node); free(ai); @@ -130,7 +131,7 @@ char *acl_get_contents(struct list_head *acl) char *ret = NULL; list_for_each_entry_safe(ai, tmp_ai, acl, node) { - char *tmp = make_message("%s%s/%d ", ret? ret : "", + char *tmp = make_message("%s%s/%u ", ret? ret : "", inet_ntoa(ai->addr), ai->netmask); free(ret); ret = tmp;