X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/55b583f6c31af475f329da97cd160a8ab2e8df8c..c11d665dab975691024f9231ad93c65bef7e5df4:/src/src/macro_predef.c

diff --git a/src/src/macro_predef.c b/src/src/macro_predef.c
index 502bfc7ee..08028bf5b 100644
--- a/src/src/macro_predef.c
+++ b/src/src/macro_predef.c
@@ -21,18 +21,29 @@ uschar * syslog_facility_str;
 /******************************************************************************/
 
 void
-builtin_macro_create(const uschar * name)
+builtin_macro_create_var(const uschar * name, const uschar * val)
 {
 printf ("static macro_item p%d = { ", mp_index);
 if (mp_index == 0)
-  printf("NULL,");
+  printf(".next=NULL,");
 else
-  printf("&p%d,", mp_index-1);
+  printf(".next=&p%d,", mp_index-1);
 
-printf(" FALSE, %d, 1, US\"%s\", US\"y\" };\n", Ustrlen(name), CS name);
+printf(" .command_line=FALSE, .namelen=%d, .replen=%d,"
+	" .name=US\"%s\", .replacement=US\"%s\" };\n",
+	Ustrlen(name), Ustrlen(val), CS name, CS val);
 mp_index++;
 }
 
+
+void
+builtin_macro_create(const uschar * name)
+{
+builtin_macro_create_var(name, US"y");
+}
+
+
+/* restricted snprintf */
 void
 spf(uschar * buf, int len, const uschar * fmt, ...)
 {
@@ -251,6 +262,10 @@ due to conflicts with other common macros. */
   builtin_macro_create(US"_HAVE_TRANSPORT_APPEND_MBX");
 # endif
 #endif
+
+#ifdef WITH_CONTENT_SCAN
+features_malware();
+#endif
 }
 
 
@@ -263,6 +278,14 @@ options_transports();
 options_auths();
 }
 
+static void
+params(void)
+{
+#ifndef DISABLE_DKIM
+params_dkim();
+#endif
+}
+
 
 int
 main(void)
@@ -270,6 +293,7 @@ main(void)
 printf("#include \"exim.h\"\n");
 features();
 options();
+params();
 
 printf("macro_item * macros = &p%d;\n", mp_index-1);
 printf("macro_item * mlast = &p0;\n");