pullup:

130.   [bug]           Log messages reporting an out-of-range serial number
                        did not include the out-of-range number but the
                        following token. [RT #2076]

diff --git a/CHANGES b/CHANGES
index 32d85fecd56eaf3642fcd558ef3ec043e9454ba5..f57076e7ce03e16bb7bf3c3ec3b4b7e11a612e6b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+1130.  [bug]           Log messages reporting an out-of-range serial number
+                       did not include the out-of-range number but the
+                       following token. [RT #2076]
+
 1129.  [bug]           Multithreaded servers could crash under heavy
                        resolution load due to a race condition. [RT #2018]
 

diff --git a/lib/isc/lex.c b/lib/isc/lex.c
index 0aba4ffe8106091d72058e6c7b483988d0028b3b..5604b3cd271ef6b3c7b3b09dc6f64c9571169f23 100644 (file)
--- a/lib/isc/lex.c
+++ b/lib/isc/lex.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lex.c,v 1.66 2001/07/12 03:51:14 marka Exp $ */
+/* $Id: lex.c,v 1.66.2.1 2001/11/16 19:00:37 gson Exp $ */
 
 #include <config.h>
 
@@ -770,6 +770,8 @@ isc_lex_getmastertoken(isc_lex_t *lex, isc_token_t *token,
        else if (expect == isc_tokentype_number)
                options |= ISC_LEXOPT_NUMBER;
        result = isc_lex_gettoken(lex, options, token);
+       if (result == ISC_R_RANGE)
+               isc_lex_ungettoken(lex, token);
        if (result != ISC_R_SUCCESS)
                return (result);