masqmail
diff src/deliver.c @ 374:a96bb42f597d
Improved log/debug messages.
If a route goes through a wrapper, then we don't know the remote host's name.
| author | markus schnalke <meillo@marmaro.de> |
|---|---|
| date | Sat, 14 Jan 2012 17:27:21 +0100 |
| parents | b0708fac99dd |
| children | 3f923f97563b |
line diff
1.1 --- a/src/deliver.c Sat Jan 14 11:47:57 2012 +0100 1.2 +++ b/src/deliver.c Sat Jan 14 17:27:21 2012 +0100 1.3 @@ -423,7 +423,7 @@ 1.4 msg_out *msgout = (msg_out *) (msgout_node->data); 1.5 smtp_out_mark_rcpts(psb, msgout->rcpt_list); 1.6 1.7 - if (delivery_failures(msgout->msg, msgout->rcpt_list, "while connected with %s, the server replied\n\t%s", host, psb->buffer)) { 1.8 + if (delivery_failures(msgout->msg, msgout->rcpt_list, "while connected with %s, the server replied\n\t%s", (route->wrapper) ? "<wrapper>" : host, psb->buffer)) { 1.9 deliver_finish(msgout); 1.10 } 1.11 } 1.12 @@ -450,7 +450,7 @@ 1.13 1.14 smtp_out_msg(psb, msg, msgout->return_path, msgout->rcpt_list, msgout->hdr_list); 1.15 1.16 - ok_fail = delivery_failures(msg, msgout->rcpt_list, "while connected with %s, the server replied\n\t%s", host, psb->buffer); 1.17 + ok_fail = delivery_failures(msg, msgout->rcpt_list, "while connected with %s, the server replied\n\t%s", (route->wrapper) ? "<wrapper>" : host, psb->buffer); 1.18 1.19 if ((psb->error == smtp_eof) || (psb->error == smtp_timeout)) { 1.20 /* connection lost */ 1.21 @@ -583,6 +583,7 @@ 1.22 1.23 /* filter by allowed envelope sender */ 1.24 if (!route_sender_is_allowed(route, msgout->msg->return_path)) { 1.25 + DEBUG(6) debugf("sender `%s' is not allowed for this route\n", msgout->msg->return_path); 1.26 destroy_msg_out(msgout_cloned); 1.27 continue; 1.28 }