diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2021-04-25 17:24:31 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2021-04-25 21:45:02 +0100 |
| commit | b3ce3e5440ea0ce5e3580aa9a0fa18c88214a286 (patch) | |
| tree | 47d4585a8d181a67109423f8a0e08467341b3689 /src | |
| parent | 82fecf8fd8f749abfc538a06d9eefc7119e014ae (diff) | |
Testsuite: tidying
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/acl.c | 2 | ||||
| -rw-r--r-- | src/src/expand.c | 16 |
2 files changed, 1 insertions, 17 deletions
diff --git a/src/src/acl.c b/src/src/acl.c index ce8d2189f..a6c3d4cbe 100644 --- a/src/src/acl.c +++ b/src/src/acl.c @@ -4106,7 +4106,7 @@ if (is_tainted(acl_text) && !f.running_in_test_harness) *log_msgptr = US"internal configuration error"; return ERROR; } -#endi +#endif /* Handle the case of a string that does not contain any spaces. Look for a named ACL among those read from the configuration, or a previously read file. diff --git a/src/src/expand.c b/src/src/expand.c index 8a571b2d9..bce335629 100644 --- a/src/src/expand.c +++ b/src/src/expand.c @@ -216,7 +216,6 @@ static uschar *op_table_main[] = { US"base62d", US"base64", US"base64d", - US"bless", US"domain", US"escape", US"escape8bit", @@ -264,7 +263,6 @@ enum { EOP_BASE62D, EOP_BASE64, EOP_BASE64D, - EOP_BLESS, EOP_DOMAIN, EOP_ESCAPE, EOP_ESCAPE8BIT, @@ -7112,20 +7110,6 @@ while (*s) continue; } - case EOP_BLESS: - /* This is purely for the convenience of the test harness. Do not enable - it otherwise as it defeats the taint-checking security. */ - - if (f.running_in_test_harness) - yield = string_cat(yield, is_tainted(sub) - ? string_copy_taint(sub, FALSE) : sub); - else - { - DEBUG(D_expand) debug_printf_indent("bless operator not supported\n"); - yield = string_cat(yield, sub); - } - continue; - case EOP_EXPAND: { uschar *expanded = expand_string_internal(sub, FALSE, NULL, skipping, TRUE, &resetok); |