From 65d86a7cda4586200aa0762205c74f415b9823b2 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Wed, 18 Oct 2017 17:31:02 +0000 Subject: Make blacklist entries override the whitelist. When running spamd in greylisting mode, it is not uncommon for an IP to get whitelisted before it shows up on a spam blacklist. With this change, spamd will check its blacklists before adding a WHITE entry to the pf table. If the IP matches a blacklist, the WHITE entry will be removed. OK phessler@ --- libexec/spamd/sdl.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libexec/spamd/sdl.h') diff --git a/libexec/spamd/sdl.h b/libexec/spamd/sdl.h index 84b752453f7..aef0093f1fe 100644 --- a/libexec/spamd/sdl.h +++ b/libexec/spamd/sdl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sdl.h,v 1.8 2017/10/17 13:52:10 millert Exp $ */ +/* $OpenBSD: sdl.h,v 1.9 2017/10/18 17:31:01 millert Exp $ */ /* * Copyright (c) 2003-2007 Bob Beck. All rights reserved. @@ -62,6 +62,7 @@ struct sdlist { int sdl_add(char *, char *, char **, u_int, char **, u_int); void sdl_del(char *); +int sdl_check(struct sdlist *, int, void *); struct sdlist **sdl_lookup(struct sdlist *, int, void *); #endif /* _SDL_H_ */ -- cgit v1.2.3