Commit 81d9d7a1 authored by Mark Andrews's avatar Mark Andrews
Browse files

2277. [bug] Empty zone names were not correctly being caught at

                        in the post parse checks. [RT #17357]
parent 9fe2553f
2277. [bug] Empty zone names were not correctly being caught at
in the post parse checks. [RT #17357]
2276. [bug] Install <dst/gssapi.h>. [RT# 17359] 2276. [bug] Install <dst/gssapi.h>. [RT# 17359]
2275. [func] Add support to dig to perform IXFR queries over UDP. 2275. [func] Add support to dig to perform IXFR queries over UDP.
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: check.c,v 1.85 2007/12/02 21:58:23 marka Exp $ */ /* $Id: check.c,v 1.86 2007/12/14 01:27:12 marka Exp $ */
/*! \file */ /*! \file */
...@@ -1097,18 +1097,18 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, ...@@ -1097,18 +1097,18 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
isc_buffer_add(&b, strlen(zname)); isc_buffer_add(&b, strlen(zname));
tresult = dns_name_fromtext(dns_fixedname_name(&fixedname), &b, tresult = dns_name_fromtext(dns_fixedname_name(&fixedname), &b,
dns_rootname, ISC_TRUE, NULL); dns_rootname, ISC_TRUE, NULL);
if (result != ISC_R_SUCCESS) { if (tresult != ISC_R_SUCCESS) {
cfg_obj_log(zconfig, logctx, ISC_LOG_ERROR, cfg_obj_log(zconfig, logctx, ISC_LOG_ERROR,
"zone '%s': is not a valid name", zname); "zone '%s': is not a valid name", zname);
tresult = ISC_R_FAILURE; result = ISC_R_FAILURE;
} else { } else {
char namebuf[DNS_NAME_FORMATSIZE]; char namebuf[DNS_NAME_FORMATSIZE];
dns_name_format(dns_fixedname_name(&fixedname), dns_name_format(dns_fixedname_name(&fixedname),
namebuf, sizeof(namebuf)); namebuf, sizeof(namebuf));
tresult = nameexist(zconfig, namebuf, ztype == HINTZONE ? 1 : 2, tresult = nameexist(zconfig, namebuf, ztype == HINTZONE ? 1 : 2,
symtab, "zone '%s': already exists " symtab, "zone '%s': already exists "
"previous definition: %s:%u", logctx, mctx); "previous definition: %s:%u", logctx, mctx);
if (tresult != ISC_R_SUCCESS) if (tresult != ISC_R_SUCCESS)
result = tresult; result = tresult;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment