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
SPDX: Mass-update to GPL-2.0-or-later
[exim.git]
/
src
/
src
/
macro_predef.c
diff --git
a/src/src/macro_predef.c
b/src/src/macro_predef.c
index b0f57be19538aafb6341b824f321397057ec1ecb..618c914dc88718c1dbabd0c67b7724cdbdcf0efd 100644
(file)
--- a/
src/src/macro_predef.c
+++ b/
src/src/macro_predef.c
@@
-2,9
+2,10
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) Jeremy Harris 1995 - 2018 */
/* Copyright (c) Jeremy Harris 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 */
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
/* Create a static data structure with the predefined macros, to be
included in the main Exim build */
/* Create a static data structure with the predefined macros, to be
included in the main Exim build */
@@
-72,7
+73,7
@@
options_from_list(optionlist * opts, unsigned nopt,
const uschar * section, uschar * group)
{
const uschar * s;
const uschar * section, uschar * group)
{
const uschar * s;
-uschar buf[
64
];
+uschar buf[
EXIM_DRIVERNAME_MAX
];
/* The 'previously-defined-substring' rule for macros in config file
lines is done thus for these builtin macros: we know that the table
/* The 'previously-defined-substring' rule for macros in config file
lines is done thus for these builtin macros: we know that the table
@@
-183,7
+184,7
@@
due to conflicts with other common macros. */
#ifdef SUPPORT_SPF
builtin_macro_create(US"_HAVE_SPF");
#endif
#ifdef SUPPORT_SPF
builtin_macro_create(US"_HAVE_SPF");
#endif
-#if
defined(EXPERIMENTAL_SRS_ALT) || defined(SUPPORT_SRS)
+#if
def SUPPORT_SRS
builtin_macro_create(US"_HAVE_SRS");
#endif
#ifdef EXPERIMENTAL_ARC
builtin_macro_create(US"_HAVE_SRS");
#endif
#ifdef EXPERIMENTAL_ARC
@@
-233,9
+234,6
@@
due to conflicts with other common macros. */
#ifdef LOOKUP_LDAP
builtin_macro_create(US"_HAVE_LOOKUP_LDAP");
#endif
#ifdef LOOKUP_LDAP
builtin_macro_create(US"_HAVE_LOOKUP_LDAP");
#endif
-#ifdef EXPERIMENTAL_LMDB
- builtin_macro_create(US"_HAVE_LOOKUP_LMDB");
-#endif
#ifdef LOOKUP_MYSQL
builtin_macro_create(US"_HAVE_LOOKUP_MYSQL");
#endif
#ifdef LOOKUP_MYSQL
builtin_macro_create(US"_HAVE_LOOKUP_MYSQL");
#endif
@@
-279,11
+277,12
@@
due to conflicts with other common macros. */
# endif
#endif
# endif
#endif
+features_acl();
+features_crypto();
+
#ifdef WITH_CONTENT_SCAN
features_malware();
#endif
#ifdef WITH_CONTENT_SCAN
features_malware();
#endif
-
-features_crypto();
}
static void
}
static void
@@
-307,9
+306,6
@@
exp_features(void)
#ifdef EXPERIMENTAL_QUEUEFILE
builtin_macro_create(US"_EXP_QUEUEFILE");
#endif
#ifdef EXPERIMENTAL_QUEUEFILE
builtin_macro_create(US"_EXP_QUEUEFILE");
#endif
-#if defined(EXPERIMENTAL_SRS_ALT)
- builtin_macro_create(US"_EXP_SRS");
-#endif
}
}