pullup:

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 61d22bcca68b1cd369c83689819f80efb5bffea2..4e9c8d4e7ac058bbaaf581c9f96ba29db0dd4611 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -41,6 +41,9 @@
 1172.  [doc]           Add CERT, GPOS, KX, NAPTR, NSAP, PX and TXT to 
                        table of RR types in ARM.
 
+1170.  [bug]           Don't attempt to print the token when a I/O error
+                       occurs when parsing named.conf.  [RT #2275]
+
 1168.  [bug]           Empty also-notify clauses were not handled. [RT #2309]
 
 1165.  [bug]           We were rejecting notify-source{-v6} in zone clauses.

diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c
index 076be332d2a59c1d6a0887ffadfb4b88aed92aa5..e3816826d8f93259f46ff7af45acb2c5c78e0d92 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.12 2002/01/23 01:53:28 gson Exp $ */
+/* $Id: parser.c,v 1.70.2.13 2002/01/23 17:54:06 gson Exp $ */
 
 #include <config.h>
 
@@ -3544,6 +3544,11 @@ cfg_gettoken(cfg_parser_t *pctx, int options) {
                parser_error(pctx, LOG_NEAR, "token too big");
                break;
 
+       case ISC_R_IOERROR:
+               parser_error(pctx, 0, "%s",
+                                isc_result_totext(result));
+               break;
+
        default:
                parser_error(pctx, LOG_NEAR, "%s",
                             isc_result_totext(result));