summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShane Kerr <shane@isc.org>2007-08-15 13:04:15 +0000
committerShane Kerr <shane@isc.org>2007-08-15 13:04:15 +0000
commita94a063a2ff1d7e3f893890a95cbcb2ef7e857d0 (patch)
treed84a84ec58d5e158779afa6fcda93f549cbeeb7c
parentc954ba15a0a21d53bad70f8efb6898911699ab7d (diff)
downloadisc-dhcp-a94a063a2ff1d7e3f893890a95cbcb2ef7e857d0.tar.gz
Fix minor bug in octal parsing.
See RT ticket #16514 for more.
-rw-r--r--RELNOTES3
-rw-r--r--common/conflex.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/RELNOTES b/RELNOTES
index b40b4112..7d008525 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -41,6 +41,9 @@ the README file.
- Fixed file descriptor leak on listen failure. Thanks to Tom Clark.
+- Bug in octal parsing fixed. Thanks to Bernd Fuhrmann for the report
+ and fix.
+
Changes since 3.1.0rc1
- The parse warning that 'deny dyanmic bootp;' must be configured for
diff --git a/common/conflex.c b/common/conflex.c
index cb61592d..e7ee94e1 100644
--- a/common/conflex.c
+++ b/common/conflex.c
@@ -34,7 +34,7 @@
#ifndef lint
static char copyright[] =
-"$Id: conflex.c,v 1.105.8.1 2007/05/29 17:49:44 each Exp $ Copyright (c) 2004-2006 Internet Systems Consortium. All rights reserved.\n";
+"$Id: conflex.c,v 1.105.8.2 2007/08/15 13:04:15 shane Exp $ Copyright (c) 2004-2006 Internet Systems Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
@@ -371,7 +371,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) {