1124,1125c1124,1125
<        || (result == FAIL  && tb->log_fail_output)
<        || (result == DEFER && tb->log_defer_output)
---
>        || result == FAIL  && tb->log_fail_output
>        || result == DEFER && tb->log_defer_output
1152d1151
<     {
1163d1161
<     }
2159,2160c2157,2158
<       if(  (ret = (write(pfd[pipe_write], &message_length, sizeof(int))) != sizeof(int))
<         || (message_length > 0  && (ret = write(pfd[pipe_write], s, message_length)) != message_length)
---
>       if(  (ret = write(pfd[pipe_write], &message_length, sizeof(int))) != sizeof(int)
>         || message_length > 0  && (ret = write(pfd[pipe_write], s, message_length)) != message_length
2518,2519c2516,2517
< 	&& (  (!addr->host_list && !next->host_list)
< 	   || (   addr->host_list
---
> 	&& (  !addr->host_list && !next->host_list
> 	   ||    addr->host_list
2521c2519
< 	      && Ustrcmp(addr->host_list->name, next->host_list->name) == 0)
---
> 	      && Ustrcmp(addr->host_list->name, next->host_list->name) == 0
4117,4120c4115,4116
< 		!tp->expand_multi_domain
<              || (deliver_set_expansions(next)
<                  ,
< 	         (exp_bool(addr,
---
> 		!tp->expand_multi_domain || (deliver_set_expansions(next), 1),
> 	        exp_bool(addr,
4123,4124c4119
< 		    next->transport->expand_multi_domain, &md) == OK)
<                  )
---
> 		    next->transport->expand_multi_domain, &md) == OK
4155d4149
<   {
4160d4153
<   }
6294c6287
<     else if (  (  (queue_running && !deliver_force)
---
>     else if (  (  queue_running && !deliver_force
7672d7664
<     {
7686d7677
<     }