pullup:

1104.   [bug]           Invalid arguments to the transfer-format option
                        could cause an assertion failure. [RT #1995]
(+ don't say "'foo' unexpected near 'foo'" - once is enough)

diff --git a/CHANGES b/CHANGES
index 622f628070c55289ae565b12e4f3834449df1981..0622beeccee2d4e622bee71deb5bdbf7d876b13b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1104.  [bug]           Invalid arguments to the transfer-format option
+                       could cause an assertion failure. [RT #1995]
+
 1103.  [port]          OpenUNIX 8 support (ifconfig.sh).  [RT #1970]
 
        --- 9.2.0rc9 released ---

diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c
index a4c01a8604db9a5c5a9f9a1d5bd5afad2cba2049..2e51861257646c76923666f5f023d2522dfe52a7 100644 (file)
--- a/lib/isccfg/parser.c
+++ b/lib/isccfg/parser.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: parser.c,v 1.70.2.6 2001/10/30 20:30:33 gson Exp $ */
+/* $Id: parser.c,v 1.70.2.7 2001/11/05 20:21:54 bwelling Exp $ */
 
 #include <config.h>
 
@@ -885,7 +885,7 @@ view_clauses[] = {
        { "lame-ttl", &cfg_type_uint32, 0 },
        { "max-ncache-ttl", &cfg_type_uint32, 0 },
        { "max-cache-ttl", &cfg_type_uint32, 0 },
-       { "transfer-format", &cfg_type_ustring, 0 },
+       { "transfer-format", &cfg_type_transferformat, 0 },
        { "max-cache-size", &cfg_type_sizenodefault, 0 },
        { "check-names", &cfg_type_checknames,
          CFG_CLAUSEFLAG_MULTI | CFG_CLAUSEFLAG_NOTIMP },
@@ -1844,7 +1844,7 @@ check_enum(cfg_parser_t *pctx, cfg_obj_t *obj, const char *const *enums) {
        const char *s = obj->value.string.base;
        if (is_enum(s, enums))
                return (ISC_R_SUCCESS);
-       parser_error(pctx, LOG_NEAR, "'%s' unexpected", s);
+       parser_error(pctx, 0, "'%s' unexpected", s);
        return (ISC_R_UNEXPECTEDTOKEN);
 }