upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-03-03 14:00:47 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove definition and use of dns_c_severity_t and replace with dns_severity_t.

Browse source
This commit is contained in:
James Brister 2000-01-28 19:56:25 +00:00
parent 19a3e16a9d
commit c71fc7ffdd
8 changed files with 32 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/dns/config/confcommon.c
View file

@ -429,21 +429,21 @@ dns_c_transport2string(dns_c_trans_t transport,
const char *
dns_c_nameseverity2string(dns_c_severity_t severity,
dns_c_nameseverity2string(dns_severity_t severity,
isc_boolean_t printable)
{
const char *rval = NULL;
switch (severity) {
case dns_c_severity_ignore:
case dns_severity_ignore:
rval = "ignore";
break;
case dns_c_severity_warn:
case dns_severity_warn:
rval = "warn";
break;
case dns_c_severity_fail:
case dns_severity_fail:
rval = "fail";
break;
}

10
lib/dns/config/confctx.c
View file

@ -130,7 +130,7 @@ dns_c_checkconfig(dns_c_ctx_t *ctx)
{
isc_boolean_t bval;
char *cpval;
dns_c_severity_t severity;
dns_severity_t severity;
isc_int32_t intval;
dns_c_ipmatchlist_t *ipml;
@ -1719,7 +1719,7 @@ dns_c_ctx_settransferformat(dns_c_ctx_t *cfg,
isc_result_t
dns_c_ctx_setchecknames(dns_c_ctx_t *cfg,
dns_c_trans_t transtype,
dns_c_severity_t sever)
dns_severity_t sever)
{
isc_boolean_t existed = ISC_FALSE;
isc_result_t res;
@ -2976,7 +2976,7 @@ dns_c_ctx_gettransferformat(dns_c_ctx_t *cfg,
isc_result_t
dns_c_ctx_getchecknames(dns_c_ctx_t *cfg,
dns_c_trans_t transtype,
dns_c_severity_t *sever)
dns_severity_t *sever)
{
isc_boolean_t isset = ISC_FALSE;
isc_result_t res;
@ -3283,7 +3283,7 @@ dns_c_ctx_optionsnew(isc_mem_t *mem, dns_c_options_t **options)
opts->transfer_format = dns_one_answer;
for (i = 0 ; i < DNS_C_TRANSCOUNT ; i++) {
opts->check_names[i] = dns_c_severity_fail;
opts->check_names[i] = dns_severity_fail;
}
opts->queryacl = NULL;
@ -3425,7 +3425,7 @@ dns_c_ctx_optionsdelete(dns_c_options_t **opts)
void
dns_c_ctx_optionsprint(FILE *fp, int indent, dns_c_options_t *options)
{
dns_c_severity_t nameseverity;
dns_severity_t nameseverity;
REQUIRE(fp != NULL);

10
lib/dns/config/confparser.y
View file

@ -17,7 +17,7 @@
*/
#if !defined(lint) && !defined(SABER)
static char rcsid[] = "$Id: confparser.y,v 1.34 2000/01/28 01:14:41 gson Exp $";
static char rcsid[] = "$Id: confparser.y,v 1.35 2000/01/28 19:56:17 brister Exp $";
#endif /* not lint */
#include <config.h>
@ -111,7 +111,7 @@ static isc_boolean_t int_too_big(isc_uint32_t base, isc_uint32_t mult);
isc_boolean_t boolean;
dns_rdataclass_t rrclass;
dns_c_severity_t severity;
dns_severity_t severity;
dns_c_trans_t transport;
dns_transfer_format_t tformat;
dns_c_category_t logcat;
@ -1282,15 +1282,15 @@ check_names_type: L_MASTER
check_names_opt: L_WARN
{
$$ = dns_c_severity_warn;
$$ = dns_severity_warn;
}
| L_FAIL
{
$$ = dns_c_severity_fail;
$$ = dns_severity_fail;
}
| L_IGNORE
{
$$ = dns_c_severity_ignore;
$$ = dns_severity_ignore;
}
;

8
lib/dns/config/confzone.c
View file

@ -567,9 +567,9 @@ dns_c_zone_setfile(dns_c_zone_t *zone, const char *newfile)
isc_result_t
dns_c_zone_setchecknames(dns_c_zone_t *zone,
dns_c_severity_t severity)
dns_severity_t severity)
{
dns_c_severity_t *p = NULL;
dns_severity_t *p = NULL;
dns_c_setbits_t *bits = NULL;
int bit = 0;
isc_result_t res;
@ -1701,9 +1701,9 @@ dns_c_zone_getfile(dns_c_zone_t *zone, const char **retval)
isc_result_t
dns_c_zone_getchecknames(dns_c_zone_t *zone,
dns_c_severity_t *retval)
dns_severity_t *retval)
{
dns_c_severity_t *p = NULL;
dns_severity_t *p = NULL;
dns_c_setbits_t *bits = NULL;
int bit = 0;
isc_result_t res;

4
lib/dns/include/dns/confcommon.h
View file

@ -115,11 +115,13 @@ typedef enum {
} dns_c_forw_t;
/* value of a 'check-names' method */
#if 0
typedef enum {
dns_c_severity_ignore,
dns_c_severity_warn,
dns_c_severity_fail
} dns_c_severity_t;
#endif
/* Value of a 'check-names' type. */
typedef enum {
@ -292,7 +294,7 @@ const char * dns_c_transformat2string(dns_transfer_format_t tform,
isc_boolean_t printable);
const char * dns_c_transport2string(dns_c_trans_t transport,
isc_boolean_t printable);
const char * dns_c_nameseverity2string(dns_c_severity_t severity,
const char * dns_c_nameseverity2string(dns_severity_t severity,
isc_boolean_t printable);
const char * dns_c_forward2string(dns_c_forw_t forw,
isc_boolean_t printable);

6
lib/dns/include/dns/confctx.h
View file

@ -181,7 +181,7 @@ struct dns_c_options
isc_sockaddr_t query_source_addr;
in_port_t query_source_port;
dns_c_severity_t check_names[DNS_C_TRANSCOUNT];
dns_severity_t check_names[DNS_C_TRANSCOUNT];
dns_transfer_format_t transfer_format;
@ -366,7 +366,7 @@ isc_result_t dns_c_ctx_setquerysourceaddr(dns_c_ctx_t *cfg,
isc_result_t dns_c_ctx_setquerysourceport(dns_c_ctx_t *cfg, in_port_t port);
isc_result_t dns_c_ctx_setchecknames(dns_c_ctx_t *cfg,
dns_c_trans_t transtype,
dns_c_severity_t sever);
dns_severity_t sever);
isc_result_t dns_c_ctx_settransferformat(dns_c_ctx_t *cfg,
dns_transfer_format_t newval);
isc_result_t dns_c_ctx_setqueryacl(dns_c_ctx_t *cfg, isc_boolean_t copy,
@ -500,7 +500,7 @@ isc_result_t dns_c_ctx_getquerysourceport(dns_c_ctx_t *cfg,
in_port_t *port);
isc_result_t dns_c_ctx_getchecknames(dns_c_ctx_t *cfg,
dns_c_trans_t transtype,
dns_c_severity_t *sever);
dns_severity_t *sever);
isc_result_t dns_c_ctx_gettransferformat(dns_c_ctx_t *cfg,
dns_transfer_format_t *retval);
isc_result_t dns_c_ctx_getqueryacl(dns_c_ctx_t *cfg,

2
lib/dns/include/dns/confview.h
View file

@ -120,7 +120,7 @@ struct dns_c_view
dns_c_rrsolist_t *ordering;
dns_c_severity_t check_names[DNS_C_TRANSCOUNT];
dns_severity_t check_names[DNS_C_TRANSCOUNT];
dns_transfer_format_t transfer_format;

14
lib/dns/include/dns/confzone.h
View file

@ -108,7 +108,7 @@ struct dns_c_zone_list
struct dns_c_master_zone
{
char *file;
dns_c_severity_t check_names;
dns_severity_t check_names;
dns_c_ipmatchlist_t *allow_update;
dns_c_ipmatchlist_t *allow_query;
dns_c_ipmatchlist_t *allow_transfer;
@ -133,7 +133,7 @@ struct dns_c_master_zone
struct dns_c_slave_zone
{
char *file;
dns_c_severity_t check_names;
dns_severity_t check_names;
dns_c_ipmatchlist_t *allow_update;
dns_c_ipmatchlist_t *allow_query;
dns_c_ipmatchlist_t *allow_transfer;
@ -163,7 +163,7 @@ struct dns_c_slave_zone
struct dns_c_stub_zone
{
char *file;
dns_c_severity_t check_names;
dns_severity_t check_names;
dns_c_ipmatchlist_t *allow_update; /* should be here??? */
dns_c_ipmatchlist_t *allow_query;
dns_c_ipmatchlist_t *allow_transfer; /* should be here??? */
@ -185,7 +185,7 @@ struct dns_c_stub_zone
struct dns_c_forward_zone
{
dns_c_severity_t check_names;
dns_severity_t check_names;
dns_c_forw_t forward;
dns_c_iplist_t *forwarders;
@ -196,7 +196,7 @@ struct dns_c_forward_zone
struct dns_c_hint_zone
{
char *file;
dns_c_severity_t check_names;
dns_severity_t check_names;
dns_c_pklist_t *pubkeylist;
dns_c_setbits_t setflags;
@ -267,7 +267,7 @@ void dns_c_zone_print(FILE *fp, int indent,
isc_result_t dns_c_zone_setfile(dns_c_zone_t *zone,
const char *newfile);
isc_result_t dns_c_zone_setchecknames(dns_c_zone_t *zone,
dns_c_severity_t severity);
dns_severity_t severity);
isc_result_t dns_c_zone_setallowupd(dns_c_zone_t *zone,
dns_c_ipmatchlist_t *ipml,
isc_boolean_t deepcopy);
@ -322,7 +322,7 @@ isc_result_t dns_c_zone_getinternalname(dns_c_zone_t *zone,
isc_result_t dns_c_zone_getfile(dns_c_zone_t *zone,
const char **retval);
isc_result_t dns_c_zone_getchecknames(dns_c_zone_t *zone,
dns_c_severity_t *retval);
dns_severity_t *retval);
isc_result_t dns_c_zone_getallowupd(dns_c_zone_t *zone,
dns_c_ipmatchlist_t **retval);
isc_result_t dns_c_zone_getallowquery(dns_c_zone_t *zone,