Cleaned up another set of conditionals in the SMTP server.

diff --git a/citadel/modules/smtp/serv_smtp.c b/citadel/modules/smtp/serv_smtp.c
index 2a4b8464281b9d5cb6949edd90c7ae16f2c2dfc4..a74e2bb9fa7fc0fdf9927a937afd42d484ac520d 100644 (file)
--- a/citadel/modules/smtp/serv_smtp.c
+++ b/citadel/modules/smtp/serv_smtp.c
@@ -705,13 +705,14 @@ void smtp_rcpt(void) {
                return;
        }
 
-       if (valid->num_internet > 0) {
-               if ( (SMTP->message_originated_locally == 0)
-                  && (SMTP->is_lmtp == 0) ) {
-                       cprintf("551 <%s> - relaying denied\r\n", ChrPtr(SMTP->OneRcpt));
-                       free_recipients(valid);
-                       return;
-               }
+       if (
+               (valid->num_internet > 0)                                       // If it's outbound Internet mail...
+               && (SMTP->message_originated_locally == 0)                      // ...and also inbound Internet mail...
+               && (SMTP->is_lmtp == 0)                                         /// ...and didn't arrive via LMTP...
+       ) {
+               cprintf("551 <%s> - relaying denied\r\n", ChrPtr(SMTP->OneRcpt));
+               free_recipients(valid);
+               return;
        }
 
        cprintf("250 RCPT ok <%s>\r\n", ChrPtr(SMTP->OneRcpt));