From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Tue, 7 Apr 2015 07:54:30 +0000 (+0000)
Subject: And skip dos-newlines for only addrs on line.
X-Git-Tag: release-1.5.4~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cdeb81f21968531a8c3738bf644093cd7e3149e1;p=thirdparty%2Funbound.git

And skip dos-newlines for only addrs on line.


git-svn-id: file:///svn/unbound/trunk@3385 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/libunbound/libunbound.c b/libunbound/libunbound.c
index 546fb5ddf..37288f256 100644
--- a/libunbound/libunbound.c
+++ b/libunbound/libunbound.c
@@ -1053,6 +1053,8 @@ ub_ctx_hosts(struct ub_ctx* ctx, const char* fname)
 		/* skip addr */
 		while(isxdigit((unsigned char)*parse) || *parse == '.' || *parse == ':')
 			parse++;
+		if(*parse == '\r')
+			parse++;
 		if(*parse == '\n' || *parse == 0)
 			continue;
 		if(*parse == '%')