From: Jeremy Harris Date: Thu, 14 Jan 2016 22:08:56 +0000 (+0000) Subject: Expansions: more detail in error messages X-Git-Tag: exim-4_87_RC3~12 X-Git-Url: https://git.exim.org/users/heiko/exim.git/commitdiff_plain/f90d49f7dacfd209a5584c7da8ce8a275278bba1 Expansions: more detail in error messages --- diff --git a/src/src/expand.c b/src/src/expand.c index 2966c22c6..85d8c6a27 100644 --- a/src/src/expand.c +++ b/src/src/expand.c @@ -3155,7 +3155,8 @@ Arguments: yieldptr points to the output string pointer sizeptr points to the output string size ptrptr points to the output string pointer - type "lookup" or "if" or "extract" or "run", for error message + type "lookup", "if", "extract", "run", "env", "listextract" or + "certextract" for error message resetok if not NULL, pointer to flag - write FALSE if unsafe to reset the store. @@ -5481,7 +5482,7 @@ while (*s != 0) &yield, /* output pointer */ &size, /* output size */ &ptr, /* output current point */ - US"extract", /* condition type */ + US"listextract", /* condition type */ &resetok)) { case 1: goto EXPAND_FAILED; /* when all is well, the */ @@ -5553,7 +5554,7 @@ while (*s != 0) &yield, /* output pointer */ &size, /* output size */ &ptr, /* output current point */ - US"extract", /* condition type */ + US"certextract", /* condition type */ &resetok)) { case 1: goto EXPAND_FAILED; /* when all is well, the */ diff --git a/test/stdout/0002 b/test/stdout/0002 index 5293d2587..ee351a278 100644 --- a/test/stdout/0002 +++ b/test/stdout/0002 @@ -72,7 +72,7 @@ > listextract: > listextract: > listextract: fail -> Failed: "extract" failed and "fail" requested +> Failed: "listextract" failed and "fail" requested > > sort: 1:2:3:4 > sort: 4,3,2,1