diff options
| author | Tom Kistner <tom@duncanthrax.net> | 2007-10-04 13:23:05 +0000 |
|---|---|---|
| committer | Tom Kistner <tom@duncanthrax.net> | 2007-10-04 13:23:05 +0000 |
| commit | e08d09e542c8cefad1e5740610644bb2c5b79d76 (patch) | |
| tree | d9e087a7df24c19a5bb5fa028d4f265af8e1c287 | |
| parent | e7f87740781b52b34f87b4d687df18cc4ccfcb91 (diff) | |
Added missing expansion links for dkim_domain and dkim_selector
| -rw-r--r-- | src/OS/os.h-Linux | 7 | ||||
| -rw-r--r-- | src/src/expand.c | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/OS/os.h-Linux b/src/OS/os.h-Linux index 8d87df0b8..14441e684 100644 --- a/src/OS/os.h-Linux +++ b/src/OS/os.h-Linux @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/OS/os.h-Linux,v 1.5 2006/12/20 19:54:23 tom Exp $ */ +/* $Cambridge: exim/src/OS/os.h-Linux,v 1.6 2007/10/04 13:23:05 tom Exp $ */ /* Exim: OS-specific C header file for Linux */ @@ -53,3 +53,8 @@ extern struct ip_address_item *os_find_running_interfaces_linux(void); #endif /* __linux__ */ /* End */ + +/* Fudge added because this Linux doesn't appear to have a definition +for ip_options in /usr/include/linux/ip.h. */ + +#define ip_options options diff --git a/src/src/expand.c b/src/src/expand.c index 657d2b9f9..e83812c57 100644 --- a/src/src/expand.c +++ b/src/src/expand.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/expand.c,v 1.90 2007/08/23 11:01:49 ph10 Exp $ */ +/* $Cambridge: exim/src/src/expand.c,v 1.91 2007/10/04 13:23:05 tom Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -413,6 +413,10 @@ static var_entry var_table[] = { { "dk_status", vtype_dk_verify, NULL }, { "dk_testing", vtype_dk_verify, NULL }, #endif +#ifdef EXPERIMENTAL_DKIM + { "dkim_domain", vtype_stringptr, &dkim_signing_domain }, + { "dkim_selector", vtype_stringptr, &dkim_signing_selector }, +#endif { "dnslist_domain", vtype_stringptr, &dnslist_domain }, { "dnslist_matched", vtype_stringptr, &dnslist_matched }, { "dnslist_text", vtype_stringptr, &dnslist_text }, |