From e60174a0000530f6e9756bebf6daceff54c06a58 Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Fri, 16 May 2008 11:35:00 +0000 Subject: [PATCH] hosts file fixup for MacOSX git-svn-id: file:///svn/unbound/trunk@1083 be551aaa-1e26-0410-a405-d3ace91eadb9 --- doc/Changelog | 3 +++ libunbound/libunbound.c | 2 ++ testdata/hostsfileosx.tpkg | Bin 0 -> 1882 bytes 3 files changed, 5 insertions(+) create mode 100644 testdata/hostsfileosx.tpkg diff --git a/doc/Changelog b/doc/Changelog index 344c34b8c..5dc762076 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,6 @@ +16 May 2008: Wouter + - fixup for MacOSX hosts file reading (reported by John Dickinson). + 14 May 2008: Wouter - accepted patch from Ondrej Sury for library version libtool option. - configure --disable-rpath fixes up libtool for rpath trouble. diff --git a/libunbound/libunbound.c b/libunbound/libunbound.c index 3c5134c7f..8ba1e91aa 100644 --- a/libunbound/libunbound.c +++ b/libunbound/libunbound.c @@ -889,6 +889,8 @@ ub_ctx_hosts(struct ub_ctx* ctx, char* fname) parse++; if(*parse == '\n' || *parse == 0) continue; + if(*parse == '%') + continue; /* ignore macOSX fe80::1%lo0 localhost */ if(*parse != ' ' && *parse != '\t') { /* must have whitespace after address */ fclose(in); diff --git a/testdata/hostsfileosx.tpkg b/testdata/hostsfileosx.tpkg new file mode 100644 index 0000000000000000000000000000000000000000..e12de40bba9a78b1f2ac5aa0c4f437eb9c4c0b4c GIT binary patch literal 1882 zcmV-g2c`HQiwFRga4kpx1ML}qbK1r-|8k#VBh%P^DY7KMZgHTcHmTjl*u|u2=gk}E zkPc8SbjnEzX4-!D?wte@!ZFi2amO#L$LMsozwY*SZ}&9jVH6HskMZzEcU-aeZ zaBxshp8K_>X9`bD(=e;nfnk}5XVwg>`UL8qK$jJW!-xuiCsQ6rOnew`-S{Jganb%u z9Ra@FUxqaBe!=c}``4}7!v03BiuOOK;V>BY7rh=nbNg?>R;2S|+Yy96tr(gI#{z(7duNoWwe+bxu z6Y1{9G@=6;@DIbd@?qOPwzlsb-JVaP(Dz5~>Asca9q0FT?$OF{`^ z(nxytmV&xP|8c;Vl?El!{s?Hj+;2f>@f!|!qZz0+%YjvrPeiXRep zm`v)aoP+juI(F@`swX?Wx7wjxOP`byGIYcV+e>!c-oW+u@_dFaNvNO_z(TFnsO5*y z!WtLzypbwV;TcJb*Jk-?etNPaZQMFJn?|=xcuL*GSRoVd(by4(5r;VVQW*s&Ug_$sBMJtHw|8gM9|@S+Ljj4J7T{v2(LO^1_GX}bMU0 zJW3Yssp2dbyKE|ad7)r_K*)$eIa`%XNa!(~m6;Mr-N~Oz)>`aPX$u>-8A?{$SJ`L# zm5ZL~%O*}a;3C?Vs-i7*vTP`rZ!K+wL?e&+Q2dPG?(;v1A@`NBF8@C`DBS;IE@3M$E0gx}dGGZ5(=MU)qTSt^zULO zW~9@_SaeubZU&~8KbywmHQ_elHrhu2sE z*gTkBxemGP9Q9AnyYSO%tP8L~zAc@0OWn)GK)ZYSrqi2umliiWsRo_yG5K`LOs7*R zw_Vg`-e1aHygZab)`v8*iYi%om8AXG`~Us-*t-0`UaJ+p{~gr!s~i7+2)HHxPjaOH zqYB`n*J)}}w64iKNa15Dr9S?E8_Mh_Nz7W9jg8>j?5cPvyGDP~bMX-VKu(wz#*thP zjr?O$SrsISXfAYU^U--;muQ&NStHB~8By6{nusl9$*fYMrCFpb8pLEF6c@slH!}=q zIP-0Jql0nj$4*mz?UE`b#mPv0{3?9uN^}B+t`P7za2IR1V>?jBHOI8OEKxE6yBfJ; zFkc?91(+`6gKMpZRvT)tah8H`GYZ8{sj2 U58l8AHt_ktUz^Ci8UQE&0JAZ`E&u=k literal 0 HcmV?d00001