X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.c;h=a61a3591b8ba592c74bc63a22a6d3e92ff99a0b3;hp=d567cd2f0cd12c6c8b9c0ba321297ed9b24470bd;hb=0966cca8ab6dcde2747c717f21d73fd332e04242;hpb=228e7a5c8f0e517dcede50f886965a44fca39853

diff --git a/src/conf.c b/src/conf.c
index d567cd2f..a61a3591 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -1,9 +1,9 @@
 /*
     conf.c -- configuration code
     Copyright (C) 1998 Robert van der Meulen
-                  1998-2005 Ivo Timmermans <ivo@tinc-vpn.org>
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
-		  2000 Cris van Pelt <tribbel@arise.dhs.org>
+                  1998-2005 Ivo Timmermans
+                  2000-2008 Guus Sliepen <guus@tinc-vpn.org>
+		  2000 Cris van Pelt
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -301,6 +301,8 @@ static char *readline(FILE * fp, char **buf, size_t *buflen)
 			size = newsize;
 		} else {
 			*newline = '\0';	/* kill newline */
+			if(newline > p && newline[-1] == '\r')	/* and carriage return if necessary */
+				newline[-1] = '\0';
 			break;				/* yay */
 		}
 	}
@@ -343,6 +345,11 @@ int read_config_file(avl_tree_t *config_tree, const char *fname)
 	buffer = xmalloc(bufsize);
 
 	for(;;) {
+		if(feof(fp)) {
+			err = 0;
+			break;
+		}
+
 		line = readline(fp, &buffer, &bufsize);
 
 		if(!line) {
@@ -350,11 +357,6 @@ int read_config_file(avl_tree_t *config_tree, const char *fname)
 			break;
 		}
 
-		if(feof(fp)) {
-			err = 0;
-			break;
-		}
-
 		lineno++;
 
 		if(!*line || *line == '#')