$INCLUDE didn't work with a quoted filename; now it does. None of the

calls to isc_lex_gettoken were properly handling isc_tokentype_special
tokens; it's now an error to see one.

diff --git a/lib/dns/master.c b/lib/dns/master.c
index 9fbacfd6588ff7b5e996e437213e7da762190009..b6c0b21baf11ea9ca61f83f29d6a6ca399c776c2 100644 (file)
--- a/lib/dns/master.c
+++ b/lib/dns/master.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: master.c,v 1.59 2000/07/27 09:46:12 tale Exp $ */
+/* $Id: master.c,v 1.60 2000/07/30 20:28:07 bwelling Exp $ */
 
 #include <config.h>
 
@@ -120,6 +120,8 @@ on_list(dns_rdatalist_t *this, dns_rdata_t *rdata);
                default: \
                        goto error_cleanup; \
                } \
+               if ((token)->type == isc_tokentype_special) \
+                       goto error_cleanup; \
        } while (0)
 
 #define WARNUNEXPECTEDEOF(lexer) \
@@ -335,7 +337,8 @@ load(isc_lex_t *lex, dns_name_t *top, dns_name_t *origin,
                                           isc_lex_getsourceline(lex));
                                        goto cleanup;
                                }
-                               GETTOKEN(lex, 0, &token, ISC_FALSE);
+                               GETTOKEN(lex, ISC_LEXOPT_QSTRING, &token,
+                                        ISC_FALSE);
                                if (include_file != NULL)
                                        isc_mem_free(mctx, include_file);
                                include_file = isc_mem_strdup(mctx,