+ * 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 e7b7949285858785c17ac9808c4cfad79ab9a850..fb82e7610643334514d87da50e4248c1a977d1dc 100644 (file)
--- 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 c3452b0dd36d3253525707405569a3da718a380d..38be6217670df8f073e68d341ab5fa3b04b6a133 100644 (file)
--- 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;