diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2022-09-01 15:54:35 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2022-09-01 15:54:35 +0100 |
| commit | 32da6327e434e986a18b75a84f2d8c687ba14619 (patch) | |
| tree | 7862a2af8c45a4f099efd85f28e76a2233bab304 | |
| parent | 158dff9936e36a2d31d037d3988b9353458d6471 (diff) | |
| download | exim4-32da6327e434e986a18b75a84f2d8c687ba14619.tar.gz | |
Fix non-WITH_CONTENT_SCAN build (3)
Broken-by: d8ecc7bf97
| -rw-r--r-- | src/src/expand.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/src/expand.c b/src/src/expand.c index 89de56255..831ca2b75 100644 --- a/src/src/expand.c +++ b/src/src/expand.c @@ -1869,6 +1869,7 @@ if (Ustrncmp(name, "auth", 4) == 0) if (!*endptr && n != 0 && n <= AUTH_VARS) return auth_vars[n-1] ? auth_vars[n-1] : US""; } +#ifdef WITH_CONTENT_SCAN else if (Ustrncmp(name, "regex", 5) == 0) { uschar *endptr; @@ -1876,6 +1877,7 @@ else if (Ustrncmp(name, "regex", 5) == 0) if (!*endptr && n != 0 && n <= REGEX_VARS) return regex_vars[n-1] ? regex_vars[n-1] : US""; } +#endif /* For all other variables, search the table */ @@ -8715,9 +8717,11 @@ assert_variable_notin() treats as const, so deconst is safe. */ for (int i = 0; i < AUTH_VARS; i++) if (auth_vars[i]) assert_variable_notin(US"auth<n>", US auth_vars[i], &e); +#ifdef WITH_CONTENT_SCAN /* check regex<n> variables. assert_variable_notin() treats as const. */ for (int i = 0; i < REGEX_VARS; i++) if (regex_vars[i]) assert_variable_notin(US"regex<n>", US regex_vars[i], &e); +#endif /* check known-name variables */ for (var_entry * v = var_table; v < var_table + var_table_size; v++) |