pullup:

 552.   [bug]           We were not correctly detecting the end of all c-style
                        comments.  [RT #455]

diff --git a/CHANGES b/CHANGES
index 648160d59d8e17f627fc242b1f9161b25b3b10d2..945eebf060a7a353c4b403da42882da1ffdf5a90 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 
+ 552.  [bug]           We were not correctly detecting the end of all c-style
+                       comments.  [RT #455]
+
        --- 9.0.1 released ---
 
  547.  [bug]           dnssafe doesn't correctly handle RSA keys longer

diff --git a/lib/isc/lex.c b/lib/isc/lex.c
index b52a15e71acc0aec138d3409db42066f559cfae3..7c8bc68566e3ce2aa285b39180c9e51793dbc976 100644 (file)
--- a/lib/isc/lex.c
+++ b/lib/isc/lex.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: lex.c,v 1.31.2.2 2000/07/11 04:55:09 gson Exp $ */
+/* $Id: lex.c,v 1.31.2.3 2000/11/13 17:42:25 gson Exp $ */
 
 #include <config.h>
 
@@ -620,7 +620,7 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) {
                                no_comments = ISC_FALSE;
                                state = saved_state;
                                goto no_read;
-                       } else
+                       } else if (c != '*')
                                state = lexstate_ccomment;
                        break;
                case lexstate_eatline: