1.1 --- a/src/masqmail.h	Thu Apr 28 16:42:28 2011 +0200
     1.2 +++ b/src/masqmail.h	Thu Apr 28 16:43:38 2011 +0200
     1.3 @@ -90,34 +90,28 @@
     1.4  	GList *denied_recipients;
     1.5  
     1.6  	interface *mail_host;
     1.7 -	gchar *wrapper;
     1.8  	gboolean connect_error_fail;
     1.9 -
    1.10 +	GList *resolve_list;
    1.11  	gchar *helo_name;
    1.12  	gboolean do_correct_helo;
    1.13  	gboolean instant_helo;
    1.14  	gboolean do_pipelining;
    1.15 +	gchar *auth_name;
    1.16 +	gchar *auth_login;
    1.17 +	gchar *auth_secret;
    1.18 +	gchar *wrapper;
    1.19  
    1.20  	gchar *set_h_from_domain;
    1.21  	gchar *set_h_reply_to_domain;
    1.22  	gchar *set_return_path_domain;
    1.23 -
    1.24  	GList *map_h_from_addresses;
    1.25  	GList *map_h_reply_to_addresses;
    1.26  	GList *map_h_mail_followup_to_addresses;
    1.27  	GList *map_return_path_addresses;
    1.28 -
    1.29  	gboolean expand_h_sender_domain;
    1.30  	gboolean expand_h_sender_address;
    1.31  
    1.32 -	GList *resolve_list;
    1.33 -
    1.34 -	gchar *auth_name;
    1.35 -	gchar *auth_login;
    1.36 -	gchar *auth_secret;
    1.37 -
    1.38  	gchar *pipe;
    1.39 -
    1.40  	gboolean pipe_fromline;
    1.41  	gboolean pipe_fromhack;
    1.42  } connect_route;