1170. [bug] Don't attempt to print the token when a I/O error

                        occurs when parsing named.conf.  [RT #2275]

diff --git a/CHANGES b/CHANGES
index 9f92d241d7ed12830651a1cbb39a6d3db7ac6f62..21776243b0e11389c231c6227db91a0261ba802b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1170.  [bug]           Don't attempt to print the token when a I/O error
+                       occurs when parsing named.conf.  [RT #2275]
+
 1169.  [func]          Identify recursive queries in the query log.
 
 1168.  [bug]           Empty also-notify clauses were not handled gracefully.

diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c
index 2209072f7ed35cded70aec40511f799372141964..70e47b9d3c97d3a0e3311d3564d8f428c5c1cac7 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.96 2002/01/04 02:32:12 gson Exp $ */
+/* $Id: parser.c,v 1.97 2002/01/04 05:42:12 marka Exp $ */
 
 #include <config.h>
 
@@ -1970,9 +1970,14 @@ cfg_gettoken(cfg_parser_t *pctx, int options) {
                cfg_parser_error(pctx, CFG_LOG_NEAR, "token too big");
                break;
 
+       case ISC_R_IOERROR:
+               cfg_parser_error(pctx, 0, "%s",
+                                isc_result_totext(result));
+               break;
+
        default:
                cfg_parser_error(pctx, CFG_LOG_NEAR, "%s",
-                            isc_result_totext(result));
+                                isc_result_totext(result));
                break;
        }
        return (result);