Minor bug in octal parsing fixed.

See RT ticket #16514 for more.

diff --git a/RELNOTES b/RELNOTES
index 88a00946eabc09e665448304a911eb0b40660795..44bc6424ff0d21002839b1a9c34bb6ec4a99c9c3 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -54,6 +54,9 @@ suggested fixes to <dhcp-users@isc.org>.
 
                        Changes since 4.0.0a1
 
+- Bug in octal parsing fixed. Thanks to Bernd Fuhrmann for the report
+  and fix.
+
 - Autoconf now supplies proper flags for Solaris DHCPv6 builds.
 
 - Fix for parsing error on some IPv6 addresses.

diff --git a/common/conflex.c b/common/conflex.c
index 42c6976fe4562e60a837ba5ebe36fa3ed08533c9..9756ec25aae197a266efa6cd43dcf8d9d7adfe13 100644 (file)
--- a/common/conflex.c
+++ b/common/conflex.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: conflex.c,v 1.111 2007/06/20 10:38:55 shane Exp $ Copyright (c) 2004-2007 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: conflex.c,v 1.112 2007/07/03 09:51:58 shane Exp $ Copyright (c) 2004-2007 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -540,7 +540,7 @@ static enum dhcp_token read_string (cfile)
                                } else
                                        goto again;
                        } else {
-                               if (c >= '0' && c <= '9') {
+                               if (c >= '0' && c <= '7') {
                                        value = value * 8 + (c - '0');
                                } else {
                                    if (value != 0) {