Gitweb:
http://git.exim.org/exim.git/commitdiff/a0a2d1eea23b7fd28d4fc85672ed3210926bdbab
Commit: a0a2d1eea23b7fd28d4fc85672ed3210926bdbab
Parent: eeb9276b22cd991157c46a068a85ffe59b948d75
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Thu Aug 14 14:52:40 2014 +0100
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Thu Aug 14 14:53:27 2014 +0100
Fix non-dane build
---
src/OS/Makefile-Base | 6 +++---
src/src/deliver.c | 2 ++
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base
index 8937f3c..f82549d 100644
--- a/src/OS/Makefile-Base
+++ b/src/OS/Makefile-Base
@@ -541,7 +541,6 @@ acl.o: $(HDRS) acl.c
child.o: $(HDRS) child.c
crypt16.o: $(HDRS) crypt16.c
daemon.o: $(HDRS) daemon.c
-dane.o: $(HDRS) dane.c dane-gnu.c dane-openssl.c
dbfn.o: $(HDRS) dbfn.c
debug.o: $(HDRS) debug.c
deliver.o: $(HDRS) deliver.c
@@ -603,10 +602,11 @@ demime.o: $(HDRS) demime.c
# Dependencies for EXPERIMENTAL_* modules
bmi_spam.o: $(HDRS) bmi_spam.c
-spf.o: $(HDRS) spf.h spf.c
-srs.o: $(HDRS) srs.h srs.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
+spf.o: $(HDRS) spf.h spf.c
+srs.o: $(HDRS) srs.h srs.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/deliver.c b/src/src/deliver.c
index ebd06b5..86deceb 100644
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -4133,7 +4133,9 @@ for (delivery_count = 0; addr_remote != NULL; delivery_count++)
/* The certificate verification status goes into the flags */
if (tls_out.certificate_verified) setflag(addr, af_cert_verified);
+#ifdef EXPERIMENTAL_DANE
if (tls_out.dane_verified) setflag(addr, af_dane_verified);
+#endif
/* Use an X item only if there's something to send */
#ifdef SUPPORT_TLS
