upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-14 22:30:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

865. [bug] The new configuration parser did not allow

Browse source 
the optional debug level in a "severity debug"
                        clause of a logging channel to be omitted.
                        This is now allowed and treated as "severity
                        debug 1;" like it did in BIND 8.2.4, not as
                        "severity debug 0;" like it did in BIND 9.1.
                        [RT #1367]
This commit is contained in:
Andreas Gustafsson 2001-06-08 01:03:00 +00:00
parent af0be81b2f
commit 56877490bc
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CHANGES
View file

@ -1,4 +1,12 @@
865. [bug] The new configuration parser did not allow
the optional debug level in a "severity debug"
clause of a logging channel to be omitted.
This is now allowed and treated as "severity
debug 1;" like it did in BIND 8.2.4, not as
"severity debug 0;" like it did in BIND 9.1.
[RT #1367]
864. [cleanup] Multithreading is now enabled by default on
OSF1, Solaris 2.7 and newer, AIX, IRIX, and HP-UX.

18
lib/isccfg/parser.c
View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: parser.c,v 1.55 2001/06/07 01:58:49 gson Exp $ */
/* $Id: parser.c,v 1.56 2001/06/08 01:03:00 gson Exp $ */
#include <config.h>
@ -3262,8 +3262,20 @@ parse_logseverity(cfg_parser_t *pctx, cfg_type_t *type, cfg_obj_t **ret) {
CHECK(cfg_peektoken(pctx, 0));
if (pctx->token.type == isc_tokentype_string &&
strcasecmp(pctx->token.value.as_pointer, "debug") == 0) {
CHECK(parse(pctx, &cfg_type_debuglevel, ret));
INSIST((*ret)->type != &cfg_type_void);
CHECK(cfg_gettoken(pctx, 0)); /* read "debug" */
CHECK(cfg_peektoken(pctx, ISC_LEXOPT_NUMBER));
if (pctx->token.type == isc_tokentype_number) {
CHECK(parse_uint32(pctx, NULL, ret));
} else {
/*
* The debug level is optional and defaults to 1.
* This makes little sense, but we support it for
* compatibility with BIND 8.
*/
CHECK(create_cfgobj(pctx, &cfg_type_uint32, ret));
(*ret)->value.uint32 = 1;
}
(*ret)->type = &cfg_type_debuglevel; /* XXX kludge */
} else {
CHECK(parse(pctx, &cfg_type_loglevel, ret));
}