git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge native DKIM support (from DEVEL_PDKIM)
[exim.git]
/
src
/
src
/
smtp_in.c
diff --git
a/src/src/smtp_in.c
b/src/src/smtp_in.c
index b710c89ced8f2c5e6411d1221882dcfb619eb8e2..b9d92d63131c427f4f3d17c3b3a2eb0605736d6b 100644
(file)
--- a/
src/src/smtp_in.c
+++ b/
src/src/smtp_in.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/smtp_in.c,v 1.6
3 2008/09/29 11:41:07 nm4
Exp $ */
+/* $Cambridge: exim/src/src/smtp_in.c,v 1.6
4 2009/06/10 07:34:04 tom
Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-264,6
+264,9
@@
if (smtp_inptr >= smtp_inend)
else smtp_had_eof = 1;
return EOF;
}
else smtp_had_eof = 1;
return EOF;
}
+#ifndef DISABLE_DKIM
+ dkim_exim_verify_feed(smtp_inbuffer, rc);
+#endif
smtp_inend = smtp_inbuffer + rc;
smtp_inptr = smtp_inbuffer;
}
smtp_inend = smtp_inbuffer + rc;
smtp_inptr = smtp_inbuffer;
}
@@
-1037,11
+1040,10
@@
authenticated_sender = NULL;
bmi_run = 0;
bmi_verdicts = NULL;
#endif
bmi_run = 0;
bmi_verdicts = NULL;
#endif
-#ifdef EXPERIMENTAL_DOMAINKEYS
-dk_do_verify = 0;
-#endif
-#ifdef EXPERIMENTAL_DKIM
-dkim_do_verify = 0;
+#ifndef DISABLE_DKIM
+dkim_signing_domains = NULL;
+dkim_disable_verify = FALSE;
+dkim_collect_input = FALSE;
#endif
#ifdef EXPERIMENTAL_SPF
spf_header_comment = NULL;
#endif
#ifdef EXPERIMENTAL_SPF
spf_header_comment = NULL;