mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 13:38:26 +00:00
Code Issues Releases Wiki Activity

855. [bug] Stop spurious "using RFC 1035 TTL semantics" warnings.

Browse Source
This commit is contained in:
Mark Andrews 2001-06-05 05:12:47 +00:00
parent 17dba29ba5
commit afb0a628ef
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -1,3 +1,5 @@
855. [bug] Stop spurious "using RFC 1035 TTL semantics" warnings.
854. [bug] The config parser didn't properly handle config 854. [bug] The config parser didn't properly handle config
options that were specified in units of time other options that were specified in units of time other
than seconds. [RT #1372] than seconds. [RT #1372]

8
lib/dns/master.c
View File

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: master.c,v 1.117 2001/05/22 01:44:37 gson Exp $ */ /* $Id: master.c,v 1.118 2001/06/05 05:12:47 marka Exp $ */
#include <config.h> #include <config.h>
@ -802,6 +802,7 @@ load(dns_loadctx_t *lctx) {
char *rhs = NULL; char *rhs = NULL;
const char *source = ""; const char *source = "";
unsigned long line = 0; unsigned long line = 0;
isc_boolean_t explict_ttl;
REQUIRE(DNS_LCTX_VALID(lctx)); REQUIRE(DNS_LCTX_VALID(lctx));
callbacks = lctx->callbacks; callbacks = lctx->callbacks;
@ -1270,10 +1271,11 @@ load(dns_loadctx_t *lctx) {
== ISC_R_SUCCESS) == ISC_R_SUCCESS)
GETTOKEN(lctx->lex, 0, &token, ISC_FALSE); GETTOKEN(lctx->lex, 0, &token, ISC_FALSE);
explict_ttl = ISC_FALSE;
if (dns_ttl_fromtext(&token.value.as_textregion, &lctx->ttl) if (dns_ttl_fromtext(&token.value.as_textregion, &lctx->ttl)
== ISC_R_SUCCESS) { == ISC_R_SUCCESS) {
limit_ttl(callbacks, source, line, &lctx->ttl); limit_ttl(callbacks, source, line, &lctx->ttl);
lctx->ttl_known = ISC_TRUE; explict_ttl = lctx->ttl_known = ISC_TRUE;
GETTOKEN(lctx->lex, 0, &token, ISC_FALSE); GETTOKEN(lctx->lex, 0, &token, ISC_FALSE);
} }
@ -1417,7 +1419,7 @@ load(dns_loadctx_t *lctx) {
} }
} else if (lctx->default_ttl_known) { } else if (lctx->default_ttl_known) {
lctx->ttl = lctx->default_ttl; lctx->ttl = lctx->default_ttl;
} else if (lctx->warn_1035) { } else if (!explict_ttl && lctx->warn_1035) {
(*callbacks->warn)(callbacks, (*callbacks->warn)(callbacks,
"%s: %s:%lu: " "%s: %s:%lu: "
"using RFC 1035 TTL semantics", "using RFC 1035 TTL semantics",