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

diff --git a/src/conf.c b/src/conf.c
index 052b20f9..a61a3591 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -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 */
 		}
 	}