X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconf.c;h=779425971439e08492c8f55f2e997dd7ce463ffc;hb=08aabbf9317806bc50a9a6693ca866c8936ce26b;hp=1b0ac641fceda969305e347da768cd27eff6a6b8;hpb=636200d1a2024982fe5b3062153daa72a8253015;p=tinc

diff --git a/src/conf.c b/src/conf.c
index 1b0ac641..77942597 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -2,7 +2,7 @@
     conf.c -- configuration code
     Copyright (C) 1998 Robert van der Meulen
                   1998-2005 Ivo Timmermans
-                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
 		  2000 Cris van Pelt
 
     This program is free software; you can redistribute it and/or modify
@@ -287,6 +287,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 */
 		}
 	}