Commit ae520c2f authored by Mark Andrews's avatar Mark Andrews
Browse files

More obsolete filed warnings

parent 9b2e1985
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: confctx.c,v 1.105 2000/11/28 03:57:17 marka Exp $ */
/* $Id: confctx.c,v 1.106 2000/11/28 05:24:50 marka Exp $ */
#include <config.h>
......@@ -346,7 +346,7 @@ dns_c_checkconfig(dns_c_ctx_t *cfg)
if (dns_c_ctx_getnamedxfer(cfg, &cpval) != ISC_R_NOTFOUND) {
isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
DNS_LOGMODULE_CONFIG, ISC_LOG_WARNING,
"option 'named-xfer' is now obsolete");
"option 'named-xfer' is obsolete");
}
if (dns_c_ctx_getdumpfilename(cfg, &cpval) != ISC_R_NOTFOUND) {
......@@ -440,7 +440,7 @@ dns_c_checkconfig(dns_c_ctx_t *cfg)
if (dns_c_ctx_getmaxcachesize(cfg, &uintval) != ISC_R_NOTFOUND) {
isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
DNS_LOGMODULE_CONFIG, ISC_LOG_WARNING,
"option 'max-cache-size' is not yet"
"option 'max-cache-size' is not yet "
"implemented");
}
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: confview.c,v 1.58 2000/11/28 04:01:21 marka Exp $ */
/* $Id: confview.c,v 1.59 2000/11/28 05:24:51 marka Exp $ */
#include <config.h>
......@@ -390,8 +390,7 @@ dns_c_viewtable_checkviews(dns_c_viewtable_t *viewtable) {
if (dns_c_view_getfetchglue(elem, &bbval) != ISC_R_NOTFOUND)
isc_log_write(dns_lctx,DNS_LOGCATEGORY_CONFIG,
DNS_LOGMODULE_CONFIG, ISC_LOG_WARNING,
"view 'fetch-glue' is not yet "
"implemented");
"view 'fetch-glue' is obsolete");
if (dns_c_view_getrfc2308type1(elem, &bbval) != ISC_R_NOTFOUND)
isc_log_write(dns_lctx,DNS_LOGCATEGORY_CONFIG,
......@@ -808,7 +807,6 @@ dns_c_view_print(FILE *fp, int indent, dns_c_view_t *view) {
PRINT_INT32(max_transfer_time_in, "max-transfer-time-in");
PRINT_INT32(max_transfer_idle_in, "max-transfer-idle-in");
PRINT_INT32(transfers_per_ns, "transfers-per-ns");
PRINT_INT32(serialqueries, "serial-queries");
#endif
fprintf(fp, "\n");
......@@ -1586,7 +1584,6 @@ BYTYPE_FUNCS(dns_transfer_format_t, transferformat, transfer_format)
UINT32_FUNCS(maxtransfertimein, max_transfer_time_in)
UINT32_FUNCS(maxtransferidlein, max_transfer_idle_in)
UINT32_FUNCS(transfersperns, transfers_per_ns)
UINT32_FUNCS(serialqueries, serial_queries)
#endif
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: confzone.c,v 1.66 2000/11/28 03:22:55 marka Exp $ */
/* $Id: confzone.c,v 1.67 2000/11/28 05:24:53 marka Exp $ */
#include <config.h>
......@@ -638,8 +638,13 @@ dns_c_zone_validate(dns_c_zone_t *zone)
const char *checknameserror = "zone '%s': 'check-names' is not yet "
"implemented";
const char *pubkeyerror = "zone '%s': 'pubkey' is deprecated";
const char *maintixfrbase = "zone '%s': 'maintain-ixfr-base' is "
"obsolete";
const char *ixfrbase = "zone '%s': 'ixfr-base' is obsolete";
dns_severity_t severity;
dns_c_pklist_t *pklist = NULL;
isc_boolean_t bool;
const char *string;
/*
* Check if zone is diabled. This isn't really a validation, just a
......@@ -653,7 +658,6 @@ dns_c_zone_validate(dns_c_zone_t *zone)
zone->name);
}
/*
* Check for allow-update and update-policy together
*/
......@@ -710,6 +714,21 @@ dns_c_zone_validate(dns_c_zone_t *zone)
/* XXX TODO make sure no 'key' clauses were given on any iplist
except for masters{}; */
/*
* Check for obsolete options.
*/
if (zone->ztype == dns_c_zone_master ||
zone->ztype == dns_c_zone_slave) {
if (dns_c_zone_getmaintixfrbase(zone, &bool) == ISC_R_SUCCESS)
isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
DNS_LOGMODULE_CONFIG, ISC_LOG_WARNING,
maintixfrbase, zone->name);
if (dns_c_zone_getixfrbase(zone, &string) == ISC_R_SUCCESS)
isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
DNS_LOGMODULE_CONFIG, ISC_LOG_WARNING,
ixfrbase, zone->name);
}
return (result);
}
......@@ -2171,19 +2190,22 @@ dns_c_zone_getmaintixfrbase(dns_c_zone_t *zone, isc_boolean_t *retval) {
case dns_c_zone_stub:
isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
"stub zones do not have a notify field");
"stub zones do not have a "
"maint_ixfr_base field");
return (ISC_R_FAILURE);
case dns_c_zone_hint:
isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
"hint zones do not have a notify field");
"hint zones do not have a "
"maint_ixfr_base field");
return (ISC_R_FAILURE);
case dns_c_zone_forward:
isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
"forward zones do not have a notify field");
"forward zones do not have a "
"maint_ixfr_base field");
return (ISC_R_FAILURE);
}
......
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