- Libunbound skips dos-line-endings from etc/hosts.

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

diff --git a/doc/Changelog b/doc/Changelog
index 3989bfcfcee67bce20d12a1cd2e38d0c614f64e4..cfde10135d337aaae554e174aae150d5c47d95e0 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+7 April 2015: Wouter
+       - Libunbound skips dos-line-endings from etc/hosts.
+
 2 April 2015: Wouter
        - Fix #660: Fix interface-automatic broken in the presence of
          asymmetric routing.

diff --git a/libunbound/libunbound.c b/libunbound/libunbound.c
index eff27de1abb2111e15d892a5dc2d08aba4121093..546fb5ddfd827ba84f86a0601ddf74446385109b 100644 (file)
--- a/libunbound/libunbound.c
+++ b/libunbound/libunbound.c
@@ -1066,7 +1066,8 @@ ub_ctx_hosts(struct ub_ctx* ctx, const char* fname)
                *parse++ = 0; /* end delimiter for addr ... */
                /* go to names and add them */
                while(*parse) {
-                       while(*parse == ' ' || *parse == '\t' || *parse=='\n')
+                       while(*parse == ' ' || *parse == '\t' || *parse=='\n'
+                               || *parse=='\r')
                                parse++;
                        if(*parse == 0 || *parse == '#')
                                break;