Commit b7e6fb4e authored by Mark Andrews's avatar Mark Andrews

whitespace

parent e407562a
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: server.c,v 1.405 2003/09/30 05:56:01 marka Exp $ */
/* $Id: server.c,v 1.406 2003/10/26 21:33:44 marka Exp $ */
#include <config.h>
......@@ -1740,7 +1740,7 @@ interface_timer_tick(isc_task_t *task, isc_event_t *event) {
result = isc_task_beginexclusive(server->task);
RUNTIME_CHECK(result == ISC_R_SUCCESS);
scan_interfaces(server, ISC_FALSE);
isc_task_endexclusive(server->task);
isc_task_endexclusive(server->task);
}
static void
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: ntservice.h,v 1.2 2002/08/03 01:31:48 mayer Exp $ */
/* $Id: ntservice.h,v 1.3 2003/10/26 21:33:45 marka Exp $ */
#ifndef NTSERVICE_H
#define NTSERVICE_H
......@@ -32,4 +32,4 @@ void ServiceControl(DWORD dwCtrlCode);
void
ntservice_shutdown();
BOOL ntservice_isservice();
#endif
\ No newline at end of file
#endif
......@@ -15,7 +15,7 @@
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
# $Id: sign.sh,v 1.15 2003/09/30 05:56:06 marka Exp $
# $Id: sign.sh,v 1.16 2003/10/26 21:33:45 marka Exp $
SYSTEMTESTTOP=../..
. $SYSTEMTESTTOP/conf.sh
......@@ -34,6 +34,7 @@ keyname=`$KEYGEN -r $RANDFILE -a RSA -b 768 -n zone $zone`
cat $infile $keyname.key > $zonefile
echo $SIGNER -g -r $RANDFILE -o $zone $zonefile
$SIGNER -g -r $RANDFILE -o $zone $zonefile > /dev/null
# Configure the resolving server with a trusted key.
......
......@@ -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.17 2003/10/08 06:36:10 marka Exp $
# $Id: Makefile.in,v 1.18 2003/10/26 21:33:46 marka Exp $
srcdir = @srcdir@
VPATH = @srcdir@
......@@ -23,7 +23,7 @@ top_srcdir = @top_srcdir@
# Attempt to disable parallel processing.
.NOTPARALLEL:
.NO_PARALLEL:
SUBDIRS = isc isccc dns isccfg bind9 lwres tests
SUBDIRS = isc isccc dns isccfg bind9 lwres tests
TARGETS =
@BIND9_MAKE_RULES@
......@@ -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.19 2003/10/08 06:36:10 marka Exp $
# $Id: Makefile.in,v 1.20 2003/10/26 21:33:46 marka Exp $
srcdir = @srcdir@
VPATH = @srcdir@
......@@ -113,7 +113,6 @@ installdirs:
install:: timestamp installdirs
${LIBTOOL} ${INSTALL_DATA} libbind.@A@ ${DESTDIR}${libdir}
clean distclean::
rm -f libbind.@SA@ libbind.la
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: masterdump.c,v 1.70 2003/10/17 03:46:43 marka Exp $ */
/* $Id: masterdump.c,v 1.71 2003/10/26 21:33:47 marka Exp $ */
#include <config.h>
......@@ -1002,7 +1002,7 @@ static isc_result_t
task_send(dns_dumpctx_t *dctx) {
isc_event_t *event;
event = isc_event_allocate(dctx->mctx, NULL, DNS_EVENT_MASTERQUANTUM,
event = isc_event_allocate(dctx->mctx, NULL, DNS_EVENT_DUMPQUANTUM,
dump_quantum, dctx, sizeof(*event));
if (event == NULL)
return (ISC_R_NOMEMORY);
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: resolver.c,v 1.271 2003/10/25 00:31:11 jinmei Exp $ */
/* $Id: resolver.c,v 1.272 2003/10/26 21:33:47 marka Exp $ */
#include <config.h>
......@@ -531,7 +531,7 @@ fctx_cancelquery(resquery_t **queryp, dns_dispatchevent_t **deventp,
0, factor);
if (finish != NULL && TRIEDFIND(fctx))
for (find = ISC_LIST_HEAD(fctx->finds);
for (find = ISC_LIST_HEAD(fctx->finds);
find != NULL;
find = ISC_LIST_NEXT(find, publink))
for (addrinfo = ISC_LIST_HEAD(find->list);
......@@ -1249,7 +1249,7 @@ resquery_send(resquery_t *query) {
/*
* XXXRTH Make sure we don't send to ourselves! We should probably
* prune out these addresses when we get them from the ADB.
* prune out these addresses when we get them from the ADB.
*/
result = isc_socket_sendto(socket, &r, task, resquery_senddone,
query, address, NULL);
......@@ -2599,8 +2599,8 @@ fctx_create(dns_resolver_t *res, dns_name_t *name, dns_rdatatype_t type,
fctx->attributes = 0;
dns_name_init(&fctx->nsname, NULL);
fctx->nsfetch = NULL;
dns_rdataset_init(&fctx->nsrrset);
fctx->nsfetch = NULL;
dns_rdataset_init(&fctx->nsrrset);
if (domain == NULL) {
dns_forwarders_t *forwarders = NULL;
......@@ -3379,7 +3379,7 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, isc_stdtime_t now) {
}
if (rdataset->trust == dns_trust_glue &&
(rdataset->type == dns_rdatatype_ns ||
(rdataset->type == dns_rdatatype_rrsig &&
(rdataset->type == dns_rdatatype_rrsig &&
rdataset->covers == dns_rdatatype_ns))) {
/*
* If the trust level is 'dns_trust_glue'
......@@ -3970,7 +3970,7 @@ noanswer_response(fetchctx_t *fctx, dns_name_t *oqname,
type = rdataset->type;
if (type == dns_rdatatype_rrsig)
type = rdataset->covers;
if (((type == dns_rdatatype_ns ||
if (((type == dns_rdatatype_ns ||
type == dns_rdatatype_soa) &&
!dns_name_issubdomain(qname, name)))
return (DNS_R_FORMERR);
......@@ -4157,7 +4157,7 @@ noanswer_response(fetchctx_t *fctx, dns_name_t *oqname,
* Set the current query domain to the referral name.
*
* XXXRTH We should check if we're in forward-only mode, and
* if so we should bail out.
* if so we should bail out.
*/
INSIST(dns_name_countlabels(&fctx->domain) > 0);
dns_name_free(&fctx->domain, fctx->res->mctx);
......@@ -4721,7 +4721,7 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
/*
* XXXRTH We should really get the current time just once. We
* need a routine to convert from an isc_time_t to an
* need a routine to convert from an isc_time_t to an
* isc_stdtime_t.
*/
TIME_NOW(&tnow);
......@@ -4906,8 +4906,8 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
* It's very likely they don't like EDNS0.
*
* XXXRTH We should check if the question
* we're asking requires EDNS0, and
* if so, we should bail out.
* we're asking requires EDNS0, and
* if so, we should bail out.
*/
options |= DNS_FETCHOPT_NOEDNS0;
resend = ISC_TRUE;
......@@ -5240,7 +5240,7 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
dns_rdatatype_ns,
NULL, NULL, NULL, 0, task,
resume_dslookup, fctx,
&fctx->nsrrset, NULL,
&fctx->nsrrset, NULL,
&fctx->nsfetch);
if (result != ISC_R_SUCCESS)
fctx_done(fctx, result);
......
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