diff options
| -rw-r--r-- | doc/doc-txt/ChangeLog | 3 | ||||
| -rw-r--r-- | src/src/spf.c | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 23a18cf2f..b0d6b06af 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -109,6 +109,9 @@ PP/07 Make maildir_use_size_file an _expandable_ boolean. PP/08 Handle ${run} returning more data than OS pipe buffer size. Bugzilla 1131. Patch from Holger Weiß. +PP/09 Handle IPv6 addresses with SPF. + Bugzilla 860. Patch from Wolfgang Breyha. + Exim version 4.76 ----------------- diff --git a/src/src/spf.c b/src/src/spf.c index 6be339390..4bbabbf4c 100644 --- a/src/src/spf.c +++ b/src/src/spf.c @@ -42,22 +42,23 @@ int spf_init(uschar *spf_helo_domain, uschar *spf_remote_addr) { } if (SPF_server_set_rec_dom(spf_server, CS primary_hostname)) { - debug_printf("spf: SPF_server_set_rec_dom() failed.\n"); + debug_printf("spf: SPF_server_set_rec_dom(\"%s\") failed.\n", primary_hostname); spf_server = NULL; return 0; } spf_request = SPF_request_new(spf_server); - if (SPF_request_set_ipv4_str(spf_request, CS spf_remote_addr)) { - debug_printf("spf: SPF_request_set_ipv4_str() failed.\n"); + if (SPF_request_set_ipv4_str(spf_request, CS spf_remote_addr) + && SPF_request_set_ipv6_str(spf_request, CS spf_remote_addr)) { + debug_printf("spf: SPF_request_set_ipv4_str() and SPF_request_set_ipv6_str() failed [%s]\n", spf_remote_addr); spf_server = NULL; spf_request = NULL; return 0; } if (SPF_request_set_helo_dom(spf_request, CS spf_helo_domain)) { - debug_printf("spf: SPF_set_helo_dom() failed.\n"); + debug_printf("spf: SPF_set_helo_dom(\"%s\") failed.\n", spf_helo_domain); spf_server = NULL; spf_request = NULL; return 0; |