Mercurial > masqmail
diff src/smtp_in.c @ 305:794071925a22
refactored complex conditions
| author | meillo@marmaro.de |
|---|---|
| date | Sun, 24 Apr 2011 15:10:11 +0200 |
| parents | 3708b655a371 |
| children | 53cf6be5843a |
line wrap: on
line diff
--- a/src/smtp_in.c Thu Dec 09 18:28:11 2010 -0300 +++ b/src/smtp_in.c Sun Apr 24 15:10:11 2011 +0200 @@ -286,17 +286,11 @@ break; } if (!addr->domain) { + /* TODO: ``postmaster'' may be unqualified */ smtp_printf(out, "501 recipient address must be qualified.\r\n", buf); break; } - gboolean do_relay = conf.do_relay; - if (!do_relay) { - do_relay = addr_is_local(msg->return_path); - if (!do_relay) { - do_relay = addr_is_local(addr); - } - } - if (!do_relay) { + if (!(conf.do_relay || addr_is_local(msg->return_path) || addr_is_local(addr))) { smtp_printf(out, "550 relaying to %s denied.\r\n", addr_string(addr)); break; }