masqmail

diff src/route.c @ 355:ddb7b3fd3d08

found further appearences of ``localnet'' in the code
author markus schnalke <meillo@marmaro.de>
date Sun, 04 Sep 2011 11:33:31 +0200
parents 257ffce6c1cd
children 41958685480d
line diff
     1.1 --- a/src/route.c	Sun Sep 04 11:25:38 2011 +0200
     1.2 +++ b/src/route.c	Sun Sep 04 11:33:31 2011 +0200
     1.3 @@ -193,16 +193,12 @@
     1.4  /*
     1.5  Split a recipient list into the three groups:
     1.6  - local recipients
     1.7 -- local net recipients
     1.8 -- other/remote/online recipients
     1.9 -It should be possible to call the function like:
    1.10 -	split_rcpts(rcpts, hostlist, local, others, others);
    1.11 -This would split online between local and localnet+online recipients.
    1.12 -(untested yet; remove this line if you saw it worked -- meillo 2010-10-21)
    1.13 -If host_list is NULL, only splitting between local and other is done.
    1.14 +- those maching the patterns
    1.15 +- those not matching the patterns
    1.16 +If patterns is NULL: only splitting between local and others is done.
    1.17  */
    1.18  void
    1.19 -split_rcpts(GList* rcpt_list, GList* localnets, GList** rl_local, GList** rl_localnet, GList** rl_others)
    1.20 +split_rcpts(GList* rcpt_list, GList* patterns, GList** rl_local, GList** rl_matching, GList** rl_others)
    1.21  {
    1.22  	GList *rcpt_node;
    1.23  	GList *host_node = NULL;
    1.24 @@ -219,16 +215,16 @@
    1.25  			if (rl_local)
    1.26  				*rl_local = g_list_append(*rl_local, rcpt);
    1.27  		} else {
    1.28 -			/* if localnets is NULL, host_node will be NULL,
    1.29 +			/* if patterns is NULL, host_node will be NULL,
    1.30  			   hence all non-locals are put to others */
    1.31 -			foreach(localnets, host_node) {
    1.32 +			foreach(patterns, host_node) {
    1.33  				gchar *host = (gchar *) (host_node->data);
    1.34  				if (fnmatch(host, rcpt->domain, FNM_CASEFOLD) == 0)
    1.35  					break;
    1.36  			}
    1.37  			if (host_node) {
    1.38 -				if (rl_localnet)
    1.39 -					*rl_localnet = g_list_append(*rl_localnet, rcpt);
    1.40 +				if (rl_matching)
    1.41 +					*rl_matching = g_list_append(*rl_matching, rcpt);
    1.42  			} else {
    1.43  				if (rl_others)
    1.44  					*rl_others = g_list_append(*rl_others, rcpt);