diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2014-04-21 15:04:18 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2014-04-21 15:04:18 +0100 |
| commit | b8f84a8d97210e9a2df04ad4687624a30d62a1a4 (patch) | |
| tree | c416209dcbcda6422e17caff4c6dbb6f450efa35 /src/plugins/dkim_check.c | |
| parent | b9a379e9d6b05b0f558ad052389fdb5384b189a8 (diff) | |
| download | rspamd-b8f84a8d97210e9a2df04ad4687624a30d62a1a4.tar.gz rspamd-b8f84a8d97210e9a2df04ad4687624a30d62a1a4.zip | |
Deprecate views: never ever being used.
Diffstat (limited to 'src/plugins/dkim_check.c')
| -rw-r--r-- | src/plugins/dkim_check.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/plugins/dkim_check.c b/src/plugins/dkim_check.c index 9610db6a8..ac12c0909 100644 --- a/src/plugins/dkim_check.c +++ b/src/plugins/dkim_check.c @@ -43,7 +43,6 @@ #include "cfg_file.h" #include "expressions.h" #include "util.h" -#include "view.h" #include "map.h" #include "dkim.h" #include "hash.h" @@ -315,12 +314,9 @@ dkim_symbol_callback (struct rspamd_task *task, void *unused) if (hlist != NULL) { /* Check whitelist */ msg_debug ("dkim signature found"); -#ifdef HAVE_INET_PTON - if (!task->from_addr.has_addr || - radix32tree_find (dkim_module_ctx->whitelist_ip, ntohl (task->from_addr.d.in4.s_addr)) == RADIX_NO_VALUE) { -#else - if (radix32tree_find (dkim_module_ctx->whitelist_ip, ntohl (task->from_addr.s_addr)) == RADIX_NO_VALUE) { -#endif + if (task->from_addr.af == AF_INET || + radix32tree_find (dkim_module_ctx->whitelist_ip, + ntohl (task->from_addr.addr.s4.sin_addr.s_addr)) == RADIX_NO_VALUE) { /* Parse signature */ msg_debug ("create dkim signature"); /* |