summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordougb <dougb@FreeBSD.org>2008-07-12 06:55:03 +0000
committerdougb <dougb@FreeBSD.org>2008-07-12 06:55:03 +0000
commit5d352cdcfac083b99df8cdcdc2f02eaef531c13e (patch)
treef425bcc5f40d96c19b07ca3318bb2f008e038c90
parent04de7fe966366e5f82ce37b08c3602954945c8a7 (diff)
downloadFreeBSD-src-5d352cdcfac083b99df8cdcdc2f02eaef531c13e.zip
FreeBSD-src-5d352cdcfac083b99df8cdcdc2f02eaef531c13e.tar.gz
Add a patch from ISC to fix named-checkconf. The error condition was not
being properly tested for, so it would not report the error in some cases. This fix (or similar) will be in version 9.4.3.
-rw-r--r--lib/bind9/check.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index 6cfdc93..01d67b7 100644
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -1015,10 +1015,10 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
isc_buffer_add(&b, strlen(zname));
tresult = dns_name_fromtext(dns_fixedname_name(&fixedname), &b,
dns_rootname, ISC_TRUE, NULL);
- if (result != ISC_R_SUCCESS) {
+ if (tresult != ISC_R_SUCCESS) {
cfg_obj_log(zconfig, logctx, ISC_LOG_ERROR,
"zone '%s': is not a valid name", zname);
- tresult = ISC_R_FAILURE;
+ result = ISC_R_FAILURE;
} else {
char namebuf[DNS_NAME_FORMATSIZE];
OpenPOWER on IntegriCloud