Commit e99691e5 authored by Mark Andrews's avatar Mark Andrews

cleanup

parent 7e8c1a13
# Copyright (C) 1998-2000 Internet Software Consortium.
# Copyright (C) 2000 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
......@@ -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.1 2000/12/13 06:05:42 marka Exp $
# $Id: Makefile.in,v 1.2 2000/12/14 21:33:33 marka Exp $
srcdir = @srcdir@
VPATH = @srcdir@
......@@ -21,34 +21,33 @@ top_srcdir = @top_srcdir@
@BIND9_INCLUDES@
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} ${LWRES_INCLUDES} \
${OMAPI_INCLUDES}
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES}
CDEFINES =
CWARNINGS =
DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@ @DNS_GSSAPI_LIBS@
ISCLIBS = ../../lib/isc/libisc.@A@
OMAPILIBS = ../../lib/omapi/libomapi.@A@
LWRESLIBS = ../../lib/lwres/liblwres.@A@
DNSDEPLIBS = ../../lib/dns/libdns.@A@
ISCDEPLIBS = ../../lib/isc/libisc.@A@
OMAPIDEPLIBS = ../../lib/omapi/libomapi.@A@
LWRESDEPLIBS = ../../lib/lwres/liblwres.@A@
LIBS = @LIBS@
SUBDIRS = db dst master mem names net rbt sockaddr tasks timers system
SUBDIRS =
# Alphabetically
TARGETS = check-zone
TARGETS = check-conf check-zone
# Alphabetically
SRCS = check-zone.c
SRCS = check-conf.c check-zone.c check-tool.c
@BIND9_MAKE_RULES@
check-zone: check-zone.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ check-zone.@O@ \
check-conf: check-conf.@O@ check-tool.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ check-conf.@O@ check-tool.@O@ \
${DNSLIBS} ${ISCLIBS} ${LIBS}
check-zone: check-zone.@O@ check-tool.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${CC} ${CFLAGS} -o $@ check-zone.@O@ check-tool.@O@ \
${DNSLIBS} ${ISCLIBS} ${LIBS}
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: check-zone.c,v 1.2 2000/12/14 01:03:48 marka Exp $ */
/* $Id: check-zone.c,v 1.3 2000/12/14 21:33:34 marka Exp $ */
#include <config.h>
......@@ -39,6 +39,8 @@
#include <dns/result.h>
#include <dns/zone.h>
#include "check-tool.h"
static int debug = 0;
static int quiet = 0;
static isc_mem_t *mctx = NULL;
......@@ -105,7 +107,6 @@ setup(char *zonename, char *filename, char *classname) {
dns_zone_setclass(zone, rdclass);
result = dns_zone_load(zone);
ERRRET(result, "dns_zone_load");
return (result);
}
......@@ -121,7 +122,7 @@ main(int argc, char **argv) {
int c;
char *origin = NULL;
char *filename = NULL;
char *classname = "IN";
const char *classname = "IN";
isc_log_t *lctx = NULL;
isc_result_t result;
......@@ -145,13 +146,8 @@ main(int argc, char **argv) {
usage();
RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
if (!quiet) {
RUNTIME_CHECK(isc_log_create(mctx, &lctx, NULL) ==
ISC_R_SUCCESS);
isc_log_setcontext(lctx);
dns_log_init(lctx);
dns_log_setcontext(lctx);
}
if (!quiet)
RUNTIME_CHECK(setup_logging(mctx, &lctx) == ISC_R_SUCCESS);
origin = argv[isc_commandline_index];
isc_commandline_index++;
......@@ -159,7 +155,7 @@ main(int argc, char **argv) {
filename = argv[isc_commandline_index];
else
filename = origin;
result = setup(origin, filename, classname);
result = setup(origin, filename, (char *)classname);
if (!quiet && result == ISC_R_SUCCESS)
fprintf(stdout, "OK\n ");
destroy();
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: named-checkzone.c,v 1.2 2000/12/14 01:03:48 marka Exp $ */
/* $Id: named-checkzone.c,v 1.3 2000/12/14 21:33:34 marka Exp $ */
#include <config.h>
......@@ -39,6 +39,8 @@
#include <dns/result.h>
#include <dns/zone.h>
#include "check-tool.h"
static int debug = 0;
static int quiet = 0;
static isc_mem_t *mctx = NULL;
......@@ -105,7 +107,6 @@ setup(char *zonename, char *filename, char *classname) {
dns_zone_setclass(zone, rdclass);
result = dns_zone_load(zone);
ERRRET(result, "dns_zone_load");
return (result);
}
......@@ -121,7 +122,7 @@ main(int argc, char **argv) {
int c;
char *origin = NULL;
char *filename = NULL;
char *classname = "IN";
const char *classname = "IN";
isc_log_t *lctx = NULL;
isc_result_t result;
......@@ -145,13 +146,8 @@ main(int argc, char **argv) {
usage();
RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
if (!quiet) {
RUNTIME_CHECK(isc_log_create(mctx, &lctx, NULL) ==
ISC_R_SUCCESS);
isc_log_setcontext(lctx);
dns_log_init(lctx);
dns_log_setcontext(lctx);
}
if (!quiet)
RUNTIME_CHECK(setup_logging(mctx, &lctx) == ISC_R_SUCCESS);
origin = argv[isc_commandline_index];
isc_commandline_index++;
......@@ -159,7 +155,7 @@ main(int argc, char **argv) {
filename = argv[isc_commandline_index];
else
filename = origin;
result = setup(origin, filename, classname);
result = setup(origin, filename, (char *)classname);
if (!quiet && result == ISC_R_SUCCESS)
fprintf(stdout, "OK\n ");
destroy();
......
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