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
Debug: option access for expansion
[exim.git]
/
src
/
src
/
routers
/
rf_get_errors_address.c
diff --git
a/src/src/routers/rf_get_errors_address.c
b/src/src/routers/rf_get_errors_address.c
index 222d157d824372d5853ec6083e02683d02c5e49e..792b9b5f30e8fcdadd23a917ae407f9f1fc3e93b 100644
(file)
--- a/
src/src/routers/rf_get_errors_address.c
+++ b/
src/src/routers/rf_get_errors_address.c
@@
-38,14
+38,13
@@
int
rf_get_errors_address(address_item * addr, router_instance * rblock,
int verify, const uschar ** errors_to)
{
rf_get_errors_address(address_item * addr, router_instance * rblock,
int verify, const uschar ** errors_to)
{
-uschar *s;
+uschar *
s;
*errors_to = addr->prop.errors_address;
if (!rblock->errors_to) return OK;
*errors_to = addr->prop.errors_address;
if (!rblock->errors_to) return OK;
-s = expand_string(rblock->errors_to);
-
-if (s == NULL)
+GET_OPTION("errors_to");
+if (!(s = expand_string(rblock->errors_to)))
{
if (f.expand_string_forcedfail)
{
{
if (f.expand_string_forcedfail)
{
@@
-60,7
+59,7
@@
if (s == NULL)
/* If the errors_to address is empty, it means "ignore errors" */
/* If the errors_to address is empty, it means "ignore errors" */
-if (
*s == 0
)
+if (
!*s
)
{
addr->prop.ignore_error = TRUE; /* For locally detected errors */
*errors_to = US""; /* Return path for SMTP */
{
addr->prop.ignore_error = TRUE; /* For locally detected errors */
*errors_to = US""; /* Return path for SMTP */