1.1 --- a/src/deliver.c	Mon Apr 25 15:14:04 2011 +0200
     1.2 +++ b/src/deliver.c	Mon Apr 25 15:15:34 2011 +0200
     1.3 @@ -235,7 +235,8 @@
     1.4  	return ok;
     1.5  }
     1.6  
     1.7 -/* make a list of rcpt's of a message that are local return a new copy of the list */
     1.8 +/* make a list of rcpt's of a message that are local
     1.9 +   return a new copy of the list */
    1.10  void
    1.11  msg_rcptlist_local(GList * rcpt_list, GList ** p_local_list, GList ** p_nonlocal_list)
    1.12  {
    1.13 @@ -559,12 +560,14 @@
    1.14  			continue;
    1.15  		}
    1.16  
    1.17 +		/* filter by allowed return paths (= envelope sender) */
    1.18  		if (!route_is_allowed_mail_local(route, msgout->msg->return_path)
    1.19 -		   || !route_is_allowed_return_path(route, msgout->msg-> return_path)) {
    1.20 +		   || !route_is_allowed_return_path(route, msgout->msg->return_path)) {
    1.21  			destroy_msg_out(msgout_cloned);
    1.22  			continue;
    1.23  		}
    1.24  
    1.25 +		/* filter by allowed rcpt addrs (= envelope rcpts) */
    1.26  		GList *rcpt_list_allowed = NULL, *rcpt_list_notallowed = NULL;
    1.27  		msg_rcptlist_route(route, msgout_cloned->rcpt_list, &rcpt_list_allowed, &rcpt_list_notallowed);
    1.28