mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-03 16:15:27 +00:00
Code Issues Releases Wiki Activity

1050. [bug] Log messages reporting malformed IP addresses in

Browse Source 
address lists such as that of the forwarders option
                        failed to include the correct error code, file
                        name, and line number. [RT #1890]
This commit is contained in:
Andreas Gustafsson
2001-10-12 22:00:31 +00:00
parent 3c17010ba5
commit 62a3dbe63e
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES
View File

@@ -1,3 +1,8 @@
1050. [bug] Log messages reporting malformed IP addresses in
address lists such as that of the forwarders option
failed to include the correct error code, file
name, and line number. [RT #1890]
1049. [func] pid-file "none"; will disable writing a pid file. 1049. [func] pid-file "none"; will disable writing a pid file.
[RT #1848] [RT #1848]

9
lib/isccfg/parser.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: parser.c,v 1.78 2001/10/08 07:46:04 marka Exp $ */ /* $Id: parser.c,v 1.79 2001/10/12 22:00:31 gson Exp $ */
#include <config.h> #include <config.h>
@@ -2784,14 +2784,16 @@ token_addr(cfg_parser_t *pctx, unsigned int flags, isc_netaddr_t *na) {
} }
} }
} }
return (ISC_R_NOTFOUND); /* XXX */ return (ISC_R_UNEXPECTEDTOKEN);
} }
static isc_result_t static isc_result_t
get_addr(cfg_parser_t *pctx, unsigned int flags, isc_netaddr_t *na) { get_addr(cfg_parser_t *pctx, unsigned int flags, isc_netaddr_t *na) {
isc_result_t result; isc_result_t result;
CHECK(cfg_gettoken(pctx, 0)); CHECK(cfg_gettoken(pctx, 0));
CHECK(token_addr(pctx, flags, na)); result = token_addr(pctx, flags, na);
if (result == ISC_R_UNEXPECTEDTOKEN)
parser_error(pctx, LOG_NEAR, "expected IP address");
cleanup: cleanup:
return (result); return (result);
} }
@@ -2947,7 +2949,6 @@ parse_netaddr(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) {
*ret = obj; *ret = obj;
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);
cleanup: cleanup:
parser_error(pctx, LOG_NEAR, "expected IP address");
CLEANUP_OBJ(obj); CLEANUP_OBJ(obj);
return (result); return (result);
} }