diff options
| -rw-r--r-- | doc/doc-txt/ChangeLog | 2 | ||||
| -rw-r--r-- | src/OS/Makefile-Base | 18 | ||||
| -rw-r--r-- | src/src/dkim.c | 8 | ||||
| -rw-r--r-- | src/src/pdkim/Makefile | 2 |
4 files changed, 18 insertions, 12 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 2caae227c..0468bf287 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -76,6 +76,8 @@ JH/15 Bug 1712: Introduce $prdr_requested flag variable JH/16 Bug 1714: Permit an empty string as expansion result for transport option transport_filter, meaning no filtering. +JH/17 Bug 1713: Fix non-PDKIM_DEBUG build. Patch from Jasen Betts. + Exim version 4.86 ----------------- diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base index 95110e6ce..f6667818f 100644 --- a/src/OS/Makefile-Base +++ b/src/OS/Makefile-Base @@ -607,7 +607,7 @@ tod.o: $(HDRS) tod.c transport.o: $(HDRS) transport.c tree.o: $(HDRS) tree.c verify.o: $(HDRS) verify.c -dkim.o: $(HDRS) dkim.c +dkim.o: $(HDRS) pdkim/pdkim.h dkim.c # Dependencies for WITH_CONTENT_SCAN modules @@ -620,19 +620,19 @@ spool_mbox.o: $(HDRS) spool_mbox.c # Dependencies for WITH_OLD_DEMIME modules -demime.o: $(HDRS) demime.c +demime.o: $(HDRS) demime.c # Dependencies for EXPERIMENTAL_* modules -bmi_spam.o: $(HDRS) bmi_spam.c -dane.o: $(HDRS) dane.c dane-gnu.c dane-openssl.c -dcc.o: $(HDRS) dcc.h dcc.c -dmarc.o: $(HDRS) dmarc.h dmarc.c +bmi_spam.o: $(HDRS) bmi_spam.c +dane.o: $(HDRS) dane.c dane-gnu.c dane-openssl.c +dcc.o: $(HDRS) dcc.h dcc.c +dmarc.o: $(HDRS) pdkim/pdkim.h dmarc.h dmarc.c imap_utf7.o: $(HDRS) imap_utf7.c -spf.o: $(HDRS) spf.h spf.c -srs.o: $(HDRS) srs.h srs.c -utf8.o: $(HDRS) utf8.c +spf.o: $(HDRS) spf.h spf.c +srs.o: $(HDRS) srs.h srs.c +utf8.o: $(HDRS) utf8.c # The module containing tables of available lookups, routers, auths, and # transports must be rebuilt if any of them are. However, because the makefiles diff --git a/src/src/dkim.c b/src/src/dkim.c index db2eb4948..504595815 100644 --- a/src/src/dkim.c +++ b/src/src/dkim.c @@ -70,9 +70,11 @@ if (dkim_verify_ctx) /* Create new context */ dkim_verify_ctx = pdkim_init_verify(PDKIM_INPUT_SMTP, &dkim_exim_query_dns_txt); - -if ((dkim_collect_input = !!dkim_verify_ctx)) +dkim_collect_input = !!dkim_verify_ctx; +#ifdef PDKIM_DEBUG +if (dkim_collect_input) pdkim_set_debug_stream(dkim_verify_ctx, debug_file); +#endif } @@ -565,7 +567,9 @@ while ((dkim_signing_domain = string_nextinlist(&dkim_domain, &sep, (char *) dkim_signing_domain, (char *) dkim_signing_selector, (char *) dkim_private_key_expanded); +#ifdef PDKIM_DEBUG pdkim_set_debug_stream(ctx, debug_file); +#endif pdkim_set_optional(ctx, (char *) dkim_sign_headers_expanded, NULL, diff --git a/src/src/pdkim/Makefile b/src/src/pdkim/Makefile index 610c011d9..c9576f7dd 100644 --- a/src/src/pdkim/Makefile +++ b/src/src/pdkim/Makefile @@ -14,7 +14,7 @@ pdkim.a: $(OBJ) base64.o: $(HDRS) base64.c bignum.o: $(HDRS) bignum.c -pdkim.o: $(HDRS) pdkim.c +pdkim.o: $(HDRS) pdkim.h pdkim.c rsa.o: $(HDRS) rsa.c sha1.o: $(HDRS) sha1.c sha2.o: $(HDRS) sha2.c |