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
tidying
[exim.git]
/
src
/
src
/
expand.c
diff --git
a/src/src/expand.c
b/src/src/expand.c
index de38e3acb9086436d58a5c2af69437dd3ae8e8d6..c7ebf987042167982c50adc6ae53f5bf9fff0ea6 100644
(file)
--- a/
src/src/expand.c
+++ b/
src/src/expand.c
@@
-1797,10
+1797,10
@@
switch (vp->type)
return var_buffer;
case vtype_host_lookup: /* Lookup if not done so */
return var_buffer;
case vtype_host_lookup: /* Lookup if not done so */
- if (
sender_host_name == NULL && sender_host_address != NULL &&
- !host_lookup_failed && host_name_lookup() == OK)
+ if (
!sender_host_name && sender_host_address
+
&&
!host_lookup_failed && host_name_lookup() == OK)
host_build_sender_fullhost();
host_build_sender_fullhost();
- return
(sender_host_name == NULL)? US"" : sender_host_name
;
+ return
sender_host_name ? sender_host_name : US""
;
case vtype_localpart: /* Get local part from address */
s = *((uschar **)(val));
case vtype_localpart: /* Get local part from address */
s = *((uschar **)(val));