1.1 --- a/src/conf.c	Wed Oct 29 16:34:13 2008 +0100
     1.2 +++ b/src/conf.c	Wed Oct 29 21:10:18 2008 +0100
     1.3 @@ -16,11 +16,11 @@
     1.4      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
     1.5  */
     1.6  
     1.7 +#include <pwd.h>
     1.8 +#include <grp.h>
     1.9 +
    1.10  #include "masqmail.h"
    1.11  
    1.12 -#include "pwd.h"
    1.13 -#include "grp.h"
    1.14 -
    1.15  masqmail_conf conf;
    1.16  
    1.17  void
    1.18 @@ -107,9 +107,7 @@
    1.19  	return list;
    1.20  }
    1.21  
    1.22 -/* given a semicolon separated string, this function
    1.23 -   makes a GList out of it.
    1.24 -*/
    1.25 +/* given a semicolon separated string, this function makes a GList out of it. */
    1.26  GList*
    1.27  parse_list(gchar * line, gboolean read_file)
    1.28  {
    1.29 @@ -354,8 +352,7 @@
    1.30  
    1.31  	c = fgetc(in);
    1.32  	if (c != '\"') {
    1.33 -		while ((isalnum(c) || c == '_' || c == '-' || c == '.' || c == '/'
    1.34 -		       || c == '@' || c == ';')
    1.35 +		while ((isalnum(c) || c == '_' || c == '-' || c == '.' || c == '/' || c == '@' || c == ';')
    1.36  		       && (ptr < buf + size - 1)
    1.37  		       && (c != EOF)) {
    1.38  			*ptr = c;
    1.39 @@ -368,7 +365,7 @@
    1.40  		gboolean escape = FALSE;
    1.41  		c = fgetc(in);
    1.42  		while (((c != '\"') || escape) && (ptr < buf + size - 1)) {
    1.43 -			if (c != '\n') {	/* ignore line breaks */
    1.44 +			if (c != '\n') {  /* ignore line breaks */
    1.45  				if ((c == '\\') && (!escape)) {
    1.46  					escape = TRUE;
    1.47  				} else {
    1.48 @@ -410,8 +407,7 @@
    1.49  				return TRUE;
    1.50  			}
    1.51  		} else {
    1.52 -			fprintf(stderr, "'=' expected after %s, char was '%c'\n", lval,
    1.53 -					c);
    1.54 +			fprintf(stderr, "'=' expected after %s, char was '%c'\n", lval, c);
    1.55  		}
    1.56  	}
    1.57  	return FALSE;