ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

remove nconf_test, since it used the old config parser.

Browse Source
This commit is contained in:
Brian Wellington
2001-03-13 02:47:18 +00:00
parent 17789c8804
commit 3b2634e9b9
3 changed files with 1 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bin/tests/Makefile.in
View File

@@ -13,7 +13,7 @@
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
# $Id: Makefile.in,v 1.110 2001/02/16 01:12:08 bwelling Exp $
# $Id: Makefile.in,v 1.111 2001/03/13 02:47:15 bwelling Exp $
srcdir = @srcdir@
VPATH = @srcdir@
@@ -69,7 +69,6 @@ XTARGETS = adb_test \
master_test \
mempool_test \
name_test \
nconf_test \
nxtify \
omapi_test \
ratelimiter_test \
@@ -109,7 +108,6 @@ SRCS = adb_test.c \
master_test.c \
mempool_test.c \
name_test.c \
nconf_test.c \
nxtify.c \
omapi_test.c \
printmsg.c \
@@ -246,10 +244,6 @@ zone_test: zone_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ zone_test.@O@ \
${DNSLIBS} ${ISCLIBS} ${LIBS}
nconf_test: nconf_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ nconf_test.@O@ \
${DNSLIBS} ${ISCLIBS} ${LIBS}
fsaccess_test: fsaccess_test.@O@ ${ISCDEPLIBS}
${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ fsaccess_test.@O@ \
${ISCLIBS} ${LIBS}

162
bin/tests/nconf_test.c
View File

@@ -1,162 +0,0 @@
/*
* Copyright (C) 1999-2001 Internet Software Consortium.
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
* DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
* INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
* INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
* FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
* NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: nconf_test.c,v 1.20 2001/01/09 21:41:23 bwelling Exp $ */
#include <config.h>
#include <errno.h>
#include <stdlib.h>
#include <isc/mem.h>
#include <isc/string.h>
#include <isc/util.h>
#include <dns/log.h>
#include <dns/namedconf.h>
static isc_result_t
zonecbk(dns_c_ctx_t *ctx, dns_c_zone_t *zone, dns_c_view_t *view, void *uap) {
const char *zname;
const char *vname;
UNUSED(ctx);
UNUSED(uap);
dns_c_zone_getname(zone, &zname);
#if 0
if (view != NULL) {
dns_c_view_getname(NULL, view, &vname);
} else {
vname = "no current view";
}
#else
UNUSED(view);
vname = "foo";
#endif
fprintf(stderr, "handling zone %s, view %s\n", zname, vname);
return (ISC_R_SUCCESS);
}
static isc_result_t
optscbk(dns_c_ctx_t *ctx, void *uap) {
UNUSED(ctx);
UNUSED(uap);
fprintf(stderr, "Processing options in callback.\n");
return (ISC_R_SUCCESS);
}
extern int dns__yydebug;
int
main (int argc, char **argv) {
dns_c_ctx_t *configctx = NULL;
const char *conffile;
FILE *outfp;
isc_mem_t *mem = NULL;
dns_c_cbks_t callbacks;
isc_log_t *log = NULL;
isc_logconfig_t *logcfg = NULL;
callbacks.zonecbk = zonecbk;
callbacks.optscbk = optscbk;
callbacks.zonecbkuap = NULL;
callbacks.optscbkuap = NULL;
#if 1
callbacks.zonecbk = NULL;
callbacks.optscbk = NULL;
#endif
if (argc > 1 && strcmp(argv[1],"-d") == 0) {
argv++;
argc--;
/* debug_mem_print = ISC_TRUE; */
dns__yydebug = 1;
}
conffile = getenv("NAMED_CONF");
if (argc > 1)
conffile = argv[1];
if (conffile == NULL || conffile[0] == '\0')
conffile = "/etc/named.conf";
RUNTIME_CHECK(isc_mem_create(0, 0, &mem) == ISC_R_SUCCESS);
RUNTIME_CHECK(isc_log_create(mem, &log, &logcfg) == ISC_R_SUCCESS);
isc_log_setcontext(log);
dns_log_init(log);
dns_log_setcontext(log);
RUNTIME_CHECK(isc_log_usechannel(logcfg, "default_stderr", NULL, NULL)
== ISC_R_SUCCESS);
dns_lctx = log;
if (dns_c_parse_namedconf(conffile, mem, &configctx, &callbacks) !=
ISC_R_SUCCESS) {
fprintf(stderr, "parse_configuration failed.\n");
exit(1);
}
if (configctx->errors > 0) {
fprintf(stderr,
"There were %d semantic errors in the config file.\n",
configctx->errors);
}
outfp = stdout;
if (argc > 2) {
if ((outfp = fopen(argv[2], "w")) == NULL) {
fprintf(stderr, "Cannot open %s: %s",
argv[2], strerror(errno));
outfp = stderr;
}
}
dns_c_ctx_print(outfp, 0, configctx);
#if 0
/* Test the acl expansion */
{
dns_ipmatch_list_t *list;
dns_acl_t *acl;
dns_acl_table_get_acl(configctx->acls, "cannot_query", &acl);
dns_acl_get_ipml_expanded(mem, acl, &list);
dns_ipmatch_list_print(outfp, 0, list);
}
#endif
if (outfp != stderr) {
fclose(outfp);
}
dns_c_ctx_delete(&configctx);
dns_lctx = NULL;
isc_log_destroy(&log);
isc_mem_destroy(&mem);
return (0);
}

1
util/copyrights
View File

@@ -283,7 +283,6 @@
./bin/tests/names/wire_test7.data X 1999,2000,2001
./bin/tests/names/wire_test8.data X 1999,2000,2001
./bin/tests/names/wire_test9.data X 1999,2000,2001
./bin/tests/nconf_test.c C 1999,2000,2001
./bin/tests/ndc.conf CONF-C 2000,2001
./bin/tests/ndcconf_test.c C 2000,2001
./bin/tests/net/.cvsignore X 2000,2001