join transport logic for DK and DKIM, making it possible to use both at the same...

[exim.git] / src / src / transports / smtp.h

diff --git a/src/src/transports/smtp.h b/src/src/transports/smtp.h
index a731c039d4270c2a87317e672909d27f05ca1cd6..79239ad392d42cd11fe62cdc15d0e661749dfb8e 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.13 2007/09/28 12:21:57 tom Exp $ */
+/* $Cambridge: exim/src/src/transports/smtp.h,v 1.14 2008/03/05 21:13:23 tom Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -57,15 +57,13 @@ typedef struct {
   uschar *tls_verify_certificates;
   BOOL    tls_tempfail_tryclear;
   #endif
-  #ifdef EXPERIMENTAL_DOMAINKEYS
+  #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;
-  #endif
-  #ifdef EXPERIMENTAL_DKIM
   uschar *dkim_domain;
   uschar *dkim_private_key;
   uschar *dkim_selector;