Mercurial > masqmail

comparison src/deliver.c @ 315:c98aa884d2cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added comments
author meillo@marmaro.de
date Mon, 25 Apr 2011 15:15:34 +0200
parents e230bcd0f1c6
children 55b7bde95d37
comparison
equal deleted inserted replaced
314:e74ee75453db 315:c98aa884d2cb
233 } 233 }
234 234
235 return ok; 235 return ok;
236 } 236 }
237 237
238 /* make a list of rcpt's of a message that are local return a new copy of the list */ 238 /* make a list of rcpt's of a message that are local
239 return a new copy of the list */
239 void 240 void
240 msg_rcptlist_local(GList * rcpt_list, GList ** p_local_list, GList ** p_nonlocal_list) 241 msg_rcptlist_local(GList * rcpt_list, GList ** p_local_list, GList ** p_nonlocal_list)
241 { 242 {
242 GList *rcpt_node; 243 GList *rcpt_node;
243 244
557 if (!msgout_cloned->rcpt_list) { 558 if (!msgout_cloned->rcpt_list) {
558 destroy_msg_out(msgout_cloned); 559 destroy_msg_out(msgout_cloned);
559 continue; 560 continue;
560 } 561 }
561 562
563 /* filter by allowed return paths (= envelope sender) */
562 if (!route_is_allowed_mail_local(route, msgout->msg->return_path) 564 if (!route_is_allowed_mail_local(route, msgout->msg->return_path)
563 || !route_is_allowed_return_path(route, msgout->msg-> return_path)) { 565 || !route_is_allowed_return_path(route, msgout->msg->return_path)) {
564 destroy_msg_out(msgout_cloned); 566 destroy_msg_out(msgout_cloned);
565 continue; 567 continue;
566 } 568 }
567 569
570 /* filter by allowed rcpt addrs (= envelope rcpts) */
568 GList *rcpt_list_allowed = NULL, *rcpt_list_notallowed = NULL; 571 GList *rcpt_list_allowed = NULL, *rcpt_list_notallowed = NULL;
569 msg_rcptlist_route(route, msgout_cloned->rcpt_list, &rcpt_list_allowed, &rcpt_list_notallowed); 572 msg_rcptlist_route(route, msgout_cloned->rcpt_list, &rcpt_list_allowed, &rcpt_list_notallowed);
570 573
571 if (!rcpt_list_allowed) { 574 if (!rcpt_list_allowed) {
572 destroy_msg_out(msgout_cloned); 575 destroy_msg_out(msgout_cloned);