1.1 --- a/examples/example.route	Sun Sep 04 11:25:38 2011 +0200
     1.2 +++ b/examples/example.route	Sun Sep 04 11:33:31 2011 +0200
     1.3 @@ -11,7 +11,7 @@
     1.4  
     1.5  allowed_senders = "okurth"
     1.6  
     1.7 -# local_hosts and local_nets will be checked before this.
     1.8 +# local_hosts will be checked before this.
     1.9  # cpwright.com uses the dialup up list of dul.maps.vix.com,
    1.10  # so I cannot send any mail over this connection to that domain.
    1.11  # There are probably many others... :-( (No, this is okay. Nobody

     2.1 --- a/src/route.c	Sun Sep 04 11:25:38 2011 +0200
     2.2 +++ b/src/route.c	Sun Sep 04 11:33:31 2011 +0200
     2.3 @@ -193,16 +193,12 @@
     2.4  /*
     2.5  Split a recipient list into the three groups:
     2.6  - local recipients
     2.7 -- local net recipients
     2.8 -- other/remote/online recipients
     2.9 -It should be possible to call the function like:
    2.10 -	split_rcpts(rcpts, hostlist, local, others, others);
    2.11 -This would split online between local and localnet+online recipients.
    2.12 -(untested yet; remove this line if you saw it worked -- meillo 2010-10-21)
    2.13 -If host_list is NULL, only splitting between local and other is done.
    2.14 +- those maching the patterns
    2.15 +- those not matching the patterns
    2.16 +If patterns is NULL: only splitting between local and others is done.
    2.17  */
    2.18  void
    2.19 -split_rcpts(GList* rcpt_list, GList* localnets, GList** rl_local, GList** rl_localnet, GList** rl_others)
    2.20 +split_rcpts(GList* rcpt_list, GList* patterns, GList** rl_local, GList** rl_matching, GList** rl_others)
    2.21  {
    2.22  	GList *rcpt_node;
    2.23  	GList *host_node = NULL;
    2.24 @@ -219,16 +215,16 @@
    2.25  			if (rl_local)
    2.26  				*rl_local = g_list_append(*rl_local, rcpt);
    2.27  		} else {
    2.28 -			/* if localnets is NULL, host_node will be NULL,
    2.29 +			/* if patterns is NULL, host_node will be NULL,
    2.30  			   hence all non-locals are put to others */
    2.31 -			foreach(localnets, host_node) {
    2.32 +			foreach(patterns, host_node) {
    2.33  				gchar *host = (gchar *) (host_node->data);
    2.34  				if (fnmatch(host, rcpt->domain, FNM_CASEFOLD) == 0)
    2.35  					break;
    2.36  			}
    2.37  			if (host_node) {
    2.38 -				if (rl_localnet)
    2.39 -					*rl_localnet = g_list_append(*rl_localnet, rcpt);
    2.40 +				if (rl_matching)
    2.41 +					*rl_matching = g_list_append(*rl_matching, rcpt);
    2.42  			} else {
    2.43  				if (rl_others)
    2.44  					*rl_others = g_list_append(*rl_others, rcpt);