Mercurial > masqmail
changeset 179:3190e6864452
added comments to deliver.c (stuff to check)
author | meillo@marmaro.de |
---|---|
date | Wed, 14 Jul 2010 17:02:08 +0200 |
parents | 91f8ee6514f5 |
children | 1472a6a73b1c |
files | src/deliver.c |
diffstat | 1 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/deliver.c Wed Jul 14 16:48:45 2010 +0200 +++ b/src/deliver.c Wed Jul 14 17:02:08 2010 +0200 @@ -330,6 +330,7 @@ } if (host == NULL) { + /* XXX: what if mail_host isn't set? Is this possible? */ host = route->mail_host->address; port = route->mail_host->port; } @@ -343,8 +344,11 @@ if ((psb = (route->wrapper ? smtp_out_open_child(route->wrapper) : smtp_out_open(host, port, res_list)))) { - if (route->wrapper) + if (route->wrapper) { + /* it seems as if the remote_host is only set for logging + /* XXX: this could probably be moved into smtp_out_open_child() */ psb->remote_host = host; + } set_heloname(psb, route->helo_name ? route->helo_name : conf.host_name, route->do_correct_helo); @@ -464,8 +468,8 @@ DEBUG(5) debugf("deliver_route_msgout_list entered, route->name = %s\n", route->name); - if (route->mail_host != NULL) { - /* this is easy... */ + if (route->mail_host) { + /* this is easy... deliver everything to a smart host for relay */ if (deliver_msglist_host(route, msgout_list, NULL, route->resolve_list)) ok = TRUE;