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
Squashed commit of PIPE_CONNECT
[exim.git]
/
src
/
src
/
macro_predef.c
diff --git
a/src/src/macro_predef.c
b/src/src/macro_predef.c
index e133b8e1be9e4e048835ad79f30e206c0cc0a9b5..fbc923ce69584dbdae67c5661d841101cfa9da77 100644
(file)
--- a/
src/src/macro_predef.c
+++ b/
src/src/macro_predef.c
@@
-2,7
+2,7
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) Jeremy Harris
2017
*/
+/* Copyright (c) Jeremy Harris
1995 - 2018
*/
/* See the file NOTICE for conditions of use and distribution. */
/* Create a static data structure with the predefined macros, to be
/* See the file NOTICE for conditions of use and distribution. */
/* Create a static data structure with the predefined macros, to be
@@
-21,19
+21,30
@@
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, \"%s\", \"y\" };\n", Ustrlen(name), 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++;
}
-static void
+
+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, ...)
{
va_list ap;
spf(uschar * buf, int len, const uschar * fmt, ...)
{
va_list ap;
@@
-73,9
+84,9
@@
expansion. */
for (i = 0; i < nopt; i++) if (*(s = US opts[i].name) && *s != '*')
{
if (group)
for (i = 0; i < nopt; i++) if (*(s = US opts[i].name) && *s != '*')
{
if (group)
- spf(buf, sizeof(buf), "_OPT_%T_%T_%T", section, group, s);
+ spf(buf, sizeof(buf),
CUS
"_OPT_%T_%T_%T", section, group, s);
else
else
- spf(buf, sizeof(buf), "_OPT_%T_%T", section, s);
+ spf(buf, sizeof(buf),
CUS
"_OPT_%T_%T", section, s);
builtin_macro_create(buf);
}
}
builtin_macro_create(buf);
}
}
@@
-163,16
+174,19
@@
due to conflicts with other common macros. */
#ifdef EXPERIMENTAL_LMDB
builtin_macro_create(US"_HAVE_LMDB");
#endif
#ifdef EXPERIMENTAL_LMDB
builtin_macro_create(US"_HAVE_LMDB");
#endif
-#ifdef
EXPERIMENTAL
_SPF
+#ifdef
SUPPORT
_SPF
builtin_macro_create(US"_HAVE_SPF");
#endif
#ifdef EXPERIMENTAL_SRS
builtin_macro_create(US"_HAVE_SRS");
#endif
builtin_macro_create(US"_HAVE_SPF");
#endif
#ifdef EXPERIMENTAL_SRS
builtin_macro_create(US"_HAVE_SRS");
#endif
+#ifdef EXPERIMENTAL_ARC
+ builtin_macro_create(US"_HAVE_ARC");
+#endif
#ifdef EXPERIMENTAL_BRIGHTMAIL
builtin_macro_create(US"_HAVE_BRIGHTMAIL");
#endif
#ifdef EXPERIMENTAL_BRIGHTMAIL
builtin_macro_create(US"_HAVE_BRIGHTMAIL");
#endif
-#ifdef
EXPERIMENTAL
_DANE
+#ifdef
SUPPORT
_DANE
builtin_macro_create(US"_HAVE_DANE");
#endif
#ifdef EXPERIMENTAL_DCC
builtin_macro_create(US"_HAVE_DANE");
#endif
#ifdef EXPERIMENTAL_DCC
@@
-184,6
+198,12
@@
due to conflicts with other common macros. */
#ifdef EXPERIMENTAL_DSN_INFO
builtin_macro_create(US"_HAVE_DSN_INFO");
#endif
#ifdef EXPERIMENTAL_DSN_INFO
builtin_macro_create(US"_HAVE_DSN_INFO");
#endif
+#ifdef EXPERIMENTAL_REQUIRETLS
+ builtin_macro_create(US"_HAVE_REQTLS");
+#endif
+#ifdef EXPERIMENTAL_PIPE_CONNECT
+ builtin_macro_create(US"_HAVE_PIPE_CONNECT");
+#endif
#ifdef LOOKUP_LSEARCH
builtin_macro_create(US"_HAVE_LOOKUP_LSEARCH");
#ifdef LOOKUP_LSEARCH
builtin_macro_create(US"_HAVE_LOOKUP_LSEARCH");
@@
-251,6
+271,12
@@
due to conflicts with other common macros. */
builtin_macro_create(US"_HAVE_TRANSPORT_APPEND_MBX");
# endif
#endif
builtin_macro_create(US"_HAVE_TRANSPORT_APPEND_MBX");
# endif
#endif
+
+#ifdef WITH_CONTENT_SCAN
+features_malware();
+#endif
+
+features_crypto();
}
}
@@
-261,6
+287,18
@@
options_main();
options_routers();
options_transports();
options_auths();
options_routers();
options_transports();
options_auths();
+options_logging();
+#if defined(SUPPORT_TLS) && !defined(USE_GNUTLS)
+options_tls();
+#endif
+}
+
+static void
+params(void)
+{
+#ifndef DISABLE_DKIM
+params_dkim();
+#endif
}
}
@@
-270,7
+308,9
@@
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");
+exit(0);
}
}