From: ian <ian>
Date: Sat, 10 Jul 2004 15:00:34 +0000 (+0000)
Subject: +  * Allow `;'-comments in resolv.conf (report from Colin Charles).
X-Git-Tag: adns-1.5.0-rc0~171
X-Git-Url: https://git.distorted.org.uk/~mdw/adns/commitdiff_plain/2d23048790f0db14cfd5e2c60a40ef88f547d066

+  * Allow `;'-comments in resolv.conf (report from Colin Charles).

@@ -3,8 +3,9 @@
   * Fix error in prototype in definition of adns__parse_domain.
   * New LICENCE.WAIVERS file for GPL-incompatility workarounds.
   * Clarified GPL-vs-LGPL: a bit less hostile and a bit more mercenary.
+  * Allow `;'-comments in resolv.conf (report from Colin Charles).

-  --
+ --

 adns (1.1); urgency=medium
---

diff --git a/changelog b/changelog
index e7b7949..fb82e76 100644
--- a/changelog
+++ b/changelog
@@ -3,8 +3,9 @@ adns (1.2); urgency=medium
   * Fix error in prototype in definition of adns__parse_domain.
   * New LICENCE.WAIVERS file for GPL-incompatility workarounds.
   * Clarified GPL-vs-LGPL: a bit less hostile and a bit more mercenary.
+  * Allow `;'-comments in resolv.conf (report from Colin Charles).    
 
-  --
+ --
 
 adns (1.1); urgency=medium
 
diff --git a/src/setup.c b/src/setup.c
index c3452b0..38be621 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -416,7 +416,7 @@ static void readconfiggeneric(adns_state ads, const char *filename,
     linebuf[l]= 0;
     p= linebuf;
     while (ctype_whitespace(*p)) p++;
-    if (*p == '#' || !*p) continue;
+    if (*p == '#' || *p == ';' || !*p) continue;
     q= p;
     while (*q && !ctype_whitespace(*q)) q++;
     dirl= q-p;