tom 2007/10/04 14:23:05 BST
Modified files:
exim-src/OS os.h-Linux
exim-src/src expand.c
Log:
Added missing expansion links for dkim_domain and dkim_selector
Revision Changes Path
1.6 +5 -0 exim/exim-src/OS/os.h-Linux
1.91 +4 -0 exim/exim-src/src/expand.c
Index: os.h-Linux
===================================================================
RCS file: /home/cvs/exim/exim-src/OS/os.h-Linux,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- os.h-Linux 20 Dec 2006 19:54:23 -0000 1.5
+++ os.h-Linux 4 Oct 2007 13:23:05 -0000 1.6
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/OS/os.h-Linux,v 1.5 2006/12/20 19:54:23 tom Exp $ */
+/* $Cambridge: exim/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 @@
#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
Index: expand.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/expand.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- expand.c 23 Aug 2007 11:01:49 -0000 1.90
+++ expand.c 4 Oct 2007 13:23:05 -0000 1.91
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/expand.c,v 1.90 2007/08/23 11:01:49 ph10 Exp $ */
+/* $Cambridge: exim/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 @@
{ "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 },
