1.1 --- a/src/accept.c	Thu Sep 22 15:07:40 2011 +0200
     1.2 +++ b/src/accept.c	Thu Oct 20 10:20:59 2011 +0200
     1.3 @@ -1,20 +1,21 @@
     1.4 -/*  MasqMail
     1.5 -    Copyright (C) 1999-2001 Oliver Kurth
     1.6 -    Copyright (C) 2010 markus schnalke <meillo@marmaro.de>
     1.7 -
     1.8 -    This program is free software; you can redistribute it and/or modify
     1.9 -    it under the terms of the GNU General Public License as published by
    1.10 -    the Free Software Foundation; either version 2 of the License, or
    1.11 -    (at your option) any later version.
    1.12 -
    1.13 -    This program is distributed in the hope that it will be useful,
    1.14 -    but WITHOUT ANY WARRANTY; without even the implied warranty of
    1.15 -    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    1.16 -    GNU General Public License for more details.
    1.17 -
    1.18 -    You should have received a copy of the GNU General Public License
    1.19 -    along with this program; if not, write to the Free Software
    1.20 -    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
    1.21 +/*
    1.22 +**  MasqMail
    1.23 +**  Copyright (C) 1999-2001 Oliver Kurth
    1.24 +**  Copyright (C) 2010 markus schnalke <meillo@marmaro.de>
    1.25 +**
    1.26 +**  This program is free software; you can redistribute it and/or modify
    1.27 +**  it under the terms of the GNU General Public License as published by
    1.28 +**  the Free Software Foundation; either version 2 of the License, or
    1.29 +**  (at your option) any later version.
    1.30 +**
    1.31 +**  This program is distributed in the hope that it will be useful,
    1.32 +**  but WITHOUT ANY WARRANTY; without even the implied warranty of
    1.33 +**  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    1.34 +**  GNU General Public License for more details.
    1.35 +**
    1.36 +**  You should have received a copy of the GNU General Public License
    1.37 +**  along with this program; if not, write to the Free Software
    1.38 +**  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
    1.39  */
    1.40  
    1.41  #include "masqmail.h"
    1.42 @@ -54,11 +55,12 @@
    1.43  	return ret;
    1.44  }
    1.45  
    1.46 -/* accept message from anywhere.
    1.47 -   A message from local is indicated by msg->recieved_host == NULL
    1.48 -
    1.49 -   The -t option: With the ACC_RCPT_FROM_HEAD flag the addrs found found
    1.50 -   in To/Cc/Bcc headers are added to the recipient list.
    1.51 +/*
    1.52 +**  accept message from anywhere.
    1.53 +**  A message from local is indicated by msg->recieved_host == NULL
    1.54 +**
    1.55 +**  The -t option: With the ACC_RCPT_FROM_HEAD flag the addrs found found
    1.56 +**  in To/Cc/Bcc headers are added to the recipient list.
    1.57  */
    1.58  
    1.59  accept_error
    1.60 @@ -146,9 +148,14 @@
    1.61  				if ((hdr = get_header(line1))) {
    1.62  					msg->hdr_list = g_list_append(msg->hdr_list, hdr);
    1.63  				} else {
    1.64 -					/* if get_header() returns NULL, no header was recognized,
    1.65 -					   so this seems to be the first data line of a broken mailer
    1.66 -					   which does not send an empty line after the headers */
    1.67 +					/*
    1.68 +					**  if get_header() returns NULL,
    1.69 +					**  no header was recognized,
    1.70 +					**  so this seems to be the first
    1.71 +					**  data line of a broken mailer
    1.72 +					**  which does not send an empty
    1.73 +					**  line after the headers
    1.74 +					*/
    1.75  					in_headers = FALSE;
    1.76  					msg->data_list = g_list_prepend(msg->data_list, g_strdup(line1));
    1.77  				}
    1.78 @@ -290,10 +297,12 @@
    1.79  		}
    1.80  
    1.81  		if (!msg->return_path) {
    1.82 -			/* TODO: do we still need this as we don't fetch
    1.83 -			         mail anymore? */
    1.84 -			/* this can happen for pop3 accept only and if no
    1.85 -			   Return-Path: header was given */
    1.86 +			/*
    1.87 +			**  TODO: do we still need this as we don't fetch
    1.88 +			**        mail anymore?
    1.89 +			**  This can happen for pop3 accept only and if no
    1.90 +			**  Return-Path: header was given
    1.91 +			*/
    1.92  			GList *hdr_list;
    1.93  			header *hdr;
    1.94