masqmail

diff src/masqmail.h @ 317:55b7bde95d37

find changesets by author, revision, files, or words in the commit message
reworked allowed and denied addrs for routes The following refactorings had been made: - allowed_mail_locals + allowed_return_paths -> allowed_senders - not_allowed_mail_locals + not_allowed_return_paths -> denied_senders - allowed_rcpt_domains -> allowed_recipients - not_allowed_rcpt_domains -> denied_recipients The new options allow more consistent and more flexible matching.
author meillo@marmaro.de
date Thu, 28 Apr 2011 09:55:06 +0200
parents e230bcd0f1c6
children 4c705c34182f
line diff
     1.1 --- a/src/masqmail.h	Mon Apr 25 15:17:30 2011 +0200
     1.2 +++ b/src/masqmail.h	Thu Apr 28 09:55:06 2011 +0200
     1.3 @@ -84,12 +84,10 @@
     1.4  	gboolean is_local_net;
     1.5  	gboolean last_route;
     1.6  
     1.7 -	GList *allowed_return_paths;
     1.8 -	GList *not_allowed_return_paths;
     1.9 -	GList *allowed_mail_locals;
    1.10 -	GList *not_allowed_mail_locals;
    1.11 -	GList *allowed_rcpt_domains;
    1.12 -	GList *not_allowed_rcpt_domains;
    1.13 +	GList *allowed_senders;
    1.14 +	GList *denied_senders;
    1.15 +	GList *allowed_recipients;
    1.16 +	GList *denied_recipients;
    1.17  
    1.18  	interface *mail_host;
    1.19  	gchar *wrapper;
    1.20 @@ -390,7 +388,6 @@
    1.21  gboolean addr_is_delivered_children(address * addr);
    1.22  gboolean addr_is_finished_children(address * addr);
    1.23  gchar *addr_string(address * addr);
    1.24 -gint addr_match(address * addr1, address * addr2);
    1.25  
    1.26  /* accept.c */
    1.27  accept_error accept_message(FILE * in, message * msg, guint flags);
    1.28 @@ -493,9 +490,8 @@
    1.29  gboolean route_strip_msgout(connect_route * route, msg_out * msgout);
    1.30  msg_out *route_prepare_msgout(connect_route * route, msg_out * msgout);
    1.31  GList *route_msgout_list(connect_route * route, GList * msgout_list);
    1.32 -gboolean route_is_allowed_return_path(connect_route * route, address * ret_path);
    1.33 -gboolean route_is_allowed_mail_local(connect_route * route, address * ret_path);
    1.34 -void msg_rcptlist_route(connect_route * route, GList * rcpt_list, GList ** p_rcpt_list, GList ** p_non_rcpt_list);
    1.35 +gboolean route_sender_is_allowed(connect_route * route, address * ret_path);
    1.36 +void route_split_rcpts(connect_route * route, GList * rcpt_list, GList ** p_rcpt_list, GList ** p_non_rcpt_list);
    1.37  
    1.38  /* tables.c */
    1.39  table_pair *create_pair(gchar * key, gpointer value);