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
/
transports
/
smtp.h
diff --git
a/src/src/transports/smtp.h
b/src/src/transports/smtp.h
index 79239ad392d42cd11fe62cdc15d0e661749dfb8e..55ede7c7f0d5a79ee59a325780af8824719a8a1e 100644
(file)
--- a/
src/src/transports/smtp.h
+++ b/
src/src/transports/smtp.h
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/transports/smtp.h,v 1.1
4 2008/03/05 21:13:23
tom Exp $ */
+/* $Cambridge: exim/src/src/transports/smtp.h,v 1.1
5 2009/06/10 07:34:05
tom Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-57,13
+57,7
@@
typedef struct {
uschar *tls_verify_certificates;
BOOL tls_tempfail_tryclear;
#endif
uschar *tls_verify_certificates;
BOOL tls_tempfail_tryclear;
#endif
- #if (defined EXPERIMENTAL_DOMAINKEYS) || (defined EXPERIMENTAL_DKIM)
- uschar *dk_domain;
- uschar *dk_private_key;
- uschar *dk_selector;
- uschar *dk_canon;
- uschar *dk_headers;
- uschar *dk_strict;
+ #ifndef DISABLE_DKIM
uschar *dkim_domain;
uschar *dkim_private_key;
uschar *dkim_selector;
uschar *dkim_domain;
uschar *dkim_private_key;
uschar *dkim_selector;