1.1 --- a/src/deliver.c	Wed Jul 14 16:48:45 2010 +0200
     1.2 +++ b/src/deliver.c	Wed Jul 14 17:02:08 2010 +0200
     1.3 @@ -330,6 +330,7 @@
     1.4  	}
     1.5  
     1.6  	if (host == NULL) {
     1.7 +		/* XXX: what if mail_host isn't set? Is this possible? */
     1.8  		host = route->mail_host->address;
     1.9  		port = route->mail_host->port;
    1.10  	}
    1.11 @@ -343,8 +344,11 @@
    1.12  
    1.13  	if ((psb = (route->wrapper ? smtp_out_open_child(route->wrapper) : smtp_out_open(host, port, res_list)))) {
    1.14  
    1.15 -		if (route->wrapper)
    1.16 +		if (route->wrapper) {
    1.17 +			/* it seems as if the remote_host is only set for logging
    1.18 +			/* XXX: this could probably be moved into smtp_out_open_child() */
    1.19  			psb->remote_host = host;
    1.20 +		}
    1.21  
    1.22  		set_heloname(psb, route->helo_name ? route->helo_name : conf.host_name, route->do_correct_helo);
    1.23  
    1.24 @@ -464,8 +468,8 @@
    1.25  
    1.26  	DEBUG(5) debugf("deliver_route_msgout_list entered, route->name = %s\n", route->name);
    1.27  
    1.28 -	if (route->mail_host != NULL) {
    1.29 -		/* this is easy... */
    1.30 +	if (route->mail_host) {
    1.31 +		/* this is easy... deliver everything to a smart host for relay */
    1.32  		if (deliver_msglist_host(route, msgout_list, NULL, route->resolve_list))
    1.33  			ok = TRUE;
    1.34