From: Shane Kerr <shane@isc.org>
Date: Tue, 3 Jul 2007 09:51:58 +0000 (+0000)
Subject: Minor bug in octal parsing fixed.
X-Git-Tag: v4_0_0a2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=71765b5809101b87a26b025e7b89aca53f9dd14a;p=thirdparty%2Fdhcp.git

Minor bug in octal parsing fixed.
See RT ticket #16514 for more.
---

diff --git a/RELNOTES b/RELNOTES
index 88a00946e..44bc6424f 100644
--- 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 42c6976fe..9756ec25a 100644
--- 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) {