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
DKIM: add builtin macro with default list of headers for signing
[exim.git]
/
src
/
src
/
macro_predef.c
diff --git
a/src/src/macro_predef.c
b/src/src/macro_predef.c
index 502bfc7ee8dd7f8f713b0baa97a8ed6df748acb2..1b5cf479553b02bd8fdba55e4fad2f63a819702f 100644
(file)
--- a/
src/src/macro_predef.c
+++ b/
src/src/macro_predef.c
@@
-21,18
+21,28
@@
uschar * syslog_facility_str;
/******************************************************************************/
void
/******************************************************************************/
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 ("static macro_item p%d = { ", mp_index);
if (mp_index == 0)
- printf("NULL,");
+ printf("
.next=
NULL,");
else
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++;
}
mp_index++;
}
+
+void
+builtin_macro_create(const uschar * name)
+{
+builtin_macro_create_var(name, US"y");
+}
+
+
void
spf(uschar * buf, int len, const uschar * fmt, ...)
{
void
spf(uschar * buf, int len, const uschar * fmt, ...)
{
@@
-263,6
+273,12
@@
options_transports();
options_auths();
}
options_auths();
}
+static void
+params(void)
+{
+dkim_params();
+}
+
int
main(void)
int
main(void)
@@
-270,6
+286,7
@@
main(void)
printf("#include \"exim.h\"\n");
features();
options();
printf("#include \"exim.h\"\n");
features();
options();
+params();
printf("macro_item * macros = &p%d;\n", mp_index-1);
printf("macro_item * mlast = &p0;\n");
printf("macro_item * macros = &p%d;\n", mp_index-1);
printf("macro_item * mlast = &p0;\n");