From a66e19cd437595328f202cbde8d492d5f7e2205a Mon Sep 17 00:00:00 2001 From: Florent Bruneau Date: Sun, 5 Oct 2008 14:48:34 +0200 Subject: [PATCH] Add rbldns parameter to iplist as an alias for 'file'. Signed-off-by: Florent Bruneau --- common/Makefile | 2 ++ example/postlicyd.conf | 2 ++ pfix-srsd/Makefile | 2 ++ postlicyd/Makefile | 2 ++ postlicyd/rbl.c | 3 ++- 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/common/Makefile b/common/Makefile index 3720069..541d5ac 100644 --- a/common/Makefile +++ b/common/Makefile @@ -35,4 +35,6 @@ TESTS = tst-trie lib_SOURCES = str.c buffer.c common.c epoll.c server.c trie.c file.c tst-trie_SOURCES = tst-trie.c lib.a +all: + include ../mk/common.mk diff --git a/example/postlicyd.conf b/example/postlicyd.conf index 572fd9a..12d8ff5 100644 --- a/example/postlicyd.conf +++ b/example/postlicyd.conf @@ -70,6 +70,8 @@ # declare a file to load. If lock is given, the klist is locked into the # RAM. The weight is a number giving the weight of this blaclist file in the # score of the IP +# - rbldns: (no)?lock:weight:filename +# this is an alias for file. # - soft_threshold: score (default: 1) # minimum score to match the soft_match return value # - hard_threshold: score (default: 1) diff --git a/pfix-srsd/Makefile b/pfix-srsd/Makefile index 65f3f36..0be9e82 100644 --- a/pfix-srsd/Makefile +++ b/pfix-srsd/Makefile @@ -34,4 +34,6 @@ PROGRAMS = pfix-srsd pfix-srsd_SOURCES = main-srsd.c ../common/lib.a pfix-srsd_LIBADD = -lsrs2 +all: + include ../mk/common.mk diff --git a/postlicyd/Makefile b/postlicyd/Makefile index 628907d..363a9a0 100644 --- a/postlicyd/Makefile +++ b/postlicyd/Makefile @@ -50,4 +50,6 @@ tst-filters_LIBADD = $(TC_LIBS) hook_tokens.h hook_tokens.c: $(FILTERS) param_tokens.c param_tokens.h: $(FILTERS) config.c +all: + include ../mk/common.mk diff --git a/postlicyd/rbl.c b/postlicyd/rbl.c index 911694a..4e1ac27 100644 --- a/postlicyd/rbl.c +++ b/postlicyd/rbl.c @@ -272,7 +272,7 @@ static bool rbl_filter_constructor(filter_t *filter) * the file pointed by filename MUST be a valid ip list issued from * the rsync (or equivalent) service of a (r)bl. */ - case ATK_FILE: { + case ATK_FILE: case ATK_RBLDNS: { bool lock = false; int weight = 0; rbldb_t *rbl = NULL; @@ -394,6 +394,7 @@ static int rbl_init(void) /* Parameters. */ (void)filter_param_register(type, "file"); + (void)filter_param_register(type, "rbldns"); (void)filter_param_register(type, "hard_threshold"); (void)filter_param_register(type, "soft_threshold"); return 0; -- 2.20.1