[Dnsmasq-discuss] 2 small changes for 2.46

[Jon Nelson]

Please find enclosed two small changes for 2.46.
The first change does not treat blank lines in /etc/ethers as errors.
The second corrects some small spelling errors I happened to notice.


commit 4bc1780fe38888ad8ef54b28bbb78c44a040855c
Author: Jon Nelson <jnelson at boa.org>
Date:   Mon Dec 29 13:13:47 2008 -0600

   don't grump about blank lines in /etc/ethers

diff --git a/src/dhcp.c b/src/dhcp.c
index c802774..914ae05 100644
--- a/src/dhcp.c
+++ b/src/dhcp.c
@@ -750,7 +750,10 @@ void dhcp_read_ethers(void)
      for (ip = buff; *ip && !isspace((int)*ip); ip++);
      for(; *ip && isspace((int)*ip); ip++)
       *ip = 0;
-      if (!*ip || parse_hex(buff, hwaddr, ETHER_ADDR_LEN, NULL, NULL)
!= ETHER_ADDR_LEN)
+      /* no reason to grump about blank lines */
+      if (!*ip)
+        continue;
+      if (parse_hex(buff, hwaddr, ETHER_ADDR_LEN, NULL, NULL) !=
ETHER_ADDR_LEN)
       {
         my_syslog(LOG_ERR, _("bad line at %s line %d"), ETHERSFILE, lineno);
         continue;

commit b5e924aa65f8dcf01c593197ee21841c7ccf6c60
Author: Jon Nelson <jnelson at boa.org>
Date:   Mon Dec 29 13:13:39 2008 -0600

   fix some small spelling errors

diff --git a/CHANGELOG b/CHANGELOG
index 55e71c9..b36f38b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2638,11 +2638,11 @@ version 2.46
           Tighten up data-checking code for DNS packet
           handling. Thanks to Steve Dodd who found certain illegal
           packets which could crash dnsmasq. No memory overwrite was
-           possible, so this is not a security issue beond the DoS
+           possible, so this is not a security issue beyond the DoS
           potential.

           Update example config dhcp option 47, the previous
-           suggestion generated and illegal, zero-length,
+           suggestion generated an illegal, zero-length,
           option. Thanks to Matthias Andree for finding this.

           Rewrite hosts-file reading code to remove the limit of

-- 
Jon