1.1 --- a/src/route.c	Wed Oct 29 21:21:26 2008 +0100
     1.2 +++ b/src/route.c	Thu Nov 06 09:18:38 2008 +0100
     1.3 @@ -16,8 +16,9 @@
     1.4      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
     1.5  */
     1.6  
     1.7 +#include <fnmatch.h>
     1.8 +
     1.9  #include "masqmail.h"
    1.10 -#include <fnmatch.h>
    1.11  
    1.12  msgout_perhost*
    1.13  create_msgout_perhost(gchar * host)
    1.14 @@ -85,7 +86,8 @@
    1.15  						DEBUG(6) debugf("header = %s\n", new_hdr->header);
    1.16  						msgout->xtra_hdr_list = g_list_append(msgout->xtra_hdr_list, new_hdr);
    1.17  					} else {
    1.18 -						logwrite(LOG_ALERT, "error in set_address_header_domain(%s, %s)\n", new_hdr->value, route->set_h_from_domain);
    1.19 +						logwrite(LOG_ALERT, "error in set_address_header_domain(%s, %s)\n",
    1.20 +						         new_hdr->value, route->set_h_from_domain);
    1.21  					}
    1.22  				}
    1.23  			}
    1.24 @@ -170,7 +172,8 @@
    1.25  			if (hdr->id == HEAD_SENDER) {
    1.26  				header *new_hdr;
    1.27  
    1.28 -				new_hdr = create_header(HEAD_SENDER, "Sender: %s@%s\n", msgout->return_path->local_part, msgout->return_path->domain);
    1.29 +				new_hdr = create_header(HEAD_SENDER, "Sender: %s@%s\n",
    1.30 +				                        msgout->return_path->local_part, msgout->return_path->domain);
    1.31  				hdr_node->data = new_hdr;
    1.32  				/* we need this list only to carefully free the extra headers: */
    1.33  				msgout->xtra_hdr_list = g_list_append(msgout->xtra_hdr_list, new_hdr);
    1.34 @@ -322,8 +325,7 @@
    1.35  			}
    1.36  		}
    1.37  
    1.38 -		/* rewrite return path
    1.39 -		   if there is a table, use that
    1.40 +		/* rewrite return path if there is a table, use that
    1.41  		   if an address is found and if it has a domain, use that
    1.42  		 */
    1.43  		if (route->map_return_path_addresses) {
    1.44 @@ -382,9 +384,8 @@
    1.45  				/* there is already a rcpt for this host */
    1.46  				msg_out *msgout_last = (msg_out *) ((g_list_last(mo_ph->msgout_list))->data);
    1.47  				if (msgout_last->msg == msgout->msg) {
    1.48 -					/* if it is also the same message, it must be the last one
    1.49 -					   appended to mo_ph->msgout_list (since outer loop goes through
    1.50 -					   msgout_list) */
    1.51 +					/* if it is also the same message, it must be the last one appended
    1.52 +					   to mo_ph->msgout_list (since outer loop goes through msgout_list) */
    1.53  					msgout_last->rcpt_list = g_list_append(msgout_last->rcpt_list, rcpt);
    1.54  				} else {
    1.55  					/* if not, we append a new msgout */