j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Fix reading configuration files that do not end with a newline. Again.

Browse source
This commit is contained in:
Guus Sliepen 2010-04-17 12:01:38 +02:00
parent 26b8cf8680
commit 4766359e14
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
NEWS
View file

@ -1,3 +1,7 @@
Version 1.0.14 not released yet
* Fixed reading configuration files that do not end with a newline. Again.
Version 1.0.13 Apr 11 2010
* Allow building tinc without LZO and/or Zlib.

2
configure.in
View file

@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
AC_INIT
AC_CONFIG_SRCDIR([src/tincd.c])
AM_INIT_AUTOMAKE(tinc, 1.0.13)
AM_INIT_AUTOMAKE(tinc, 1.0.13+git)
AC_CONFIG_HEADERS([config.h])
AM_MAINTAINER_MODE

2
src/conf.c
View file

@ -224,7 +224,7 @@ static char *readline(FILE * fp, char *buf, size_t buflen) {
newline = strchr(p, '\n');
if(!newline)
return NULL;
return buf;
*newline = '\0'; /* kill newline */
if(newline > p && newline[-1] == '\r') /* and carriage return if necessary */