From 40f53fa8d9c6a4fc38c0014495e7a42b08f52481 Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Tue, 1 Aug 2000 01:33:37 +0000 Subject: [PATCH] Trailing whitespace trimmed. Perhaps running "perl util/spacewhack.pl in your own CVS tree will help minimize CVS conflicts. Maybe not. Blame Graff for getting me to trim all trailing whitespace. --- CHANGES | 80 +- Makefile.in | 6 +- README | 6 +- acconfig.h | 6 +- bin/Makefile.in | 6 +- bin/dig/Makefile.in | 10 +- bin/dig/dig.c | 58 +- bin/dig/dighost.c | 102 +- bin/dig/host.1 | 22 +- bin/dig/host.c | 32 +- bin/dig/include/dig/dig.h | 8 +- bin/dig/nslookup.c | 42 +- bin/dnssec/Makefile.in | 6 +- bin/dnssec/dnssec-keygen.8 | 38 +- bin/dnssec/dnssec-keygen.c | 18 +- bin/dnssec/dnssec-makekeyset.8 | 18 +- bin/dnssec/dnssec-makekeyset.c | 6 +- bin/dnssec/dnssec-signkey.8 | 14 +- bin/dnssec/dnssec-signkey.c | 6 +- bin/dnssec/dnssec-signzone.8 | 24 +- bin/dnssec/dnssec-signzone.c | 14 +- bin/dnssec/dnssectool.c | 10 +- bin/dnssec/dnssectool.h | 6 +- bin/lwresd/Makefile.in | 10 +- bin/lwresd/client.c | 8 +- bin/lwresd/client.h | 6 +- bin/lwresd/err_pkt.c | 6 +- bin/lwresd/main.c | 30 +- bin/lwresd/process_gabn.c | 8 +- bin/lwresd/process_gnba.c | 8 +- bin/lwresd/process_noop.c | 6 +- bin/named/Makefile.in | 8 +- bin/named/aclconf.c | 16 +- bin/named/client.c | 104 +-- bin/named/include/named/aclconf.h | 6 +- bin/named/include/named/client.h | 20 +- bin/named/include/named/globals.h | 6 +- bin/named/include/named/interfacemgr.h | 16 +- bin/named/include/named/listenlist.h | 6 +- bin/named/include/named/log.h | 8 +- bin/named/include/named/logconf.h | 6 +- bin/named/include/named/lwdclient.h | 6 +- bin/named/include/named/lwresd.h | 6 +- bin/named/include/named/main.h | 6 +- bin/named/include/named/notify.h | 6 +- bin/named/include/named/omapi.h | 6 +- bin/named/include/named/query.h | 6 +- bin/named/include/named/server.h | 10 +- bin/named/include/named/tkeyconf.h | 8 +- bin/named/include/named/tsigconf.h | 8 +- bin/named/include/named/types.h | 6 +- bin/named/include/named/update.h | 6 +- bin/named/include/named/xfrout.h | 6 +- bin/named/include/named/zoneconf.h | 6 +- bin/named/interfacemgr.c | 58 +- bin/named/listenlist.c | 10 +- bin/named/log.c | 10 +- bin/named/logconf.c | 16 +- bin/named/lwdclient.c | 8 +- bin/named/lwderror.c | 6 +- bin/named/lwdgabn.c | 12 +- bin/named/lwdgnba.c | 8 +- bin/named/lwdnoop.c | 6 +- bin/named/lwresd.8 | 20 +- bin/named/lwresd.c | 12 +- bin/named/main.c | 14 +- bin/named/named.8 | 18 +- bin/named/named.conf.test | 6 +- bin/named/notify.c | 12 +- bin/named/omapi.c | 6 +- bin/named/omapiconf.c | 12 +- bin/named/query.c | 60 +- bin/named/server.c | 150 +-- bin/named/tkeyconf.c | 6 +- bin/named/tsigconf.c | 8 +- bin/named/unix/Makefile.in | 10 +- bin/named/unix/include/named/os.h | 6 +- bin/named/unix/os.c | 8 +- bin/named/update.c | 238 ++--- bin/named/xfrout.c | 132 +-- bin/named/zoneconf.c | 28 +- bin/nsupdate/Makefile.in | 12 +- bin/nsupdate/nsupdate.8 | 26 +- bin/nsupdate/nsupdate.c | 26 +- bin/rndc/Makefile.in | 8 +- bin/rndc/rndc.8 | 26 +- bin/rndc/rndc.c | 10 +- bin/rndc/rndc.conf | 6 +- bin/rndc/rndc.conf.5 | 26 +- bin/tests/Makefile.in | 8 +- bin/tests/adb_test.c | 10 +- bin/tests/b8status.pl | 8 +- bin/tests/b8t.mk | 8 +- bin/tests/b9status.pl | 8 +- bin/tests/b9t.mk | 6 +- bin/tests/byaddr_test.c | 22 +- bin/tests/byname_test.c | 24 +- bin/tests/compress_test.c | 8 +- bin/tests/db/Makefile.in | 6 +- bin/tests/db/t_db.c | 22 +- bin/tests/db_test.c | 14 +- bin/tests/dispatch_tcp_test.c | 8 +- bin/tests/dispatch_test.c | 12 +- bin/tests/dst/Ktest.+001+00000.key | 2 +- bin/tests/dst/Ktest.+003+00000.key | 2 +- bin/tests/dst/Makefile.in | 6 +- bin/tests/dst/dst_test.c | 6 +- bin/tests/dst/t_dst.c | 8 +- bin/tests/entropy2_test.c | 6 +- bin/tests/entropy_test.c | 6 +- bin/tests/fsaccess_test.c | 6 +- bin/tests/gxba_test.c | 6 +- bin/tests/gxbn_test.c | 6 +- bin/tests/hash_test.c | 6 +- bin/tests/headerdep_test.sh.in | 8 +- bin/tests/inter_test.c | 6 +- bin/tests/keyboard_test.c | 6 +- bin/tests/lex_test.c | 6 +- bin/tests/lfsr_test.c | 6 +- bin/tests/log_test.c | 8 +- bin/tests/lwres_test.c | 6 +- bin/tests/lwresconf_test.c | 8 +- bin/tests/master/Makefile.in | 6 +- bin/tests/master/master10.data | 2 +- bin/tests/master/t_master.c | 10 +- bin/tests/master_test.c | 14 +- bin/tests/mem/Makefile.in | 8 +- bin/tests/mem/t_mem.c | 12 +- bin/tests/mempool_test.c | 8 +- bin/tests/name_test.c | 12 +- bin/tests/named.conf | 82 +- bin/tests/names/Makefile.in | 6 +- bin/tests/names/dns_name_compare_data | 2 +- bin/tests/names/dns_name_fromregion_data | 2 +- bin/tests/names/dns_name_fromwire_1_data | 2 +- bin/tests/names/dns_name_fromwire_2_data | 2 +- bin/tests/names/dns_name_fromwire_3_data | 2 +- bin/tests/names/dns_name_fromwire_4_data | 2 +- bin/tests/names/dns_name_fromwire_5_data | 2 +- bin/tests/names/dns_name_fromwire_6_data | 2 +- bin/tests/names/dns_name_fromwire_7_data | 2 +- bin/tests/names/dns_name_fromwire_8_data | 2 +- bin/tests/names/dns_name_fromwire_9_data | 2 +- bin/tests/names/dns_name_getlabel_data | 2 +- .../names/dns_name_getlabelsequence_data | 2 +- bin/tests/names/dns_name_issubdomain_data | 2 +- bin/tests/names/dns_name_rdatacompare_data | 2 +- bin/tests/names/t_names.c | 18 +- bin/tests/nconf_test.c | 28 +- bin/tests/ndc.conf | 6 +- bin/tests/ndcconf_test.c | 20 +- bin/tests/net/Makefile.in | 6 +- bin/tests/net/driver.c | 6 +- bin/tests/net/driver.h | 6 +- bin/tests/net/netaddr_multicast.c | 6 +- bin/tests/net/sockaddr_multicast.c | 6 +- bin/tests/net/testsuite.h | 6 +- bin/tests/nxtify.c | 6 +- bin/tests/omapi_test.c | 14 +- bin/tests/printmsg.c | 10 +- bin/tests/printmsg.h | 6 +- bin/tests/ratelimiter_test.c | 16 +- bin/tests/rbt/Makefile.in | 6 +- bin/tests/rbt/t_rbt.c | 30 +- bin/tests/rbt_test.c | 10 +- bin/tests/rbt_test.txt | 6 +- bin/tests/rdata_test.c | 8 +- bin/tests/resolv.conf.sample | 6 +- bin/tests/rwlock_test.c | 6 +- bin/tests/serial_test.c | 6 +- bin/tests/shutdown_test.c | 10 +- bin/tests/sock_test.c | 6 +- bin/tests/sockaddr/Makefile.in | 8 +- bin/tests/sockaddr/t_sockaddr.c | 18 +- bin/tests/sym_test.c | 8 +- bin/tests/system/Makefile.in | 8 +- bin/tests/system/cleanall.sh | 6 +- bin/tests/system/conf.sh.in | 8 +- bin/tests/system/digcomp.pl | 6 +- bin/tests/system/dnssec/clean.sh | 8 +- bin/tests/system/dnssec/ns1/named.conf | 6 +- bin/tests/system/dnssec/ns1/root.db.in | 8 +- bin/tests/system/dnssec/ns1/sign.sh | 6 +- bin/tests/system/dnssec/ns2/example.db.in | 6 +- .../dnssec/ns2/insecure.secure.example.db | 6 +- bin/tests/system/dnssec/ns2/named.conf | 6 +- .../dnssec/ns2/private.secure.example.db.in | 6 +- bin/tests/system/dnssec/ns2/root.hint | 6 +- bin/tests/system/dnssec/ns2/sign.sh | 6 +- .../system/dnssec/ns3/bogus.example.db.in | 6 +- .../system/dnssec/ns3/insecure.example.db | 6 +- bin/tests/system/dnssec/ns3/named.conf | 6 +- bin/tests/system/dnssec/ns3/root.hint | 6 +- .../system/dnssec/ns3/secure.example.db.in | 6 +- bin/tests/system/dnssec/ns3/sign.sh | 6 +- bin/tests/system/dnssec/ns4/named.conf | 6 +- bin/tests/system/dnssec/ns4/root.hint | 6 +- bin/tests/system/dnssec/ns5/named.conf | 6 +- bin/tests/system/dnssec/ns5/root.hint | 6 +- bin/tests/system/dnssec/ns5/trusted.conf.bad | 6 +- bin/tests/system/dnssec/setup.sh | 6 +- bin/tests/system/dnssec/tests.sh | 6 +- bin/tests/system/glue/clean.sh | 6 +- bin/tests/system/glue/ns1/cache | 6 +- bin/tests/system/glue/ns1/mil.db | 8 +- bin/tests/system/glue/ns1/named.conf | 6 +- bin/tests/system/glue/ns1/net.db | 8 +- bin/tests/system/glue/ns1/root-servers.nil.db | 10 +- bin/tests/system/glue/ns1/root.db | 8 +- bin/tests/system/glue/tests.sh | 6 +- bin/tests/system/ifconfig.sh | 12 +- bin/tests/system/limits/clean.sh | 6 +- .../system/limits/knowngood.dig.out.1000 | 2 +- .../system/limits/knowngood.dig.out.2000 | 2 +- .../system/limits/knowngood.dig.out.3000 | 2 +- .../system/limits/knowngood.dig.out.4000 | 2 +- .../limits/knowngood.dig.out.a-maximum-rrset | 2 +- bin/tests/system/limits/ns1/example.db | 6 +- bin/tests/system/limits/ns1/named.conf | 6 +- bin/tests/system/limits/ns1/root.db | 8 +- bin/tests/system/limits/tests.sh | 6 +- bin/tests/system/lwresd/Makefile.in | 6 +- bin/tests/system/lwresd/lwresd1/resolv.conf | 6 +- bin/tests/system/lwresd/lwtest.c | 16 +- .../lwresd/ns1/10.10.10.in-addr.arpa.db | 6 +- bin/tests/system/lwresd/ns1/example1.db | 6 +- bin/tests/system/lwresd/ns1/example2.db | 6 +- bin/tests/system/lwresd/ns1/ip6.arpa.db | 6 +- bin/tests/system/lwresd/ns1/ip6.int.db | 6 +- bin/tests/system/lwresd/ns1/named.conf | 6 +- bin/tests/system/lwresd/ns1/root.db | 8 +- bin/tests/system/lwresd/resolv.conf | 6 +- bin/tests/system/lwresd/tests.sh | 6 +- bin/tests/system/notify/clean.sh | 6 +- bin/tests/system/notify/ns1/named.conf | 6 +- bin/tests/system/notify/ns1/root.db | 8 +- bin/tests/system/notify/ns2/example1.db | 6 +- bin/tests/system/notify/ns2/example2.db | 6 +- bin/tests/system/notify/ns2/example3.db | 6 +- bin/tests/system/notify/ns2/example4.db | 6 +- bin/tests/system/notify/ns2/named.conf | 6 +- bin/tests/system/notify/ns2/root.hint | 6 +- bin/tests/system/notify/ns3/named.conf | 6 +- bin/tests/system/notify/ns3/root.hint | 6 +- bin/tests/system/notify/setup.sh | 6 +- bin/tests/system/notify/tests.sh | 6 +- bin/tests/system/nsupdate/clean.sh | 6 +- bin/tests/system/nsupdate/ns1/example.orig | 6 +- bin/tests/system/nsupdate/ns1/named.conf | 6 +- bin/tests/system/nsupdate/ns1/update.orig | 6 +- bin/tests/system/nsupdate/ns2/named.conf | 6 +- bin/tests/system/nsupdate/setup.sh | 6 +- bin/tests/system/nsupdate/tests.sh | 6 +- bin/tests/system/nsupdate/update_test.pl | 16 +- bin/tests/system/resolver/ans2/ans.pl | 4 +- bin/tests/system/resolver/ans3/ans.pl | 8 +- bin/tests/system/resolver/ns1/named.conf | 6 +- bin/tests/system/resolver/ns1/root.hint | 6 +- bin/tests/system/resolver/prereq.sh | 8 +- bin/tests/system/resolver/tests.sh | 6 +- bin/tests/system/run.sh | 6 +- bin/tests/system/runall.sh | 6 +- bin/tests/system/setup.sh | 6 +- bin/tests/system/start.sh | 8 +- bin/tests/system/stop.sh | 6 +- bin/tests/system/stub/clean.sh | 6 +- bin/tests/system/stub/knowngood.dig.out.norec | 2 +- bin/tests/system/stub/knowngood.dig.out.rec | 2 +- bin/tests/system/stub/ns1/named.conf | 6 +- bin/tests/system/stub/ns1/root.db | 8 +- bin/tests/system/stub/ns2/child.example.db | 6 +- bin/tests/system/stub/ns2/named.conf | 6 +- bin/tests/system/stub/ns2/root.hint | 6 +- bin/tests/system/stub/ns3/example.db | 6 +- bin/tests/system/stub/ns3/named.conf | 6 +- bin/tests/system/stub/ns3/root.hint | 6 +- bin/tests/system/stub/tests.sh | 6 +- bin/tests/system/testsock.pl | 6 +- bin/tests/system/views/clean.sh | 6 +- bin/tests/system/views/ns1/named.conf | 6 +- bin/tests/system/views/ns1/root.db | 8 +- bin/tests/system/views/ns2/example1.db | 6 +- bin/tests/system/views/ns2/example2.db | 6 +- bin/tests/system/views/ns2/internal.db | 6 +- bin/tests/system/views/ns2/named1.conf | 6 +- bin/tests/system/views/ns2/named2.conf | 10 +- bin/tests/system/views/ns2/root.hint | 6 +- bin/tests/system/views/ns3/internal.db | 6 +- bin/tests/system/views/ns3/named1.conf | 6 +- bin/tests/system/views/ns3/named2.conf | 6 +- bin/tests/system/views/ns3/root.hint | 6 +- bin/tests/system/views/rndc.conf | 6 +- bin/tests/system/views/setup.sh | 6 +- bin/tests/system/views/tests.sh | 6 +- bin/tests/system/xfer/clean.sh | 6 +- bin/tests/system/xfer/ns1/named.conf | 6 +- bin/tests/system/xfer/ns1/root.db | 8 +- bin/tests/system/xfer/ns2/example.db | 6 +- bin/tests/system/xfer/ns2/named.conf | 8 +- bin/tests/system/xfer/ns2/root.hint | 6 +- bin/tests/system/xfer/ns2/tsigzone.db | 6 +- bin/tests/system/xfer/ns3/named.conf | 8 +- bin/tests/system/xfer/ns3/root.hint | 6 +- bin/tests/system/xfer/tests.sh | 6 +- bin/tests/system/xferquota/clean.sh | 6 +- bin/tests/system/xferquota/ns1/changing1.db | 6 +- bin/tests/system/xferquota/ns1/changing2.db | 6 +- bin/tests/system/xferquota/ns1/named.conf | 6 +- bin/tests/system/xferquota/ns1/root.db | 8 +- bin/tests/system/xferquota/ns2/example.db | 6 +- bin/tests/system/xferquota/ns2/named.conf | 6 +- bin/tests/system/xferquota/ns2/root.hint | 6 +- bin/tests/system/xferquota/setup.pl | 6 +- bin/tests/system/xferquota/setup.sh | 6 +- bin/tests/system/xferquota/tests.sh | 6 +- bin/tests/t_api.pl | 6 +- bin/tests/task_test.c | 8 +- bin/tests/tasks/Makefile.in | 8 +- bin/tests/tasks/t_tasks.c | 34 +- bin/tests/timer_test.c | 12 +- bin/tests/timers/Makefile.in | 6 +- bin/tests/timers/t_timers.c | 6 +- bin/tests/tkey_test.c | 8 +- bin/tests/update_test.pl | 16 +- bin/tests/wire_test.c | 8 +- bin/tests/wire_test.data | 4 +- bin/tests/zone2_test.c | 14 +- bin/tests/zone_test.c | 16 +- config.guess | 4 +- config.h.in | 4 +- config.status.win32 | 4 +- configure | 42 +- configure.in | 10 +- conftools/perllib/dnsconf/DNSConf-macros.h | 8 +- conftools/perllib/dnsconf/DNSConf.i | 60 +- conftools/perllib/dnsconf/Makefile.PL | 6 +- conftools/perllib/dnsconf/named1.conf | 8 +- conftools/perllib/dnsconf/test.pl | 6 +- contrib/named-bootconf/named-bootconf.sh | 8 +- contrib/nanny/nanny.pl | 8 +- doc/arm/Bv9ARM.1.html | 6 +- doc/arm/Bv9ARM.2.html | 6 +- doc/arm/Bv9ARM.3.html | 6 +- doc/arm/Bv9ARM.4.html | 12 +- doc/arm/Bv9ARM.5.html | 6 +- doc/arm/Bv9ARM.6.html | 18 +- doc/arm/Bv9ARM.7.html | 16 +- doc/arm/Bv9ARM.8.html | 8 +- doc/arm/Bv9ARM.9.html | 10 +- doc/arm/Bv9ARM.css | 6 +- doc/arm/Bv9ARM.html | 6 +- doc/arm/Bv9ARM.txt | 16 +- doc/design/addressdb | 4 +- doc/design/compression | 6 +- doc/design/db_rules | 4 +- doc/design/decompression | 6 +- doc/design/logging | 6 +- doc/design/ncache | 4 +- doc/design/omapi | 12 +- doc/design/red-black | 4 +- doc/design/search | 8 +- doc/design/windows-nt | 4 +- doc/design/zone | 18 +- doc/dev/coding.html | 14 +- doc/dev/cvs | 4 +- doc/dev/cvs-usage | 4 +- doc/dev/rdata.html | 16 +- doc/dev/release | 8 +- doc/dev/results | 4 +- doc/dev/tests | 6 +- doc/draft/draft-costanzo-dns-gl-03.txt | 42 +- doc/draft/draft-ietf-dhc-dhcp-dns-12.txt | 28 +- .../draft-ietf-dnsext-zone-status-02.txt | 10 +- doc/draft/draft-ietf-enum-rqmts-01.txt | 616 ++++++------ ...aft-ietf-ipngwg-default-addr-select-00.txt | 880 +++++++++--------- doc/draft/draft-skwan-gss-tsig-05.txt | 2 +- doc/draft/draft-skwan-utf8-dns-03.txt | 12 +- ...aft-whr-dnsext-secure-online-update-00.txt | 168 ++-- .../draft-ietf-dnsind-binary-labels-05.txt | 2 +- doc/expired/draft-ietf-dnsind-rollover-00.txt | 2 +- doc/man/bin/host.1 | 22 +- doc/man/bin/lwresd.8 | 20 +- doc/man/bin/named.8 | 18 +- doc/man/bin/nsupdate.8 | 26 +- doc/man/bin/rndc.8 | 26 +- doc/man/bin/rndc.conf.5 | 26 +- doc/man/ctoman | 8 +- doc/man/dnssec/dnssec-keygen.8 | 38 +- doc/man/dnssec/dnssec-makekeyset.8 | 18 +- doc/man/dnssec/dnssec-signkey.8 | 14 +- doc/man/dnssec/dnssec-signzone.8 | 24 +- doc/man/isc/isc__errno2result.3 | 10 +- doc/man/isc/isc_app.3 | 44 +- doc/man/isc/isc_app_finish.3 | 10 +- doc/man/isc/isc_app_onrun.3 | 10 +- doc/man/isc/isc_app_reload.3 | 10 +- doc/man/isc/isc_app_run.3 | 10 +- doc/man/isc/isc_app_shutdown.3 | 10 +- doc/man/isc/isc_app_start.3 | 10 +- doc/man/isc/isc_dir.3 | 46 +- doc/man/isc/isc_dir_chdir.3 | 10 +- doc/man/isc/isc_dir_close.3 | 10 +- doc/man/isc/isc_dir_init.3 | 10 +- doc/man/isc/isc_dir_open.3 | 10 +- doc/man/isc/isc_dir_read.3 | 10 +- doc/man/isc/isc_dir_reset.3 | 10 +- doc/man/isc/isc_error.3 | 32 +- doc/man/isc/isc_file.3 | 34 +- doc/man/isc/isc_file_getmodtime.3 | 10 +- doc/man/isc/isc_file_mktemplate.3 | 10 +- doc/man/isc/isc_file_openunique.3 | 10 +- doc/man/isc/isc_file_remove.3 | 10 +- doc/man/isc/isc_file_settime.3 | 10 +- doc/man/isc/isc_interfaceiter_create.3 | 10 +- doc/man/isc/isc_interfaceiter_current.3 | 10 +- doc/man/isc/isc_interfaceiter_destroy.3 | 10 +- doc/man/isc/isc_interfaceiter_first.3 | 10 +- doc/man/isc/isc_interfaceiter_next.3 | 10 +- doc/man/isc/isc_interval_iszero.3 | 10 +- doc/man/isc/isc_ipproto.3 | 20 +- doc/man/isc/isc_net_probeipv4.3 | 10 +- doc/man/isc/isc_net_probeipv6.3 | 10 +- doc/man/isc/isc_netif.3 | 42 +- doc/man/isc/isc_socket.3 | 70 +- doc/man/isc/isc_socket_accept.3 | 10 +- doc/man/isc/isc_socket_attach.3 | 10 +- doc/man/isc/isc_socket_bind.3 | 10 +- doc/man/isc/isc_socket_cancel.3 | 10 +- doc/man/isc/isc_socket_connect.3 | 10 +- doc/man/isc/isc_socket_create.3 | 10 +- doc/man/isc/isc_socket_detach.3 | 10 +- doc/man/isc/isc_socket_getpeername.3 | 10 +- doc/man/isc/isc_socket_getsockname.3 | 10 +- doc/man/isc/isc_socket_gettype.3 | 10 +- doc/man/isc/isc_socket_isbound.3 | 10 +- doc/man/isc/isc_socket_listen.3 | 10 +- doc/man/isc/isc_socket_recv.3 | 10 +- doc/man/isc/isc_socket_recvmark.3 | 10 +- doc/man/isc/isc_socket_recvv.3 | 10 +- doc/man/isc/isc_socket_send.3 | 10 +- doc/man/isc/isc_socket_sendmark.3 | 10 +- doc/man/isc/isc_socket_sendto.3 | 10 +- doc/man/isc/isc_socket_sendtov.3 | 10 +- doc/man/isc/isc_socket_sendv.3 | 10 +- doc/man/isc/isc_socketmgr_create.3 | 10 +- doc/man/isc/isc_socketmgr_destroy.3 | 10 +- doc/man/isc/isc_stdio.3 | 16 +- doc/man/isc/isc_stdio_close.3 | 10 +- doc/man/isc/isc_stdio_flush.3 | 10 +- doc/man/isc/isc_stdio_open.3 | 10 +- doc/man/isc/isc_stdio_read.3 | 10 +- doc/man/isc/isc_stdio_seek.3 | 10 +- doc/man/isc/isc_stdio_sync.3 | 10 +- doc/man/isc/isc_stdio_write.3 | 10 +- doc/man/isc/isc_stdtime.3 | 18 +- doc/man/isc/isc_stdtime_get.3 | 10 +- doc/man/isc/isc_time.3 | 32 +- doc/man/isc/isc_time_add.3 | 10 +- doc/man/isc/isc_time_compare.3 | 10 +- doc/man/isc/isc_time_isepoch.3 | 10 +- doc/man/isc/isc_time_microdiff.3 | 10 +- doc/man/isc/isc_time_nanoseconds.3 | 10 +- doc/man/isc/isc_time_now.3 | 10 +- doc/man/isc/isc_time_nowplusinterval.3 | 10 +- doc/man/isc/isc_time_seconds.3 | 10 +- doc/man/isc/isc_time_secondsastimet.3 | 10 +- doc/man/isc/isc_time_set.3 | 10 +- doc/man/isc/isc_time_settoepoch.3 | 10 +- doc/man/isc/isc_time_subtract.3 | 10 +- doc/man/lwres/lwres.3 | 36 +- doc/man/lwres/lwres_addr_parse.3 | 10 +- doc/man/lwres/lwres_buffer.3 | 28 +- doc/man/lwres/lwres_buffer_add.3 | 10 +- doc/man/lwres/lwres_buffer_back.3 | 10 +- doc/man/lwres/lwres_buffer_clear.3 | 10 +- doc/man/lwres/lwres_buffer_first.3 | 10 +- doc/man/lwres/lwres_buffer_forward.3 | 10 +- doc/man/lwres/lwres_buffer_getmem.3 | 10 +- doc/man/lwres/lwres_buffer_getuint16.3 | 10 +- doc/man/lwres/lwres_buffer_getuint32.3 | 10 +- doc/man/lwres/lwres_buffer_getuint8.3 | 10 +- doc/man/lwres/lwres_buffer_init.3 | 10 +- doc/man/lwres/lwres_buffer_invalidate.3 | 10 +- doc/man/lwres/lwres_buffer_putmem.3 | 10 +- doc/man/lwres/lwres_buffer_putuint16.3 | 10 +- doc/man/lwres/lwres_buffer_putuint32.3 | 10 +- doc/man/lwres/lwres_buffer_putuint8.3 | 10 +- doc/man/lwres/lwres_buffer_subtract.3 | 10 +- doc/man/lwres/lwres_conf_clear.3 | 10 +- doc/man/lwres/lwres_conf_get.3 | 10 +- doc/man/lwres/lwres_conf_init.3 | 10 +- doc/man/lwres/lwres_conf_parse.3 | 10 +- doc/man/lwres/lwres_conf_print.3 | 10 +- doc/man/lwres/lwres_config.3 | 16 +- doc/man/lwres/lwres_context.3 | 20 +- doc/man/lwres/lwres_context_allocmem.3 | 10 +- doc/man/lwres/lwres_context_create.3 | 10 +- doc/man/lwres/lwres_context_destroy.3 | 10 +- doc/man/lwres/lwres_context_freemem.3 | 10 +- doc/man/lwres/lwres_context_initserial.3 | 10 +- doc/man/lwres/lwres_context_nextserial.3 | 10 +- doc/man/lwres/lwres_context_sendrecv.3 | 10 +- doc/man/lwres/lwres_endhostent.3 | 10 +- doc/man/lwres/lwres_endhostent_r.3 | 10 +- doc/man/lwres/lwres_freeaddrinfo.3 | 10 +- doc/man/lwres/lwres_freehostent.3 | 10 +- doc/man/lwres/lwres_gabn.3 | 22 +- doc/man/lwres/lwres_gabnrequest_free.3 | 10 +- doc/man/lwres/lwres_gabnrequest_parse.3 | 10 +- doc/man/lwres/lwres_gabnrequest_render.3 | 10 +- doc/man/lwres/lwres_gabnresponse_free.3 | 10 +- doc/man/lwres/lwres_gabnresponse_parse.3 | 10 +- doc/man/lwres/lwres_gabnresponse_render.3 | 10 +- doc/man/lwres/lwres_gai_strerror.3 | 12 +- doc/man/lwres/lwres_getaddrinfo.3 | 34 +- doc/man/lwres/lwres_getaddrsbyname.3 | 10 +- doc/man/lwres/lwres_gethostbyaddr.3 | 10 +- doc/man/lwres/lwres_gethostbyaddr_r.3 | 10 +- doc/man/lwres/lwres_gethostbyname.3 | 10 +- doc/man/lwres/lwres_gethostbyname2.3 | 10 +- doc/man/lwres/lwres_gethostbyname_r.3 | 10 +- doc/man/lwres/lwres_gethostent.3 | 42 +- doc/man/lwres/lwres_gethostent_r.3 | 10 +- doc/man/lwres/lwres_getipnode.3 | 18 +- doc/man/lwres/lwres_getipnodebyaddr.3 | 10 +- doc/man/lwres/lwres_getipnodebyname.3 | 10 +- doc/man/lwres/lwres_getnamebyaddr.3 | 10 +- doc/man/lwres/lwres_getnameinfo.3 | 14 +- doc/man/lwres/lwres_gnba.3 | 18 +- doc/man/lwres/lwres_gnbarequest_free.3 | 10 +- doc/man/lwres/lwres_gnbarequest_parse.3 | 10 +- doc/man/lwres/lwres_gnbarequest_render.3 | 10 +- doc/man/lwres/lwres_gnbaresponse_free.3 | 10 +- doc/man/lwres/lwres_gnbaresponse_parse.3 | 10 +- doc/man/lwres/lwres_gnbaresponse_render.3 | 10 +- doc/man/lwres/lwres_herror.3 | 10 +- doc/man/lwres/lwres_hstrerror.3 | 14 +- doc/man/lwres/lwres_inetaton.3 | 16 +- doc/man/lwres/lwres_inetntop.3 | 14 +- doc/man/lwres/lwres_inetpton.3 | 14 +- doc/man/lwres/lwres_lwpacket_parseheader.3 | 10 +- doc/man/lwres/lwres_lwpacket_renderheader.3 | 10 +- doc/man/lwres/lwres_net_aton.3 | 10 +- doc/man/lwres/lwres_net_ntop.3 | 10 +- doc/man/lwres/lwres_net_pton.3 | 10 +- doc/man/lwres/lwres_noop.3 | 18 +- doc/man/lwres/lwres_nooprequest_free.3 | 10 +- doc/man/lwres/lwres_nooprequest_parse.3 | 10 +- doc/man/lwres/lwres_nooprequest_render.3 | 10 +- doc/man/lwres/lwres_noopresponse_free.3 | 10 +- doc/man/lwres/lwres_noopresponse_parse.3 | 10 +- doc/man/lwres/lwres_noopresponse_render.3 | 10 +- doc/man/lwres/lwres_packet.3 | 18 +- doc/man/lwres/lwres_resutil.3 | 22 +- doc/man/lwres/lwres_sethostent.3 | 10 +- doc/man/lwres/lwres_sethostent_r.3 | 10 +- doc/man/lwres/lwres_string_parse.3 | 10 +- doc/misc/options | 18 +- install-sh | 16 +- isc-config.sh.in | 6 +- lib/Makefile.in | 6 +- lib/dns/Makefile.in | 6 +- lib/dns/a6.c | 8 +- lib/dns/acl.c | 32 +- lib/dns/aclconf.c | 16 +- lib/dns/adb.c | 32 +- lib/dns/byaddr.c | 14 +- lib/dns/cache.c | 80 +- lib/dns/callbacks.c | 8 +- lib/dns/compress.c | 10 +- lib/dns/config/Makefile.in | 10 +- lib/dns/config/confacl.c | 60 +- lib/dns/config/confcache.c | 10 +- lib/dns/config/confcommon.c | 86 +- lib/dns/config/confctl.c | 50 +- lib/dns/config/confctx.c | 360 +++---- lib/dns/config/confip.c | 108 +-- lib/dns/config/confkeys.c | 104 +-- lib/dns/config/conflog.c | 58 +- lib/dns/config/conflsn.c | 54 +- lib/dns/config/confndc.c | 164 ++-- lib/dns/config/confparser.y.dirty | 38 +- lib/dns/config/confpvt.h | 6 +- lib/dns/config/confresolv.c | 10 +- lib/dns/config/confrrset.c | 42 +- lib/dns/config/confview.c | 150 +-- lib/dns/config/confzone.c | 640 ++++++------- lib/dns/db.c | 32 +- lib/dns/dbiterator.c | 8 +- lib/dns/dbtable.c | 12 +- lib/dns/dispatch.c | 14 +- lib/dns/dnssec.c | 16 +- lib/dns/gen-unix.h | 8 +- lib/dns/gen-win32.h | 10 +- lib/dns/gen.c | 16 +- lib/dns/include/Makefile.in | 6 +- lib/dns/include/dns/Makefile.in | 8 +- lib/dns/include/dns/a6.h | 6 +- lib/dns/include/dns/acl.h | 12 +- lib/dns/include/dns/aclconf.h | 6 +- lib/dns/include/dns/adb.h | 14 +- lib/dns/include/dns/bit.h | 6 +- lib/dns/include/dns/byaddr.h | 6 +- lib/dns/include/dns/cache.h | 26 +- lib/dns/include/dns/callbacks.h | 10 +- lib/dns/include/dns/cert.h | 6 +- lib/dns/include/dns/compress.h | 6 +- lib/dns/include/dns/confacl.h | 62 +- lib/dns/include/dns/confcache.h | 18 +- lib/dns/include/dns/confcommon.h | 24 +- lib/dns/include/dns/confctl.h | 14 +- lib/dns/include/dns/confctx.h | 36 +- lib/dns/include/dns/confip.h | 24 +- lib/dns/include/dns/confkeys.h | 22 +- lib/dns/include/dns/conflog.h | 26 +- lib/dns/include/dns/conflsn.h | 14 +- lib/dns/include/dns/confndc.h | 10 +- lib/dns/include/dns/confparser.h | 12 +- lib/dns/include/dns/confresolv.h | 18 +- lib/dns/include/dns/confrrset.h | 22 +- lib/dns/include/dns/confview.h | 24 +- lib/dns/include/dns/confzone.h | 26 +- lib/dns/include/dns/db.h | 22 +- lib/dns/include/dns/dbiterator.h | 8 +- lib/dns/include/dns/dbtable.h | 6 +- lib/dns/include/dns/dispatch.h | 8 +- lib/dns/include/dns/dnssec.h | 6 +- lib/dns/include/dns/events.h | 6 +- lib/dns/include/dns/fixedname.h | 6 +- lib/dns/include/dns/journal.h | 46 +- lib/dns/include/dns/keyflags.h | 8 +- lib/dns/include/dns/keytable.h | 8 +- lib/dns/include/dns/keyvalues.h | 6 +- lib/dns/include/dns/lib.h | 6 +- lib/dns/include/dns/log.h | 6 +- lib/dns/include/dns/master.h | 8 +- lib/dns/include/dns/masterdump.h | 18 +- lib/dns/include/dns/message.h | 22 +- lib/dns/include/dns/name.h | 28 +- lib/dns/include/dns/namedconf.h | 6 +- lib/dns/include/dns/ncache.h | 6 +- lib/dns/include/dns/nxt.h | 6 +- lib/dns/include/dns/peer.h | 10 +- lib/dns/include/dns/rbt.h | 16 +- lib/dns/include/dns/rcode.h | 6 +- lib/dns/include/dns/rdata.h | 18 +- lib/dns/include/dns/rdataclass.h | 6 +- lib/dns/include/dns/rdatalist.h | 6 +- lib/dns/include/dns/rdataset.h | 8 +- lib/dns/include/dns/rdatasetiter.h | 10 +- lib/dns/include/dns/rdataslab.h | 6 +- lib/dns/include/dns/rdatatype.h | 6 +- lib/dns/include/dns/request.h | 6 +- lib/dns/include/dns/resolver.h | 12 +- lib/dns/include/dns/result.h | 6 +- lib/dns/include/dns/rootns.h | 6 +- lib/dns/include/dns/secalg.h | 6 +- lib/dns/include/dns/secproto.h | 6 +- lib/dns/include/dns/ssu.h | 6 +- lib/dns/include/dns/tcpmsg.h | 6 +- lib/dns/include/dns/time.h | 16 +- lib/dns/include/dns/tkey.h | 6 +- lib/dns/include/dns/tkeyconf.h | 8 +- lib/dns/include/dns/tsig.h | 8 +- lib/dns/include/dns/tsigconf.h | 8 +- lib/dns/include/dns/ttl.h | 8 +- lib/dns/include/dns/types.h | 6 +- lib/dns/include/dns/validator.h | 14 +- lib/dns/include/dns/view.h | 14 +- lib/dns/include/dns/xfrin.h | 12 +- lib/dns/include/dns/zone.h | 28 +- lib/dns/include/dns/zoneconf.h | 6 +- lib/dns/include/dns/zt.h | 6 +- lib/dns/journal.c | 278 +++--- lib/dns/keytable.c | 10 +- lib/dns/lib.c | 6 +- lib/dns/log.c | 6 +- lib/dns/master.c | 44 +- lib/dns/masterdump.c | 112 +-- lib/dns/message.c | 26 +- lib/dns/name.c | 56 +- lib/dns/ncache.c | 10 +- lib/dns/nxt.c | 12 +- lib/dns/peer.c | 134 +-- lib/dns/rbt.c | 40 +- lib/dns/rbtdb.c | 72 +- lib/dns/rbtdb.h | 6 +- lib/dns/rbtdb64.c | 6 +- lib/dns/rbtdb64.h | 6 +- lib/dns/rdata.c | 68 +- lib/dns/rdata/any_255/tsig_250.c | 26 +- lib/dns/rdata/any_255/tsig_250.h | 6 +- lib/dns/rdata/generic/afsdb_18.c | 12 +- lib/dns/rdata/generic/afsdb_18.h | 6 +- lib/dns/rdata/generic/cert_37.c | 12 +- lib/dns/rdata/generic/cert_37.h | 6 +- lib/dns/rdata/generic/cname_5.c | 14 +- lib/dns/rdata/generic/cname_5.h | 6 +- lib/dns/rdata/generic/dname_39.c | 12 +- lib/dns/rdata/generic/dname_39.h | 6 +- lib/dns/rdata/generic/gpos_27.c | 10 +- lib/dns/rdata/generic/gpos_27.h | 6 +- lib/dns/rdata/generic/hinfo_13.c | 8 +- lib/dns/rdata/generic/hinfo_13.h | 6 +- lib/dns/rdata/generic/isdn_20.c | 10 +- lib/dns/rdata/generic/isdn_20.h | 6 +- lib/dns/rdata/generic/key_25.c | 10 +- lib/dns/rdata/generic/key_25.h | 6 +- lib/dns/rdata/generic/loc_29.c | 28 +- lib/dns/rdata/generic/loc_29.h | 8 +- lib/dns/rdata/generic/mb_7.c | 8 +- lib/dns/rdata/generic/mb_7.h | 6 +- lib/dns/rdata/generic/md_3.c | 6 +- lib/dns/rdata/generic/md_3.h | 6 +- lib/dns/rdata/generic/mf_4.c | 8 +- lib/dns/rdata/generic/mf_4.h | 6 +- lib/dns/rdata/generic/mg_8.c | 12 +- lib/dns/rdata/generic/mg_8.h | 6 +- lib/dns/rdata/generic/minfo_14.c | 10 +- lib/dns/rdata/generic/minfo_14.h | 6 +- lib/dns/rdata/generic/mr_9.c | 8 +- lib/dns/rdata/generic/mr_9.h | 6 +- lib/dns/rdata/generic/mx_15.c | 8 +- lib/dns/rdata/generic/mx_15.h | 6 +- lib/dns/rdata/generic/ns_2.c | 6 +- lib/dns/rdata/generic/ns_2.h | 6 +- lib/dns/rdata/generic/null_10.c | 8 +- lib/dns/rdata/generic/null_10.h | 6 +- lib/dns/rdata/generic/nxt_30.c | 14 +- lib/dns/rdata/generic/nxt_30.h | 6 +- lib/dns/rdata/generic/opt_41.c | 6 +- lib/dns/rdata/generic/opt_41.h | 6 +- lib/dns/rdata/generic/proforma.c | 8 +- lib/dns/rdata/generic/proforma.h | 6 +- lib/dns/rdata/generic/ptr_12.c | 10 +- lib/dns/rdata/generic/ptr_12.h | 6 +- lib/dns/rdata/generic/rp_17.c | 8 +- lib/dns/rdata/generic/rp_17.h | 6 +- lib/dns/rdata/generic/rt_21.c | 8 +- lib/dns/rdata/generic/rt_21.h | 6 +- lib/dns/rdata/generic/sig_24.c | 24 +- lib/dns/rdata/generic/sig_24.h | 6 +- lib/dns/rdata/generic/soa_6.c | 10 +- lib/dns/rdata/generic/soa_6.h | 6 +- lib/dns/rdata/generic/tkey_249.c | 14 +- lib/dns/rdata/generic/tkey_249.h | 6 +- lib/dns/rdata/generic/txt_16.c | 10 +- lib/dns/rdata/generic/txt_16.h | 6 +- lib/dns/rdata/generic/unspec_103.c | 8 +- lib/dns/rdata/generic/unspec_103.h | 6 +- lib/dns/rdata/generic/x25_19.c | 8 +- lib/dns/rdata/generic/x25_19.h | 6 +- lib/dns/rdata/hs_4/a_1.c | 8 +- lib/dns/rdata/hs_4/a_1.h | 6 +- lib/dns/rdata/in_1/a6_38.c | 8 +- lib/dns/rdata/in_1/a6_38.h | 6 +- lib/dns/rdata/in_1/a_1.c | 8 +- lib/dns/rdata/in_1/a_1.h | 6 +- lib/dns/rdata/in_1/aaaa_28.c | 6 +- lib/dns/rdata/in_1/aaaa_28.h | 8 +- lib/dns/rdata/in_1/kx_36.c | 8 +- lib/dns/rdata/in_1/kx_36.h | 6 +- lib/dns/rdata/in_1/naptr_35.c | 16 +- lib/dns/rdata/in_1/naptr_35.h | 6 +- lib/dns/rdata/in_1/nsap-ptr_23.c | 10 +- lib/dns/rdata/in_1/nsap-ptr_23.h | 6 +- lib/dns/rdata/in_1/nsap_22.c | 8 +- lib/dns/rdata/in_1/nsap_22.h | 6 +- lib/dns/rdata/in_1/px_26.c | 8 +- lib/dns/rdata/in_1/px_26.h | 6 +- lib/dns/rdata/in_1/srv_33.c | 8 +- lib/dns/rdata/in_1/srv_33.h | 6 +- lib/dns/rdata/in_1/wks_11.c | 8 +- lib/dns/rdata/in_1/wks_11.h | 6 +- lib/dns/rdata/rdatastructpre.h | 6 +- lib/dns/rdata/rdatastructsuf.h | 6 +- lib/dns/rdatalist.c | 6 +- lib/dns/rdataset.c | 14 +- lib/dns/rdatasetiter.c | 6 +- lib/dns/rdataslab.c | 14 +- lib/dns/request.c | 20 +- lib/dns/resolver.c | 110 +-- lib/dns/result.c | 6 +- lib/dns/rootns.c | 8 +- lib/dns/sec/Makefile.in | 6 +- lib/dns/sec/dnssafe/Makefile.in | 6 +- lib/dns/sec/dnssafe/ahcbcpad.c | 4 +- lib/dns/sec/dnssafe/ahchdig.c | 8 +- lib/dns/sec/dnssafe/ahchencr.c | 2 +- lib/dns/sec/dnssafe/ahchgen.c | 10 +- lib/dns/sec/dnssafe/ahchrand.c | 8 +- lib/dns/sec/dnssafe/ahencryp.h | 2 +- lib/dns/sec/dnssafe/ahrsaenc.c | 22 +- lib/dns/sec/dnssafe/ahrsaepr.c | 10 +- lib/dns/sec/dnssafe/ahrsaepu.c | 12 +- lib/dns/sec/dnssafe/aichenc8.c | 4 +- lib/dns/sec/dnssafe/airsakgn.c | 2 +- lib/dns/sec/dnssafe/algchoic.c | 6 +- lib/dns/sec/dnssafe/algobj.c | 10 +- lib/dns/sec/dnssafe/amrkg.c | 2 +- lib/dns/sec/dnssafe/balg.c | 6 +- lib/dns/sec/dnssafe/bgclrbit.c | 8 +- lib/dns/sec/dnssafe/bgmodexp.c | 10 +- lib/dns/sec/dnssafe/bgpegcd.c | 2 +- lib/dns/sec/dnssafe/big2exp.c | 2 +- lib/dns/sec/dnssafe/bigabs.c | 2 +- lib/dns/sec/dnssafe/bigarith.c | 14 +- lib/dns/sec/dnssafe/bigcmp.c | 4 +- lib/dns/sec/dnssafe/biginv.c | 10 +- lib/dns/sec/dnssafe/biglen.c | 4 +- lib/dns/sec/dnssafe/bigmpy.c | 6 +- lib/dns/sec/dnssafe/bigpdiv.c | 14 +- lib/dns/sec/dnssafe/bigpmpy.c | 2 +- lib/dns/sec/dnssafe/bigqrx.c | 10 +- lib/dns/sec/dnssafe/bigtocan.c | 10 +- lib/dns/sec/dnssafe/bigu.c | 2 +- lib/dns/sec/dnssafe/bigunexp.c | 8 +- lib/dns/sec/dnssafe/binfocsh.c | 12 +- lib/dns/sec/dnssafe/bkey.c | 16 +- lib/dns/sec/dnssafe/bkey.h | 2 +- lib/dns/sec/dnssafe/bmempool.c | 32 +- lib/dns/sec/dnssafe/cantobig.c | 10 +- lib/dns/sec/dnssafe/crt2.c | 20 +- lib/dns/sec/dnssafe/digrand.c | 6 +- lib/dns/sec/dnssafe/global.h | 2 +- lib/dns/sec/dnssafe/intbits.c | 6 +- lib/dns/sec/dnssafe/intitem.c | 6 +- lib/dns/sec/dnssafe/keyobj.c | 12 +- lib/dns/sec/dnssafe/ki8byte.c | 4 +- lib/dns/sec/dnssafe/kifulprv.c | 8 +- lib/dns/sec/dnssafe/kiitem.c | 4 +- lib/dns/sec/dnssafe/kinfotyp.h | 2 +- lib/dns/sec/dnssafe/kipkcrpr.c | 8 +- lib/dns/sec/dnssafe/kirsacrt.c | 4 +- lib/dns/sec/dnssafe/kirsapub.c | 8 +- lib/dns/sec/dnssafe/md5.c | 8 +- lib/dns/sec/dnssafe/md5rand.h | 2 +- lib/dns/sec/dnssafe/prime.c | 18 +- lib/dns/sec/dnssafe/rsa.c | 18 +- lib/dns/sec/dnssafe/rsakeygn.c | 38 +- lib/dns/sec/dnssafe/seccbcd.c | 12 +- lib/dns/sec/dnssafe/seccbce.c | 14 +- lib/dns/sec/dst/Makefile.in | 6 +- lib/dns/sec/dst/bsafe_link.c | 34 +- lib/dns/sec/dst/dst_api.c | 38 +- lib/dns/sec/dst/dst_internal.h | 6 +- lib/dns/sec/dst/dst_lib.c | 6 +- lib/dns/sec/dst/dst_parse.c | 12 +- lib/dns/sec/dst/dst_parse.h | 6 +- lib/dns/sec/dst/dst_result.c | 6 +- lib/dns/sec/dst/hmac_link.c | 10 +- lib/dns/sec/dst/include/Makefile.in | 6 +- lib/dns/sec/dst/include/dst/Makefile.in | 6 +- lib/dns/sec/dst/include/dst/dst.h | 6 +- lib/dns/sec/dst/include/dst/lib.h | 6 +- lib/dns/sec/dst/include/dst/result.h | 6 +- lib/dns/sec/dst/openssl_link.c | 14 +- lib/dns/sec/dst/openssldh_link.c | 12 +- lib/dns/sec/openssl/Makefile.in | 6 +- lib/dns/sec/openssl/bn_add.c | 12 +- lib/dns/sec/openssl/bn_asm.c | 22 +- lib/dns/sec/openssl/bn_ctx.c | 2 +- lib/dns/sec/openssl/bn_div.c | 12 +- lib/dns/sec/openssl/bn_err.c | 2 +- lib/dns/sec/openssl/bn_exp.c | 24 +- lib/dns/sec/openssl/bn_exp2.c | 4 +- lib/dns/sec/openssl/bn_gcd.c | 12 +- lib/dns/sec/openssl/bn_lcl.h | 12 +- lib/dns/sec/openssl/bn_lib.c | 22 +- lib/dns/sec/openssl/bn_mont.c | 24 +- lib/dns/sec/openssl/bn_mul.c | 22 +- lib/dns/sec/openssl/bn_prime.c | 22 +- lib/dns/sec/openssl/bn_prime.h | 12 +- lib/dns/sec/openssl/bn_print.c | 12 +- lib/dns/sec/openssl/bn_rand.c | 12 +- lib/dns/sec/openssl/bn_recp.c | 14 +- lib/dns/sec/openssl/bn_shift.c | 12 +- lib/dns/sec/openssl/bn_sqr.c | 14 +- lib/dns/sec/openssl/bn_word.c | 14 +- lib/dns/sec/openssl/buffer.c | 14 +- lib/dns/sec/openssl/cryptlib.c | 12 +- lib/dns/sec/openssl/cryptlib.h | 16 +- lib/dns/sec/openssl/dh_err.c | 2 +- lib/dns/sec/openssl/dh_gen.c | 16 +- lib/dns/sec/openssl/dh_key.c | 16 +- lib/dns/sec/openssl/dh_lib.c | 12 +- lib/dns/sec/openssl/dsa_err.c | 2 +- lib/dns/sec/openssl/dsa_gen.c | 16 +- lib/dns/sec/openssl/dsa_key.c | 12 +- lib/dns/sec/openssl/dsa_lib.c | 20 +- lib/dns/sec/openssl/dsa_ossl.c | 16 +- lib/dns/sec/openssl/dsa_sign.c | 12 +- lib/dns/sec/openssl/dsa_vrf.c | 12 +- lib/dns/sec/openssl/err.c | 16 +- lib/dns/sec/openssl/ex_data.c | 12 +- lib/dns/sec/openssl/include/Makefile.in | 6 +- .../sec/openssl/include/openssl/Makefile.in | 6 +- lib/dns/sec/openssl/include/openssl/bio.h | 14 +- lib/dns/sec/openssl/include/openssl/bn.h | 12 +- lib/dns/sec/openssl/include/openssl/buffer.h | 12 +- lib/dns/sec/openssl/include/openssl/crypto.h | 14 +- lib/dns/sec/openssl/include/openssl/dh.h | 14 +- lib/dns/sec/openssl/include/openssl/dsa.h | 12 +- lib/dns/sec/openssl/include/openssl/e_os.h | 16 +- lib/dns/sec/openssl/include/openssl/err.h | 14 +- lib/dns/sec/openssl/include/openssl/lhash.h | 12 +- lib/dns/sec/openssl/include/openssl/rand.h | 12 +- .../sec/openssl/include/openssl/safestack.h | 2 +- lib/dns/sec/openssl/include/openssl/sha.h | 12 +- lib/dns/sec/openssl/include/openssl/stack.h | 12 +- lib/dns/sec/openssl/lhash.c | 18 +- lib/dns/sec/openssl/md32_common.h | 2 +- lib/dns/sec/openssl/md5_locl.h | 12 +- lib/dns/sec/openssl/mem.c | 12 +- lib/dns/sec/openssl/mem_dbg.c | 30 +- lib/dns/sec/openssl/rand_lib.c | 12 +- lib/dns/sec/openssl/sha1_one.c | 12 +- lib/dns/sec/openssl/sha1dgst.c | 12 +- lib/dns/sec/openssl/sha_locl.h | 24 +- lib/dns/sec/openssl/stack.c | 14 +- lib/dns/sec/openssl/th-lock.c | 12 +- lib/dns/sec/rename.h | 6 +- lib/dns/ssu.c | 8 +- lib/dns/tcpmsg.c | 6 +- lib/dns/time.c | 6 +- lib/dns/tkey.c | 6 +- lib/dns/tkeyconf.c | 6 +- lib/dns/tsig.c | 22 +- lib/dns/tsigconf.c | 8 +- lib/dns/ttl.c | 8 +- lib/dns/validator.c | 40 +- lib/dns/version.c | 6 +- lib/dns/view.c | 32 +- lib/dns/xfrin.c | 88 +- lib/dns/zone.c | 174 ++-- lib/dns/zoneconf.c | 28 +- lib/dns/zt.c | 12 +- lib/isc/Makefile.in | 6 +- lib/isc/assertions.c | 6 +- lib/isc/base64.c | 10 +- lib/isc/bitstring.c | 8 +- lib/isc/buffer.c | 10 +- lib/isc/bufferlist.c | 6 +- lib/isc/commandline.c | 6 +- lib/isc/error.c | 6 +- lib/isc/event.c | 8 +- lib/isc/fsaccess.c | 6 +- lib/isc/heap.c | 18 +- lib/isc/hmacmd5.c | 6 +- lib/isc/include/Makefile.in | 6 +- lib/isc/include/isc/Makefile.in | 6 +- lib/isc/include/isc/assertions.h | 6 +- lib/isc/include/isc/base64.h | 10 +- lib/isc/include/isc/bitstring.h | 6 +- lib/isc/include/isc/boolean.h | 6 +- lib/isc/include/isc/buffer.h | 8 +- lib/isc/include/isc/bufferlist.h | 6 +- lib/isc/include/isc/commandline.h | 6 +- lib/isc/include/isc/entropy.h | 8 +- lib/isc/include/isc/error.h | 6 +- lib/isc/include/isc/event.h | 12 +- lib/isc/include/isc/eventclass.h | 6 +- lib/isc/include/isc/file.h | 10 +- lib/isc/include/isc/formatcheck.h | 6 +- lib/isc/include/isc/fsaccess.h | 10 +- lib/isc/include/isc/heap.h | 8 +- lib/isc/include/isc/hmacmd5.h | 6 +- lib/isc/include/isc/interfaceiter.h | 12 +- lib/isc/include/isc/ipv6.h | 6 +- lib/isc/include/isc/lang.h | 6 +- lib/isc/include/isc/lex.h | 8 +- lib/isc/include/isc/lfsr.h | 6 +- lib/isc/include/isc/lib.h | 6 +- lib/isc/include/isc/list.h | 6 +- lib/isc/include/isc/log.h | 16 +- lib/isc/include/isc/magic.h | 6 +- lib/isc/include/isc/md5.h | 6 +- lib/isc/include/isc/mem.h | 6 +- lib/isc/include/isc/msgcat.h | 6 +- lib/isc/include/isc/mutexblock.h | 6 +- lib/isc/include/isc/netaddr.h | 8 +- lib/isc/include/isc/ondestroy.h | 12 +- lib/isc/include/isc/os.h | 6 +- lib/isc/include/isc/platform.h.in | 6 +- lib/isc/include/isc/print.h | 6 +- lib/isc/include/isc/quota.h | 8 +- lib/isc/include/isc/random.h | 6 +- lib/isc/include/isc/ratelimiter.h | 10 +- lib/isc/include/isc/region.h | 6 +- lib/isc/include/isc/result.h | 6 +- lib/isc/include/isc/resultclass.h | 6 +- lib/isc/include/isc/rwlock.h | 6 +- lib/isc/include/isc/serial.h | 6 +- lib/isc/include/isc/sha1.h | 10 +- lib/isc/include/isc/sockaddr.h | 6 +- lib/isc/include/isc/socket.h | 12 +- lib/isc/include/isc/stdio.h | 6 +- lib/isc/include/isc/string.h | 12 +- lib/isc/include/isc/symtab.h | 6 +- lib/isc/include/isc/task.h | 10 +- lib/isc/include/isc/taskpool.h | 14 +- lib/isc/include/isc/timer.h | 12 +- lib/isc/include/isc/types.h | 6 +- lib/isc/include/isc/util.h | 6 +- lib/isc/inet_aton.c | 16 +- lib/isc/inet_ntop.c | 10 +- lib/isc/inet_pton.c | 6 +- lib/isc/lex.c | 26 +- lib/isc/lfsr.c | 6 +- lib/isc/lib.c | 6 +- lib/isc/log.c | 28 +- lib/isc/md5.c | 8 +- lib/isc/mem.c | 26 +- lib/isc/mutexblock.c | 6 +- lib/isc/netaddr.c | 16 +- lib/isc/nls/Makefile.in | 6 +- lib/isc/nls/msgcat.c | 6 +- lib/isc/ondestroy.c | 14 +- lib/isc/print.c | 16 +- lib/isc/pthreads/Makefile.in | 6 +- lib/isc/pthreads/condition.c | 6 +- lib/isc/pthreads/include/Makefile.in | 6 +- lib/isc/pthreads/include/isc/Makefile.in | 6 +- lib/isc/pthreads/include/isc/condition.h | 6 +- lib/isc/pthreads/include/isc/mutex.h | 6 +- lib/isc/pthreads/include/isc/once.h | 6 +- lib/isc/pthreads/include/isc/thread.h | 6 +- lib/isc/pthreads/thread.c | 6 +- lib/isc/quota.c | 8 +- lib/isc/random.c | 8 +- lib/isc/ratelimiter.c | 16 +- lib/isc/result.c | 6 +- lib/isc/rwlock.c | 6 +- lib/isc/serial.c | 6 +- lib/isc/sha1.c | 6 +- lib/isc/sockaddr.c | 20 +- lib/isc/string.c | 10 +- lib/isc/symtab.c | 6 +- lib/isc/task.c | 28 +- lib/isc/taskpool.c | 12 +- lib/isc/timer.c | 26 +- lib/isc/unix/Makefile.in | 6 +- lib/isc/unix/app.c | 30 +- lib/isc/unix/dir.c | 10 +- lib/isc/unix/entropy.c | 8 +- lib/isc/unix/errno2result.c | 6 +- lib/isc/unix/errno2result.h | 6 +- lib/isc/unix/file.c | 20 +- lib/isc/unix/fsaccess.c | 6 +- lib/isc/unix/ifiter_ioctl.c | 62 +- lib/isc/unix/ifiter_sysctl.c | 54 +- lib/isc/unix/include/Makefile.in | 6 +- lib/isc/unix/include/isc/Makefile.in | 6 +- lib/isc/unix/include/isc/app.h | 6 +- lib/isc/unix/include/isc/dir.h | 6 +- lib/isc/unix/include/isc/int.h | 6 +- lib/isc/unix/include/isc/keyboard.h | 6 +- lib/isc/unix/include/isc/net.h | 6 +- lib/isc/unix/include/isc/netdb.h | 6 +- lib/isc/unix/include/isc/offset.h | 6 +- lib/isc/unix/include/isc/stdtime.h | 6 +- lib/isc/unix/include/isc/time.h | 6 +- lib/isc/unix/interfaceiter.c | 16 +- lib/isc/unix/ipv6.c | 6 +- lib/isc/unix/keyboard.c | 6 +- lib/isc/unix/net.c | 6 +- lib/isc/unix/os.c | 6 +- lib/isc/unix/socket.c | 20 +- lib/isc/unix/stdio.c | 16 +- lib/isc/unix/stdtime.c | 10 +- lib/isc/unix/time.c | 18 +- lib/isc/version.c | 6 +- lib/isc/win32/Makefile.in | 6 +- lib/isc/win32/condition.c | 14 +- lib/isc/win32/dir.c | 14 +- lib/isc/win32/file.c | 6 +- lib/isc/win32/fsaccess.c | 10 +- lib/isc/win32/include/Makefile.in | 6 +- lib/isc/win32/include/isc/Makefile.in | 6 +- lib/isc/win32/include/isc/condition.h | 8 +- lib/isc/win32/include/isc/dir.h | 6 +- lib/isc/win32/include/isc/int.h | 6 +- lib/isc/win32/include/isc/mutex.h | 6 +- lib/isc/win32/include/isc/net.h | 6 +- lib/isc/win32/include/isc/netdb.h | 6 +- lib/isc/win32/include/isc/once.h | 6 +- lib/isc/win32/include/isc/stdtime.h | 6 +- lib/isc/win32/include/isc/thread.h | 6 +- lib/isc/win32/include/isc/time.h | 6 +- lib/isc/win32/once.c | 10 +- lib/isc/win32/stdtime.c | 6 +- lib/isc/win32/thread.c | 8 +- lib/isc/win32/time.c | 12 +- lib/lwres/Makefile.in | 6 +- lib/lwres/assert_p.h | 6 +- lib/lwres/context.c | 6 +- lib/lwres/context_p.h | 6 +- lib/lwres/gai_strerror.c | 8 +- lib/lwres/getaddrinfo.c | 10 +- lib/lwres/gethost.c | 10 +- lib/lwres/getipnode.c | 16 +- lib/lwres/getnameinfo.c | 18 +- lib/lwres/herror.c | 10 +- lib/lwres/include/Makefile.in | 6 +- lib/lwres/include/lwres/Makefile.in | 6 +- lib/lwres/include/lwres/context.h | 6 +- lib/lwres/include/lwres/int.h | 6 +- lib/lwres/include/lwres/ipv6.h | 6 +- lib/lwres/include/lwres/lang.h | 6 +- lib/lwres/include/lwres/list.h | 6 +- lib/lwres/include/lwres/lwbuffer.h | 8 +- lib/lwres/include/lwres/lwpacket.h | 8 +- lib/lwres/include/lwres/lwres.h | 12 +- lib/lwres/include/lwres/net.h | 6 +- lib/lwres/include/lwres/netdb.h.in | 6 +- lib/lwres/include/lwres/platform.h.in | 6 +- lib/lwres/include/lwres/result.h | 6 +- lib/lwres/lwbuffer.c | 12 +- lib/lwres/lwconfig.c | 20 +- lib/lwres/lwinetaton.c | 16 +- lib/lwres/lwinetntop.c | 10 +- lib/lwres/lwinetpton.c | 6 +- lib/lwres/lwpacket.c | 6 +- lib/lwres/lwres_gabn.c | 6 +- lib/lwres/lwres_gnba.c | 8 +- lib/lwres/lwres_noop.c | 6 +- lib/lwres/lwresutil.c | 8 +- lib/lwres/man/lwres.3 | 36 +- lib/lwres/man/lwres_addr_parse.3 | 10 +- lib/lwres/man/lwres_buffer.3 | 28 +- lib/lwres/man/lwres_buffer_add.3 | 10 +- lib/lwres/man/lwres_buffer_back.3 | 10 +- lib/lwres/man/lwres_buffer_clear.3 | 10 +- lib/lwres/man/lwres_buffer_first.3 | 10 +- lib/lwres/man/lwres_buffer_forward.3 | 10 +- lib/lwres/man/lwres_buffer_getmem.3 | 10 +- lib/lwres/man/lwres_buffer_getuint16.3 | 10 +- lib/lwres/man/lwres_buffer_getuint32.3 | 10 +- lib/lwres/man/lwres_buffer_getuint8.3 | 10 +- lib/lwres/man/lwres_buffer_init.3 | 10 +- lib/lwres/man/lwres_buffer_invalidate.3 | 10 +- lib/lwres/man/lwres_buffer_putmem.3 | 10 +- lib/lwres/man/lwres_buffer_putuint16.3 | 10 +- lib/lwres/man/lwres_buffer_putuint32.3 | 10 +- lib/lwres/man/lwres_buffer_putuint8.3 | 10 +- lib/lwres/man/lwres_buffer_subtract.3 | 10 +- lib/lwres/man/lwres_conf_clear.3 | 10 +- lib/lwres/man/lwres_conf_get.3 | 10 +- lib/lwres/man/lwres_conf_init.3 | 10 +- lib/lwres/man/lwres_conf_parse.3 | 10 +- lib/lwres/man/lwres_conf_print.3 | 10 +- lib/lwres/man/lwres_config.3 | 16 +- lib/lwres/man/lwres_context.3 | 20 +- lib/lwres/man/lwres_context_allocmem.3 | 10 +- lib/lwres/man/lwres_context_create.3 | 10 +- lib/lwres/man/lwres_context_destroy.3 | 10 +- lib/lwres/man/lwres_context_freemem.3 | 10 +- lib/lwres/man/lwres_context_initserial.3 | 10 +- lib/lwres/man/lwres_context_nextserial.3 | 10 +- lib/lwres/man/lwres_context_sendrecv.3 | 10 +- lib/lwres/man/lwres_endhostent.3 | 10 +- lib/lwres/man/lwres_endhostent_r.3 | 10 +- lib/lwres/man/lwres_freeaddrinfo.3 | 10 +- lib/lwres/man/lwres_freehostent.3 | 10 +- lib/lwres/man/lwres_gabn.3 | 22 +- lib/lwres/man/lwres_gabnrequest_free.3 | 10 +- lib/lwres/man/lwres_gabnrequest_parse.3 | 10 +- lib/lwres/man/lwres_gabnrequest_render.3 | 10 +- lib/lwres/man/lwres_gabnresponse_free.3 | 10 +- lib/lwres/man/lwres_gabnresponse_parse.3 | 10 +- lib/lwres/man/lwres_gabnresponse_render.3 | 10 +- lib/lwres/man/lwres_gai_strerror.3 | 12 +- lib/lwres/man/lwres_getaddrinfo.3 | 34 +- lib/lwres/man/lwres_getaddrsbyname.3 | 10 +- lib/lwres/man/lwres_gethostbyaddr.3 | 10 +- lib/lwres/man/lwres_gethostbyaddr_r.3 | 10 +- lib/lwres/man/lwres_gethostbyname.3 | 10 +- lib/lwres/man/lwres_gethostbyname2.3 | 10 +- lib/lwres/man/lwres_gethostbyname_r.3 | 10 +- lib/lwres/man/lwres_gethostent.3 | 42 +- lib/lwres/man/lwres_gethostent_r.3 | 10 +- lib/lwres/man/lwres_getipnode.3 | 18 +- lib/lwres/man/lwres_getipnodebyaddr.3 | 10 +- lib/lwres/man/lwres_getipnodebyname.3 | 10 +- lib/lwres/man/lwres_getnamebyaddr.3 | 10 +- lib/lwres/man/lwres_getnameinfo.3 | 14 +- lib/lwres/man/lwres_gnba.3 | 18 +- lib/lwres/man/lwres_gnbarequest_free.3 | 10 +- lib/lwres/man/lwres_gnbarequest_parse.3 | 10 +- lib/lwres/man/lwres_gnbarequest_render.3 | 10 +- lib/lwres/man/lwres_gnbaresponse_free.3 | 10 +- lib/lwres/man/lwres_gnbaresponse_parse.3 | 10 +- lib/lwres/man/lwres_gnbaresponse_render.3 | 10 +- lib/lwres/man/lwres_herror.3 | 10 +- lib/lwres/man/lwres_hstrerror.3 | 14 +- lib/lwres/man/lwres_inetntop.3 | 14 +- lib/lwres/man/lwres_lwpacket_parseheader.3 | 10 +- lib/lwres/man/lwres_lwpacket_renderheader.3 | 10 +- lib/lwres/man/lwres_net_ntop.3 | 10 +- lib/lwres/man/lwres_noop.3 | 18 +- lib/lwres/man/lwres_nooprequest_free.3 | 10 +- lib/lwres/man/lwres_nooprequest_parse.3 | 10 +- lib/lwres/man/lwres_nooprequest_render.3 | 10 +- lib/lwres/man/lwres_noopresponse_free.3 | 10 +- lib/lwres/man/lwres_noopresponse_parse.3 | 10 +- lib/lwres/man/lwres_noopresponse_render.3 | 10 +- lib/lwres/man/lwres_packet.3 | 18 +- lib/lwres/man/lwres_resutil.3 | 22 +- lib/lwres/man/lwres_sethostent.3 | 10 +- lib/lwres/man/lwres_sethostent_r.3 | 10 +- lib/lwres/man/lwres_string_parse.3 | 10 +- lib/lwres/version.c | 6 +- lib/omapi/Makefile.in | 6 +- lib/omapi/auth.c | 8 +- lib/omapi/connection.c | 28 +- lib/omapi/data.c | 6 +- lib/omapi/generic.c | 18 +- lib/omapi/handle.c | 12 +- lib/omapi/include/Makefile.in | 6 +- lib/omapi/include/omapi/Makefile.in | 6 +- lib/omapi/include/omapi/compatibility.h | 8 +- lib/omapi/include/omapi/lib.h | 6 +- lib/omapi/include/omapi/omapi.h | 8 +- lib/omapi/include/omapi/private.h | 14 +- lib/omapi/include/omapi/result.h | 6 +- lib/omapi/include/omapi/types.h | 6 +- lib/omapi/lib.c | 6 +- lib/omapi/listener.c | 12 +- lib/omapi/message.c | 24 +- lib/omapi/object.c | 12 +- lib/omapi/protocol.c | 14 +- lib/omapi/result.c | 6 +- lib/omapi/string.c | 6 +- lib/omapi/value.c | 6 +- lib/omapi/version.c | 6 +- lib/tests/Makefile.in | 6 +- lib/tests/include/Makefile.in | 6 +- lib/tests/include/tests/Makefile.in | 6 +- lib/tests/include/tests/t_api.h | 6 +- lib/tests/t_api.c | 8 +- ltconfig | 22 +- ltmain.sh | 72 +- make/Makefile.in | 6 +- make/includes.in | 8 +- make/mkdep.in | 6 +- make/rules.in | 8 +- util/check-includes.pl | 8 +- util/check-instincludes.sh | 10 +- util/check-sources.pl | 6 +- util/kit.sh | 8 +- util/make-snapshot.sh | 6 +- util/memleak.pl | 6 +- util/merge_copyrights | 6 +- util/mkreslib.pl | 6 +- util/nanny.pl | 8 +- util/nt-kit | 10 +- util/sanitize.pl | 6 +- util/sanitize_all.sh | 6 +- util/update-drafts.pl | 8 +- 1259 files changed, 9274 insertions(+), 9274 deletions(-) diff --git a/CHANGES b/CHANGES index 3b5243eabc..47714c7946 100644 --- a/CHANGES +++ b/CHANGES @@ -58,7 +58,7 @@ * Shorten timeouts to match v8's behavior 344. [bug] When shutting down, lwresd sometimes tried - to shut down its client tasks twice, + to shut down its client tasks twice, triggering an assertion. 343. [bug] Although zone maintenance SOA queries and @@ -70,10 +70,10 @@ dns_name_dup() when generating a TSIG key using TKEY. - 341. [func] Support 'key' clause in named.conf zone masters + 341. [func] Support 'key' clause in named.conf zone masters statement: - masters { + masters { 10.0.0.1 port 666 key "foo"; 10.0.0.2 ; }; @@ -130,16 +130,16 @@ response after a number of retransmissions. This is to allow queries some chance of succeeding even if all the authoritative servers of a zone - silently discard EDNS0 requests instead of + silently discard EDNS0 requests instead of sending an error response like they ought to. 323. [bug] dns_rbt_findname() did not ignore empty rbt nodes. - Because of this, servers authoritative for a parent + Because of this, servers authoritative for a parent and grandchild zone but not authoritative for the intervening child zone did not correctly issue referrals to the servers of the child zone. - 322. [bug] Queries for KEY RRs are now sent to the parent + 322. [bug] Queries for KEY RRs are now sent to the parent server before the authoritative one, making DNSSEC insecurity proofs work in many cases where they previously didn't. @@ -169,7 +169,7 @@ 315. [bug] Handle non-empty blanks lines. (RT #163) - 314. [func] The named.conf controls statement can now have + 314. [func] The named.conf controls statement can now have more than one key specified for the inet clause. 313. [bug] When parsing resolv.conf, don't terminate on an @@ -197,7 +197,7 @@ - allow "port xxx" to be left out of statement, in which case it defaults to omapi's default port of 953. - + 309. [bug] When sending a referral, the server did not look for name server addresses as glue in the zone holding the NS RRset in the case where this zone @@ -217,7 +217,7 @@ 306. [bug] Reading HMAC-MD5 private key files didn't work. - 305. [bug] When reloading the server with a config file + 305. [bug] When reloading the server with a config file containing a syntax error, it could catch an assertion failure trying to perform zone maintenance on tentatively created zones whose @@ -231,7 +231,7 @@ 303. [bug] Add additional sanity checks to differentiate a AXFR response vs a IXFR response. (RT #157) - 302. [bug] In dig, host, and nslookup, MXNAME should be large + 302. [bug] In dig, host, and nslookup, MXNAME should be large enough to hold any legal domain name in presentation format + terminating NULL. @@ -300,7 +300,7 @@ disabled until named supports the "controls" statement, post-9.0.0. - 286. [bug] On Solaris 2, when named inherited a signal state + 286. [bug] On Solaris 2, when named inherited a signal state where SIGHUP had the SIG_IGN action, SIGHUP would be ignored rather than causing the server to reload its configuration. @@ -315,7 +315,7 @@ 283. [cleanup] The 'lwresd' program is now a link to 'named'. - 282. [bug] The lexer now returns ISC_R_RANGE if parsed integer is + 282. [bug] The lexer now returns ISC_R_RANGE if parsed integer is too big for an unsigned long. 281. [bug] Fixed list of recognized config file category names. @@ -342,7 +342,7 @@ 276. [bug] dig now supports maximum sized TCP messages. - 275. [bug] The definition of lwres_gai_strerror() was missing + 275. [bug] The definition of lwres_gai_strerror() was missing the lwres_ prefix. 274. [bug] TSIG AXFR verify failed when talking to a BIND 8 @@ -368,7 +368,7 @@ failure by causing clone_results() to be called with with hevent->node == NULL. - 268. [doc] A plain text version of the Administrator + 268. [doc] A plain text version of the Administrator Reference Manual is now included in the distribution, as doc/arm/Bv9ARM.txt. @@ -478,14 +478,14 @@ 237. [bug] If connect() returned ENOBUFS when the resolver was initiating a TCP query, the socket didn't get - destroyed, and the server did not shut down cleanly. + destroyed, and the server did not shut down cleanly. 236. [func] Added new listen-on-v6 config file statement. - 235. [func] Consider it a config file error if a listen-on - statement has an IPv6 address in it, or a + 235. [func] Consider it a config file error if a listen-on + statement has an IPv6 address in it, or a listen-on-v6 statement has an IPv4 address in it. - + 234. [bug] Allow a trusted-key's first field (domain-name) be either a quoted or an unquoted string, instead of requiring a quoted string. @@ -502,11 +502,11 @@ 230. [func] Replace the dst sign/verify API with a cleaner one. - 229. [func] Support config file sig-validity-interval statement - in options, views and zone statements (master + 229. [func] Support config file sig-validity-interval statement + in options, views and zone statements (master zones only). - 228. [cleanup] Logging messages in config module stripped of + 228. [cleanup] Logging messages in config module stripped of trailing period. 227. [cleanup] The enumerated identifiers dns_rdataclass_*, @@ -552,7 +552,7 @@ 217. [func] Also-notify and trusted-keys can now be used in the 'view' statement. - 216. [func] The 'max-cache-ttl' and 'max-ncache-ttl' options + 216. [func] The 'max-cache-ttl' and 'max-ncache-ttl' options now work. 215. [bug] Failures at certain points in request processing @@ -639,14 +639,14 @@ 193. [func] changed dst_key_free() prototype. - 192. [bug] Zone configuration validation is now done at end + 192. [bug] Zone configuration validation is now done at end of config file parsing, and before loading callbacks. 191. [func] Patched to compile on UnixWare 7.x. This platform is not directly supported by the ISC. - 190. [cleanup] The DNSSEC tools have been moved to a separate + 190. [cleanup] The DNSSEC tools have been moved to a separate directory dnssec/ and given the following new, more descriptive names: @@ -714,7 +714,7 @@ to comment out the entire zone statement. 176. [func] New global and per-view option: - + max-cache-ttl number 175. [func] New global and per-view option: @@ -728,7 +728,7 @@ quota so that a new transfer can be dispatched immediately whenever quota becomes available. - 172. [bug] $TTL directive was sometimes missing from dumped + 172. [bug] $TTL directive was sometimes missing from dumped master files because totext_ctx_init() failed to initialize ctx->current_ttl_valid. @@ -800,7 +800,7 @@ 153. [func] dns_rdata_tostruct() 'mctx' is now optional. If 'mctx' is NULL then you need to preserve the 'rdata' until you have finished using the structure as there may be - references to the associated memory. If 'mctx' is + references to the associated memory. If 'mctx' is non-NULL it is guaranteed that there are no references to memory associated with 'rdata'. @@ -815,7 +815,7 @@ come after the 'type' clause. 150. [func] Support optional ports in masters and also-notify - statements: + statements: masters [ port xxx ] { y.y.y.y [ port zzz ] ; } @@ -936,7 +936,7 @@ are replaced by dns_zone_setnotifyalso(). dns_zone_clearmasters() and dns_zone_addmaster() are replaced by dns_zone_setmasters(). - + 116. [func] Added for isc_offset_t (aka off_t on Unix systems). @@ -1018,7 +1018,7 @@ . isc_random_t moved to . 99. [cleanup] Rate limiter now has separate shutdown() and - destroy() functions, and it guarantees that all + destroy() functions, and it guarantees that all queued events are delivered even in the shutdown case. 98. [cleanup] does not need or @@ -1082,7 +1082,7 @@ consistency with other *_test programs. 77. [cleanup] typedef of isc_time_t and isc_interval_t moved from - to . + to . 76. [cleanup] Rewrote keygen. @@ -1200,12 +1200,12 @@ 40. [func] Introduced new logging category "dnssec" and logging module "dns/validator". - 39. [cleanup] Moved the typedefs for isc_region_t, isc_textregion_t, + 39. [cleanup] Moved the typedefs for isc_region_t, isc_textregion_t, and isc_lex_t to . 38. [bug] TSIG signed incoming zone transfers work now. - 37. [bug] If the first RR in an incoming zone transfer was + 37. [bug] If the first RR in an incoming zone transfer was not an SOA, the server died with an assertion failure instead of just reporting an error. @@ -1224,7 +1224,7 @@ 31. [bug] Use ${LIBTOOL} to compile bin/named/main.@O@. - 30. [func] config file grammer change to support optional + 30. [func] config file grammer change to support optional class type for a view. 29. [func] support new config file view options: @@ -1237,9 +1237,9 @@ fetch-glue notify rfc2308-type1 lame-ttl max-ncache-ttl min-roots - 28. [func] support lame-ttl, min-roots and serial-queries + 28. [func] support lame-ttl, min-roots and serial-queries config global options. - + 27. [bug] Only include on BSD/OS 4.[01]*. Including it on other platforms (eg, NetBSD) can cause a forced #error from the C preprocessor. @@ -1276,7 +1276,7 @@ 17. [func] Do configuration file post-load validation of zones. - 16. [bug] put quotes around key names on config file + 16. [bug] put quotes around key names on config file output to avoid possible keyword clashes. 15. [func] Add dns_name_dupwithoffsets(). This function is @@ -1306,11 +1306,11 @@ 7. [cleanup] removed 'listen-on' from view statement. - 6. [bug] quote RR names when generating config file to - prevent possible clash with config file keywords + 6. [bug] quote RR names when generating config file to + prevent possible clash with config file keywords (such as 'key'). - 5. [func] syntax change to named.conf file: new ssu grant/deny + 5. [func] syntax change to named.conf file: new ssu grant/deny statements must now be enclosed by an 'update-policy' block. diff --git a/Makefile.in b/Makefile.in index 2fa894cc3d..4a6c1ed945 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,9 +1,9 @@ # Copyright (C) 1998-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 # 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 @@ -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.28 2000/07/27 09:36:18 tale Exp $ +# $Id: Makefile.in,v 1.29 2000/08/01 01:10:53 tale Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/README b/README index 1eeee24fcf..89092bfa2f 100644 --- a/README +++ b/README @@ -73,7 +73,7 @@ BIND 9.1.0a1 This is an unreleased alpha version of BIND 9.1.0. For a detailed list of user-visible changes from - previous releases, see the CHANGES file. + previous releases, see the CHANGES file. Building @@ -124,7 +124,7 @@ Building If your operating system has integrated support for IPv6, it will be used automatically. If you have installed KAME IPv6 separately, use "--with-kame[=PATH]" to specify its location. - + To see additional configure options, run "configure --help". "make install" will install "named" and the various BIND 9 libraries. @@ -171,7 +171,7 @@ Bug Reports and Mailing Lists to stderr, ignoring any "logging" statement in in the config file. - -n + -n -t Chroot to before running. diff --git a/acconfig.h b/acconfig.h index c429ce91ed..6c13ddd909 100644 --- a/acconfig.h +++ b/acconfig.h @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: acconfig.h,v 1.24 2000/07/27 09:36:19 tale Exp $ */ +/* $Id: acconfig.h,v 1.25 2000/08/01 01:10:56 tale Exp $ */ /*** *** This file is not to be included by any public header files, because diff --git a/bin/Makefile.in b/bin/Makefile.in index 3bf8f5b811..7046c91848 100644 --- a/bin/Makefile.in +++ b/bin/Makefile.in @@ -1,9 +1,9 @@ # Copyright (C) 1998-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 # 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 @@ -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.18 2000/07/27 09:36:24 tale Exp $ +# $Id: Makefile.in,v 1.19 2000/08/01 01:11:11 tale Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in index 518907b62b..bf0aa88aba 100644 --- a/bin/dig/Makefile.in +++ b/bin/dig/Makefile.in @@ -1,9 +1,9 @@ # 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 # 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 @@ -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.12 2000/07/27 09:36:25 tale Exp $ +# $Id: Makefile.in,v 1.13 2000/08/01 01:11:12 tale Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -25,7 +25,7 @@ top_srcdir = @top_srcdir@ CINCLUDES = -I${srcdir}/include ${DNS_INCLUDES} ${ISC_INCLUDES} -CDEFINES = +CDEFINES = CWARNINGS = DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@ @@ -44,7 +44,7 @@ TARGETS = dig host nslookup OBJS = dig.@O@ dighost.@O@ host.@O@ nslookup.@O@ -UOBJS = +UOBJS = SRCS = dig.c dighost.c host.c nslookup.c diff --git a/bin/dig/dig.c b/bin/dig/dig.c index d553d90561..f058156a57 100644 --- a/bin/dig/dig.c +++ b/bin/dig/dig.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dig.c,v 1.81 2000/08/01 00:53:16 mws Exp $ */ +/* $Id: dig.c,v 1.82 2000/08/01 01:11:14 tale Exp $ */ #include #include @@ -175,7 +175,7 @@ show_usage(void) { " global d-opts and servers (before host name) affect all queries.\n" " local d-opts and servers (after host name) affect only that lookup.\n" , stderr); -} +} /* * Callback from dighost.c to print the received message. @@ -189,7 +189,7 @@ received(int bytes, int frmsize, char *frm, dig_query_t *query) { result = isc_time_now(&now); check_result(result, "isc_time_now"); - + if (query->lookup->stats) { diff = isc_time_microdiff(&now, &query->time_sent); printf(";; Query time: %ld msec\n", (long int)diff/1000); @@ -202,7 +202,7 @@ received(int bytes, int frmsize, char *frm, dig_query_t *query) { query->name_count, query->rr_count); } else { printf(";; MSG SIZE rcvd: %d\n", bytes); - + } if (key != NULL) { if (!validated) @@ -279,7 +279,7 @@ short_answer(dns_message_t *msg, dns_messagetextflag_t flags, dns_name_t empty_name; char t[4096]; dns_rdata_t rdata; - + UNUSED(flags); dns_name_init(&empty_name, NULL); @@ -313,7 +313,7 @@ short_answer(dns_message_t *msg, dns_messagetextflag_t flags, else if (result != ISC_R_SUCCESS) return (result); } - + return (ISC_R_SUCCESS); } @@ -377,7 +377,7 @@ printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) { if ((msg->flags & DNS_MESSAGEFLAG_TC) != 0) { printf("%stc", did_flag ? " " : ""); did_flag = ISC_TRUE; - } + } if ((msg->flags & DNS_MESSAGEFLAG_RD) != 0) { printf("%srd", did_flag ? " " : ""); did_flag = ISC_TRUE; @@ -394,7 +394,7 @@ printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) { printf("%scd", did_flag ? " " : ""); did_flag = ISC_TRUE; } - + printf("; QUERY: %u, ANSWER: %u, " "AUTHORITY: %u, ADDITIONAL: %u\n", msg->counts[DNS_SECTION_QUESTION], @@ -405,7 +405,7 @@ printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) { result = dns_message_pseudosectiontotext(msg, DNS_PSEUDOSECTION_OPT, flags, buf); - check_result(result, + check_result(result, "dns_message_pseudosectiontotext"); } } @@ -425,7 +425,7 @@ printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) { } check_result(result, "dns_message_sectiontotext"); } - } + } if (query->lookup->section_answer) { if (!short_form) { answer_again: @@ -444,7 +444,7 @@ printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) { result = short_answer(msg, flags, buf, query); check_result(result, "short_answer"); } - } + } if (query->lookup->section_authority) { if (!short_form) { authority_again: @@ -460,7 +460,7 @@ printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) { } check_result(result, "dns_message_sectiontotext"); } - } + } if (query->lookup->section_additional) { if (!short_form) { additional_again: @@ -489,12 +489,12 @@ printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) { msg, DNS_PSEUDOSECTION_SIG0, flags, buf); - + check_result(result, "dns_message_pseudosectiontotext"); } } - } + } if (headers && query->lookup->comments && !short_form) printf("\n"); @@ -627,10 +627,10 @@ parse_args(isc_boolean_t is_batchfile, isc_boolean_t config_only, bargc++; bargv[bargc] = strtok(NULL, " \t\r\n"); } - + bargv[0] = argv[0]; argv0 = argv[0]; - + reorder_args(bargc, (char **)bargv); parse_args(ISC_TRUE, ISC_TRUE, bargc, (char **)bargv); @@ -646,7 +646,7 @@ parse_args(isc_boolean_t is_batchfile, isc_boolean_t config_only, rv = argv; for (rc--, rv++; rc > 0; rc--, rv++) { debug("main parsing %s", rv[0]); - if (strncmp(rv[0], "%", 1) == 0) + if (strncmp(rv[0], "%", 1) == 0) break; if (strncmp(rv[0], "@", 1) == 0) { srv = make_server(&rv[0][1]); @@ -871,7 +871,7 @@ parse_args(isc_boolean_t is_batchfile, isc_boolean_t config_only, tr.length = strlen(ptr); if (strncmp(rv[0], "ixfr=", 5) == 0) { lookup->rdtype = dns_rdatatype_ixfr; - lookup->ixfr_serial = + lookup->ixfr_serial = atoi(&rv[0][5]); } else { result = dns_rdatatype_fromtext(&rdtype, @@ -934,7 +934,7 @@ parse_args(isc_boolean_t is_batchfile, isc_boolean_t config_only, } strncpy(keyfile, ptr, MXNAME); } else if (strncmp(rv[0], "-p", 2) == 0) { - if (rv[0][2] != 0) { + if (rv[0][2] != 0) { port = atoi(&rv[0][2]); } else { if (rc <= 1) { @@ -983,7 +983,7 @@ parse_args(isc_boolean_t is_batchfile, isc_boolean_t config_only, &adrs[2], &adrs[3]); if (n == 0) show_usage(); - + lookup = clone_lookup(default_lookup, ISC_TRUE); for (i = n - 1; i >= 0; i--) { @@ -1005,13 +1005,13 @@ parse_args(isc_boolean_t is_batchfile, isc_boolean_t config_only, rc--; } else { /* - * Anything which isn't an option + * Anything which isn't an option */ tr.base = rv[0]; tr.length = strlen(rv[0]); if (strncmp(rv[0], "ixfr=", 5) == 0) { lookup->rdtype = dns_rdatatype_ixfr; - lookup->ixfr_serial = + lookup->ixfr_serial = atoi(&rv[0][5]); continue; } @@ -1042,7 +1042,7 @@ parse_args(isc_boolean_t is_batchfile, isc_boolean_t config_only, /* XXX Error message */ } } - /* + /* * If we have a batchfile, seed the lookup list with the * first entry, then trust the callback in dighost_shutdown * to get the rest @@ -1098,7 +1098,7 @@ dighost_shutdown(void) { char batchline[MXNAME]; int bargc; char *bargv[16]; - + if (batchname == NULL) { isc_app_shutdown(); @@ -1120,9 +1120,9 @@ dighost_shutdown(void) { bargc++; bargv[bargc] = strtok(NULL, " \t\r\n"); } - + bargv[0] = argv0; - + reorder_args(bargc, (char **)bargv); parse_args(ISC_TRUE, ISC_FALSE, bargc, (char **)bargv); start_lookup(); @@ -1159,7 +1159,7 @@ main(int argc, char **argv) { s, default_lookup); s2 = s; s = ISC_LIST_NEXT(s, link); - ISC_LIST_DEQUEUE(default_lookup->my_server_list, + ISC_LIST_DEQUEUE(default_lookup->my_server_list, (dig_server_t *)s2, link); isc_mem_free(mctx, s2); } diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c index 2dfa8e7d40..be5c3f7a9a 100644 --- a/bin/dig/dighost.c +++ b/bin/dig/dighost.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dighost.c,v 1.105 2000/08/01 00:53:18 mws Exp $ */ +/* $Id: dighost.c,v 1.106 2000/08/01 01:11:15 tale Exp $ */ /* * Notice to programmers: Do not use this code as an example of how to @@ -171,7 +171,7 @@ fatal(const char *format, ...) { va_list args; fprintf(stderr, "%s: ", progname); - va_start(args, format); + va_start(args, format); vfprintf(stderr, format, args); va_end(args); fprintf(stderr, "\n"); @@ -185,7 +185,7 @@ debug(const char *format, ...) { va_list args; if (debugging) { - va_start(args, format); + va_start(args, format); vfprintf(stderr, format, args); va_end(args); fprintf(stderr, "\n"); @@ -220,12 +220,12 @@ make_server(const char *servname) { return (srv); } -/* +/* * Produce a cloned server list. The dest list must have already had * ISC_LIST_INIT applied. */ void -clone_server_list(dig_serverlist_t src, +clone_server_list(dig_serverlist_t src, dig_serverlist_t *dest) { dig_server_t *srv, *newsrv; @@ -368,10 +368,10 @@ requeue_lookup(dig_lookup_t *lookold, isc_boolean_t servers) { lookold, lookold->link.next, looknew, looknew->link.next); ISC_LIST_PREPEND(lookup_list, looknew, link); debug("after insertion, init -> " - "%p, new = %p, new -> %p", + "%p, new = %p, new -> %p", lookold, looknew, looknew->link.next); return (looknew); -} +} static void @@ -403,7 +403,7 @@ setup_text_key(void) { } secretsize = isc_buffer_usedlength(&secretbuf); isc_stdtime_get(&now); - + result = dns_name_fromtext(&keyname, namebuf, dns_rootname, ISC_FALSE, namebuf); @@ -436,7 +436,7 @@ setup_file_key(void) { dst_key_t *dstkey = NULL; isc_stdtime_t now; - + debug("setup_file_key()"); result = dst_key_fromnamedfile(keyfile, DST_TYPE_PRIVATE, mctx, &dstkey); @@ -489,7 +489,7 @@ setup_system(void) { dig_server_t *srv; dig_searchlist_t *search; isc_boolean_t get_servers; - + debug("setup_system()"); if (fixeddomain[0] != 0) { @@ -547,7 +547,7 @@ setup_system(void) { fatal("Memory " "allocation " "failure in %s:" - "%d", __FILE__, + "%d", __FILE__, __LINE__); strncpy(search-> origin, @@ -570,7 +570,7 @@ setup_system(void) { fatal("Memory " "allocation " "failure in %s:" - "%d", __FILE__, + "%d", __FILE__, __LINE__); strncpy(search-> origin, @@ -600,7 +600,7 @@ setup_system(void) { else if (keysecret[0] != 0) setup_text_key(); } - + /* * Setup the ISC and DNS libraries for use by the system. */ @@ -679,7 +679,7 @@ add_opt(dns_message_t *msg, isc_uint16_t udpsize) { check_result(result, "dns_message_gettemprdatalist"); result = dns_message_gettemprdata(msg, &rdata); check_result(result, "dns_message_gettemprdata"); - + debug("setting udp size of %d", udpsize); rdatalist->type = dns_rdatatype_opt; rdatalist->covers = 0; @@ -695,7 +695,7 @@ add_opt(dns_message_t *msg, isc_uint16_t udpsize) { } /* - * Add a question section to a message, asking for the specified name, + * Add a question section to a message, asking for the specified name, * type, and class. */ static void @@ -705,7 +705,7 @@ add_question(dns_message_t *message, dns_name_t *name, dns_rdataset_t *rdataset; isc_result_t result; - debug("add_question()"); + debug("add_question()"); rdataset = NULL; result = dns_message_gettemprdataset(message, &rdataset); check_result(result, "dns_message_gettemprdataset()"); @@ -767,7 +767,7 @@ clear_query(dig_query_t *query) { isc_buffer_invalidate(&query->lengthbuf); isc_mem_free(mctx, query); } - + /* * Try and clear out a lookup if we're done with it. Return ISC_TRUE if * the lookup was successfully cleared. If ISC_TRUE is returned, the @@ -805,7 +805,7 @@ try_clear_lookup(dig_lookup_t *lookup) { s, lookup); ptr = s; s = ISC_LIST_NEXT(s, link); - ISC_LIST_DEQUEUE(lookup->my_server_list, + ISC_LIST_DEQUEUE(lookup->my_server_list, (dig_server_t *)ptr, link); isc_mem_free(mctx, ptr); } @@ -817,13 +817,13 @@ try_clear_lookup(dig_lookup_t *lookup) { } if (lookup->timer != NULL) isc_timer_detach(&lookup->timer); - if (lookup->sendspace != NULL) + if (lookup->sendspace != NULL) isc_mempool_put(commctx, lookup->sendspace); - + isc_mem_free(mctx, lookup); return (ISC_TRUE); -} - +} + /* * If we can, start the next lookup in the queue running. @@ -862,11 +862,11 @@ start_lookup(void) { */ static void check_next_lookup(dig_lookup_t *lookup) { - + INSIST(!free_now); debug("check_next_lookup(%p)", lookup); - + if (ISC_LIST_HEAD(lookup->q) != NULL) { debug("still have a worker"); return; @@ -899,7 +899,7 @@ followup_lookup(dns_message_t *msg, dig_query_t *query, INSIST(!free_now); - debug("followup_lookup()"); + debug("followup_lookup()"); result = dns_message_firstname(msg,section); if (result != ISC_R_SUCCESS) { @@ -1005,7 +1005,7 @@ next_origin(dns_message_t *msg, dig_query_t *query) { INSIST(!free_now); - debug("next_origin()"); + debug("next_origin()"); debug("following up %s", query->lookup->textname); if (!usesearch) @@ -1038,7 +1038,7 @@ insert_soa(dig_lookup_t *lookup) { dns_rdatalist_t *rdatalist = NULL; dns_rdataset_t *rdataset = NULL; dns_name_t *soaname = NULL; - + debug("insert_soa()"); soa.mctx = mctx; soa.serial = lookup->ixfr_serial; @@ -1054,7 +1054,7 @@ insert_soa(dig_lookup_t *lookup) { dns_name_clone(lookup->name, &soa.origin); dns_name_clone(lookup->name, &soa.mname); - + isc_buffer_init(&lookup->rdatabuf, lookup->rdatastore, sizeof(lookup->rdatastore)); @@ -1068,7 +1068,7 @@ insert_soa(dig_lookup_t *lookup) { result = dns_message_gettemprdatalist(lookup->sendmsg, &rdatalist); check_result(result, "dns_message_gettemprdatalist"); - + result = dns_message_gettemprdataset(lookup->sendmsg, &rdataset); check_result(result, "dns_message_gettemprdataset"); @@ -1107,10 +1107,10 @@ setup_lookup(dig_lookup_t *lookup) { isc_region_t r; isc_buffer_t b; char store[MXNAME]; - + REQUIRE(lookup != NULL); INSIST(!free_now); - + debug("setup_lookup(%p)", lookup); result = dns_message_create(mctx, DNS_MESSAGE_INTENTRENDER, @@ -1176,7 +1176,7 @@ setup_lookup(dig_lookup_t *lookup) { isc_buffer_init(&b, lookup->textname, len); isc_buffer_add(&b, len); result = dns_name_fromtext(lookup->name, &b, - lookup->oname, ISC_FALSE, + lookup->oname, ISC_FALSE, &lookup->namebuf); } if (result != ISC_R_SUCCESS) { @@ -1209,7 +1209,7 @@ setup_lookup(dig_lookup_t *lookup) { "(%s)", lookup->textname, dns_result_totext(result)); } - } + } isc_buffer_init(&b, store, sizeof(store)); /* XXX Move some of this into function, dns_name_format. */ dns_name_totext(lookup->name, ISC_FALSE, &b); @@ -1234,7 +1234,7 @@ setup_lookup(dig_lookup_t *lookup) { debug("AA query"); lookup->sendmsg->flags |= DNS_MESSAGEFLAG_AA; } - + if (lookup->adflag) { debug("AD query"); lookup->sendmsg->flags |= DNS_MESSAGEFLAG_AD; @@ -1402,7 +1402,7 @@ send_udp(dig_lookup_t *lookup, isc_boolean_t make_recv) { /* * If the timer already exists, that means we're calling this - * a second time (for a retry). Don't need to recreate it, + * a second time (for a retry). Don't need to recreate it, * just reset it. */ if (lookup->timer == NULL) { @@ -1503,7 +1503,7 @@ connect_timeout(isc_task_t *task, isc_event_t *event) { * packets. Start the next recv of length bytes. */ static void -tcp_length_done(isc_task_t *task, isc_event_t *event) { +tcp_length_done(isc_task_t *task, isc_event_t *event) { isc_socketevent_t *sevent; isc_buffer_t *b=NULL; isc_region_t r; @@ -1520,7 +1520,7 @@ tcp_length_done(isc_task_t *task, isc_event_t *event) { debug("tcp_length_done()"); LOCK_LOOKUP; - sevent = (isc_socketevent_t *)event; + sevent = (isc_socketevent_t *)event; query = event->ev_arg; recvcount--; @@ -1577,7 +1577,7 @@ tcp_length_done(isc_task_t *task, isc_event_t *event) { recv_done, query); check_result(result, "isc_socket_recvv"); recvcount++; - debug("resubmitted recv request with length %d, recvcount=%d", + debug("resubmitted recv request with length %d, recvcount=%d", length, recvcount); isc_event_free(&event); UNLOCK_LOOKUP; @@ -1641,7 +1641,7 @@ launch_next_query(dig_query_t *query, isc_boolean_t include_question) { #endif return; } - + /* * Event handler for TCP connect complete. Make sure the connection was * successful, then pass into launch_next_query to actually send the @@ -1735,7 +1735,7 @@ check_for_more_data(dig_query_t *query, dns_message_t *msg, * rr's in the message, acting as necessary whenever we hit * an SOA rr. */ - + result = dns_message_firstname(msg, DNS_SECTION_ANSWER); if (result != ISC_R_SUCCESS) { puts("; Transfer failed."); @@ -1904,7 +1904,7 @@ recv_done(isc_task_t *task, isc_event_t *event) { dig_lookup_t *n, *l; isc_boolean_t docancel = ISC_FALSE; unsigned int local_timeout; - + UNUSED(task); INSIST(!free_now); @@ -1930,7 +1930,7 @@ recv_done(isc_task_t *task, isc_event_t *event) { debug("no longer pending. Got %s", isc_result_totext(sevent->result)); query->waiting_connect = ISC_FALSE; - + isc_event_free(&event); clear_query(query); check_next_lookup(l); @@ -1944,7 +1944,7 @@ recv_done(isc_task_t *task, isc_event_t *event) { result = dns_message_create(mctx, DNS_MESSAGE_INTENTPARSE, &msg); check_result(result, "dns_message_create"); - + if (key != NULL) { if (l->querysig == NULL) { debug("getting initial querysig"); @@ -1960,7 +1960,7 @@ recv_done(isc_task_t *task, isc_event_t *event) { result = dns_message_settsigkey(msg, key); check_result(result, "dns_message_settsigkey"); msg->tsigctx = l->tsigctx; - if (l->msgcounter != 0) + if (l->msgcounter != 0) msg->tcp_continuation = 1; l->msgcounter++; } @@ -2025,7 +2025,7 @@ recv_done(isc_task_t *task, isc_event_t *event) { local_timeout = INT_MAX; } debug("have local timeout of %d", - local_timeout); + local_timeout); isc_interval_set(&l->interval, local_timeout, 0); result = isc_timer_reset(l->timer, @@ -2103,7 +2103,7 @@ recv_done(isc_task_t *task, isc_event_t *event) { !l->trace_root ) { printmessage(query, msg, ISC_TRUE); } - + if (l->pending) debug("still pending."); if (l->doing_xfr) { @@ -2349,7 +2349,7 @@ cancel_all(void) { dig_query_t *q; debug("cancel_all()"); - + LOCK_LOOKUP; if (free_now) { UNLOCK_LOOKUP; @@ -2381,7 +2381,7 @@ cancel_all(void) { } /* - * Destroy all of the libs we are using, and get everything ready for a + * Destroy all of the libs we are using, and get everything ready for a * clean shutdown. */ void @@ -2461,5 +2461,5 @@ destroy_libs(void) { if (isc_mem_debugging != 0) isc_mem_stats(mctx, stderr); if (mctx != NULL) - isc_mem_destroy(&mctx); + isc_mem_destroy(&mctx); } diff --git a/bin/dig/host.1 b/bin/dig/host.1 index 487d37ed52..c9f2477575 100644 --- a/bin/dig/host.1 +++ b/bin/dig/host.1 @@ -1,9 +1,9 @@ .\" 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 .\" 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 @@ -12,9 +12,9 @@ .\" 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: host.1,v 1.2 2000/07/27 09:42:26 tale Exp $ -.\" +.\" +.\" $Id: host.1,v 1.3 2000/08/01 01:18:42 tale Exp $ +.\" .Dd Jun 30, 2000 .Dt HOST 1 .Os BIND9 9 @@ -42,7 +42,7 @@ prints a short summary of its command line arguments and options. .Pp .Ar name is the domain name that is to be looked up. -It can also be a dotted-decimal string representing an IPv4 address, +It can also be a dotted-decimal string representing an IPv4 address, in which case .Nm host will by default perform a reverse lookup for that address. @@ -57,7 +57,7 @@ The .Fl a (all) option is equivalent to setting the .Fl v -option and asking +option and asking .Nm host to make a query of type ANY. .Pp @@ -96,7 +96,7 @@ enabled verbose output. List mode is selected by the .Fl l option. -This makes +This makes .Nm host perform a zone transfer for zone .Ar name . @@ -115,7 +115,7 @@ the BIND9 implementation does not append domain names from the .Dv domain or .Dv search -directives in +directives in .Pa /etc/resolv.conf . Therefore .Ar name @@ -166,7 +166,7 @@ The option is used to select the query type. .Ar type can be any recognised query type: CNAME, NS, SOA, SIG, KEY, AXFR, etc. -When no query type is specified, +When no query type is specified, .Nm host automatically selects an appropriate query type. By default it looks for A records unless the @@ -187,7 +187,7 @@ The .Fl W option makes .Nm host -wait for +wait for .Ar wait seconds. If diff --git a/bin/dig/host.c b/bin/dig/host.c index 9b53dd9239..3002cc23d0 100644 --- a/bin/dig/host.c +++ b/bin/dig/host.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: host.c,v 1.44 2000/07/27 09:36:29 tale Exp $ */ +/* $Id: host.c,v 1.45 2000/08/01 01:11:16 tale Exp $ */ #include #include @@ -59,7 +59,7 @@ extern isc_taskmgr_t *taskmgr; extern char *progname; extern isc_task_t *global_task; -isc_boolean_t +isc_boolean_t short_form = ISC_TRUE; static const char *opcodetext[] = { @@ -109,7 +109,7 @@ static const char *rtypetext[] = { "MF", /* 4 */ "is an alias for", /* 5 */ "SOA", /* 6 */ - "MB", /* 7 */ + "MB", /* 7 */ "MG", /* 8 */ "MR", /* 9 */ "NULL", /* 10 */ @@ -226,7 +226,7 @@ show_usage(void) { " -w specifies to wait forever for a reply\n" " -W specifies how long to wait for a reply\n", stderr); exit(exitcode); -} +} void dighost_shutdown(void) { @@ -301,7 +301,7 @@ printsection(dns_message_t *msg, dns_section_t sectionid, isc_boolean_t first; isc_boolean_t no_rdata; const char *rtt; - + if (sectionid == DNS_SECTION_QUESTION) no_rdata = ISC_TRUE; else @@ -345,7 +345,7 @@ printsection(dns_message_t *msg, dns_section_t sectionid, #else UNUSED(first); /* Shut up compiler. */ #endif - } else { + } else { loopresult = dns_rdataset_first(rdataset); while (loopresult == ISC_R_SUCCESS) { dns_rdataset_current(rdataset, &rdata); @@ -372,14 +372,14 @@ printsection(dns_message_t *msg, dns_section_t sectionid, else printf("%.*s", (int)r.length, (char *)r.base); } - + result = dns_message_nextname(msg, sectionid); if (result == ISC_R_NOMORE) break; else if (result != ISC_R_SUCCESS) return (result); } - + return (ISC_R_SUCCESS); } @@ -393,7 +393,7 @@ printrdata(dns_message_t *msg, dns_rdataset_t *rdataset, dns_name_t *owner, char t[4096]; UNUSED(msg); - if (headers) + if (headers) printf(";; %s SECTION:\n", set_name); isc_buffer_init(&target, t, sizeof(t)); @@ -569,7 +569,7 @@ parse_args(isc_boolean_t is_batchfile, int argc, char **argv) { tr.length = strlen(isc_commandline_argument); result = dns_rdatatype_fromtext(&rdtype, (isc_textregion_t *)&tr); - + if (result != ISC_R_SUCCESS) fprintf (stderr,"Warning: invalid type: %s\n", isc_commandline_argument); @@ -581,7 +581,7 @@ parse_args(isc_boolean_t is_batchfile, int argc, char **argv) { tr.length = strlen(isc_commandline_argument); result = dns_rdataclass_fromtext(&rdclass, (isc_textregion_t *)&tr); - + if (result != ISC_R_SUCCESS) fprintf (stderr,"Warning: invalid class: %s\n", isc_commandline_argument); @@ -621,7 +621,7 @@ parse_args(isc_boolean_t is_batchfile, int argc, char **argv) { show_details = ISC_TRUE; break; case 'N': - debug("setting NDOTS to %s", + debug("setting NDOTS to %s", isc_commandline_argument); ndots = atoi(isc_commandline_argument); break; @@ -639,9 +639,9 @@ parse_args(isc_boolean_t is_batchfile, int argc, char **argv) { debug("server is %s", srv->servername); ISC_LIST_APPEND(server_list, srv, link); } - + lookup->pending = ISC_FALSE; - /* + /* * XXXMWS Add IPv6 translation here, probably using inet_pton * to extract the formatted text. */ diff --git a/bin/dig/include/dig/dig.h b/bin/dig/include/dig/dig.h index 837d836ec7..7c18b236e5 100644 --- a/bin/dig/include/dig/dig.h +++ b/bin/dig/include/dig/dig.h @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dig.h,v 1.40 2000/08/01 00:53:20 mws Exp $ */ +/* $Id: dig.h,v 1.41 2000/08/01 01:11:19 tale Exp $ */ #ifndef DIG_H #define DIG_H @@ -212,7 +212,7 @@ dig_server_t * make_server(const char *servname); void -clone_server_list(dig_serverlist_t src, +clone_server_list(dig_serverlist_t src, dig_serverlist_t *dest); void diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c index 812b279e60..002e551617 100644 --- a/bin/dig/nslookup.c +++ b/bin/dig/nslookup.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: nslookup.c,v 1.28 2000/07/27 23:52:30 bwelling Exp $ */ +/* $Id: nslookup.c,v 1.29 2000/08/01 01:11:17 tale Exp $ */ #include @@ -109,7 +109,7 @@ static const char *rtypetext[] = { "mf = ", /* 4 */ "canonical name = ", /* 5 */ "soa = ", /* 6 */ - "mb = ", /* 7 */ + "mb = ", /* 7 */ "mg = ", /* 8 */ "mr = ", /* 9 */ "rtype_10 = ", /* 10 */ @@ -151,7 +151,7 @@ show_usage(void) { fputs ( "Usage:\n" , stderr); -} +} void dighost_shutdown(void) { @@ -213,7 +213,7 @@ printsection(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers, check_result(result, "isc_buffer_allocate"); for (;;) { name = NULL; - dns_message_currentname(msg, section, + dns_message_currentname(msg, section, &name); for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; @@ -319,14 +319,14 @@ printsection(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers, (char*)isc_buffer_base(b), rdata.type); isc_buffer_clear(b); - result = dns_rdata_totext(&rdata, + result = dns_rdata_totext(&rdata, NULL, b); check_result(result, "dns_rdata_totext"); printf("%.*s\n", (int)isc_buffer_usedlength(b), (char*)isc_buffer_base(b)); - } + } loopresult = dns_rdataset_next(rdataset); } } @@ -390,7 +390,7 @@ detailsection(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers, check_result(result, "isc_buffer_allocate"); for (;;) { name = NULL; - dns_message_currentname(msg, section, + dns_message_currentname(msg, section, &name); for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; @@ -465,14 +465,14 @@ detailsection(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers, printf ("\trdata_%d = ", rdata.type); isc_buffer_clear(b); - result = dns_rdata_totext(&rdata, + result = dns_rdata_totext(&rdata, NULL, b); check_result(result, "dns_rdata_totext"); printf("%.*s\n", (int)isc_buffer_usedlength(b), (char*)isc_buffer_base(b)); - } + } loopresult = dns_rdataset_next(rdataset); } } @@ -529,11 +529,11 @@ printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) { detailsection(query, msg, headers, DNS_SECTION_ADDITIONAL); puts ("------------"); } - + if ((msg->flags & DNS_MESSAGEFLAG_AA) == 0) puts ("Non-authorative answer:"); printsection(query, msg, headers, DNS_SECTION_ANSWER); - + if (((msg->flags & DNS_MESSAGEFLAG_AA) == 0) && (query->lookup->rdtype != dns_rdatatype_a)) { puts ("\nAuthorative answers can be found from:"); @@ -551,7 +551,7 @@ show_settings(isc_boolean_t full) { isc_sockaddr_t sockaddr; isc_buffer_t *b = NULL; isc_result_t result; - + srv = ISC_LIST_HEAD(server_list); while (srv != NULL) { @@ -726,7 +726,7 @@ flush_server_list(void) { } -/* +/* * This works on the global server list, instead of on a per-lookup * server list, since the change is persistent. */ @@ -764,9 +764,9 @@ get_next_command(void) { setoption(arg); else if ((strcasecmp(ptr, "server") == 0) || (strcasecmp(ptr, "lserver") == 0)) { - printf("Server:\t%s\n", arg); + printf("Server:\t%s\n", arg); setsrv(arg); - } else + } else addlookup(ptr); } @@ -830,7 +830,7 @@ flush_lookup_list(void) { s = ISC_LIST_NEXT(s, link); ISC_LIST_DEQUEUE(l->my_server_list, sp, link); isc_mem_free(mctx, sp); - + } if (l->sendmsg != NULL) dns_message_destroy(&l->sendmsg); @@ -841,7 +841,7 @@ flush_lookup_list(void) { ISC_LIST_DEQUEUE(lookup_list, lp, link); isc_mem_free(mctx, lp); } -} +} int main(int argc, char **argv) { @@ -911,8 +911,8 @@ main(int argc, char **argv) { isc_mem_stats(mctx, stderr); isc_app_finish(); if (mctx != NULL) - isc_mem_destroy(&mctx); - + isc_mem_destroy(&mctx); + return (0); } diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in index bea28ed64c..8107d5ea1e 100644 --- a/bin/dnssec/Makefile.in +++ b/bin/dnssec/Makefile.in @@ -1,9 +1,9 @@ # 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 # 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 @@ -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.8 2000/07/27 09:36:33 tale Exp $ +# $Id: Makefile.in,v 1.9 2000/08/01 01:11:20 tale Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/bin/dnssec/dnssec-keygen.8 b/bin/dnssec/dnssec-keygen.8 index b151d80b84..d8d8cd52e3 100644 --- a/bin/dnssec/dnssec-keygen.8 +++ b/bin/dnssec/dnssec-keygen.8 @@ -1,9 +1,9 @@ .\" 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 .\" 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 @@ -12,9 +12,9 @@ .\" 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: dnssec-keygen.8,v 1.6 2000/07/27 09:42:32 tale Exp $ -.\" +.\" +.\" $Id: dnssec-keygen.8,v 1.7 2000/08/01 01:18:49 tale Exp $ +.\" .Dd Jun 30, 2000 .Dt DNSSEC-KEYGEN 8 .Os BIND9 9 @@ -96,7 +96,7 @@ option specifies how the generated key will be used. .Ar nametype can be either .Dv ZONE , -.Dv HOST , +.Dv HOST , .Dv ENTITY , or .Dv USER @@ -124,7 +124,7 @@ that is to be used. The only supported values value of .Ar generator are 2 and 5. -If no Diffie-Hellman generator is supplied, a known prime +If no Diffie-Hellman generator is supplied, a known prime from RFC2539 will be used if possible; otherwise 2 will be used as the generator. .Pp @@ -133,7 +133,7 @@ The option sets the protocol value for the generated key to .Ar protocol-value . The default is 2 (email) for keys of type -.Dv USER +.Dv USER and 3 (DNSSEC) for all other key types. Other possible values for this argument are listed in RFC2535 and its successors. @@ -149,7 +149,7 @@ will prompt for keyboard input and use the time intervals between keystrokes to provide randomness. The .Fl r -option overrides this behaviour, making +option overrides this behaviour, making .Nm dnssec-keygen use .Ar randomdev @@ -173,16 +173,16 @@ confidentiality. can be one of .Dv AUTHCONF , .Dv NOAUTHCONF , -.Dv NOAUTH +.Dv NOAUTH or .Dv NOCONF . The default is .Dv AUTHCONF . If type is -.Dv AUTHCONF +.Dv AUTHCONF the key can be used for authentication and confidentialty. Setting -.Ar type +.Ar type to .Dv NOAUTHCONF indicates that the key cannot be used for authentication or confidentialty. @@ -195,14 +195,14 @@ Similarly, defines that the key cannot be used for confidentiality though it can be used for authentication. .Pp -The +The .Fl v option can be used to make .Nm dnssec-keygen more verbose. As the debugging/tracing level .Ar level -increases, +increases, .Nm dnssec-keygen generates increasingly detailed reports about what it is doing. The default level is zero. @@ -245,7 +245,7 @@ key(s) for generating or validating signatures. The .Ar .key file contains a KEY resource record that can be inserted into a zone file -with a +with a .Dv $INCLUDE statement. The private part of the key is in the @@ -259,7 +259,7 @@ The private part of the key is used by .Xr dnssec-signzone 8 to generate signatures and the public part is used to verify the signatures. -Both +Both .Ar .key and .Ar .private @@ -278,13 +278,13 @@ has printed the key identification string .Dv Kexample.com.+003+26160 , indicating a DSA key with identifier 26160. It will also have created the files -.Pa Kexample.com.+003+26160.key +.Pa Kexample.com.+003+26160.key and .Pa Kexample.com.+003+26160.private containing respectively the public and private keys for the generated DSA key. .Sh FILES -.Pa /dev/random +.Pa /dev/random .Sh SEE ALSO .Xr RFC2535, .Xr RFC2845, @@ -296,7 +296,7 @@ DSA key. The naming convention for the public and private key files is a little clumsy. It won't work for domain names that are longer than 236 characters -because of the +because of the .Ar .+aaa+iiiii.private suffix results in filenames that are too long for most .Ux diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c index 098986227a..17d72a1789 100644 --- a/bin/dnssec/dnssec-keygen.c +++ b/bin/dnssec/dnssec-keygen.c @@ -1,11 +1,11 @@ /* * Portions Copyright (C) 2000 Internet Software Consortium. * Portions Copyright (C) 1995-2000 by Network Associates, Inc. - * + * * 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 AND * NETWORK ASSOCIATES DISCLAIM ALL WARRANTIES WITH REGARD TO THIS * SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND @@ -17,7 +17,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnssec-keygen.c,v 1.36 2000/06/22 02:48:12 bwelling Exp $ */ +/* $Id: dnssec-keygen.c,v 1.37 2000/08/01 01:11:21 tale Exp $ */ #include @@ -185,7 +185,7 @@ main(int argc, char **argv) { fprintf(stderr, "%s: invalid argument -%c\n", program, ch); usage(); - } + } } setup_entropy(mctx, randomfile, &ectx); @@ -319,8 +319,8 @@ main(int argc, char **argv) { isc_buffer_init(&buf, filename, sizeof(filename) - 1); - do { - conflict = ISC_FALSE; + do { + conflict = ISC_FALSE; oldkey = NULL; /* generate the key */ @@ -334,14 +334,14 @@ main(int argc, char **argv) { dst_result_totext(ret)); exit(-1); } - + /* * Try to read a key with the same name, alg and id from disk. - * If there is one we must continue generating a new one + * If there is one we must continue generating a new one * unless we were asked to generate a null key, in which * case we return failure. */ - ret = dst_key_fromfile(name, dst_key_id(key), alg, + ret = dst_key_fromfile(name, dst_key_id(key), alg, DST_TYPE_PRIVATE, NULL, mctx, &oldkey); /* do not overwrite an existing key */ if (ret == ISC_R_SUCCESS) { diff --git a/bin/dnssec/dnssec-makekeyset.8 b/bin/dnssec/dnssec-makekeyset.8 index c24de1706f..081e036cee 100644 --- a/bin/dnssec/dnssec-makekeyset.8 +++ b/bin/dnssec/dnssec-makekeyset.8 @@ -1,9 +1,9 @@ .\" 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 .\" 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 @@ -12,9 +12,9 @@ .\" 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: dnssec-makekeyset.8,v 1.7 2000/07/31 19:39:38 bwelling Exp $ -.\" +.\" +.\" $Id: dnssec-makekeyset.8,v 1.8 2000/08/01 01:18:50 tale Exp $ +.\" .Dd Jun 30, 2000 .Dt DNSSEC-MAKEKEYSET 8 .Os BIND9 9 @@ -70,7 +70,7 @@ A relative start time is supplied when .Ar start-time is given as +N: N seconds from the current time. If no -.Fl s +.Fl s option is supplied, the current date and time is used for the start time of the SIG records. .Pp @@ -145,7 +145,7 @@ As the debugging/tracing level increases, .Nm dnssec-makekeyset generates increasingly detailed reports about what it is doing. -The default level is zero. +The default level is zero. .Pp The .Fl h @@ -177,7 +177,7 @@ The backslash is for typographic reasons and would not be provided on the command line when running .Nm dnssec-makekeyset . .nf -.Dl # dnssec-makekeyset -t 86400 -s 20000701120000 \e\p +.Dl # dnssec-makekeyset -t 86400 -s 20000701120000 \e\p .Dl -e +2592000 Kexample.com.+003+26160 .fi .Pp @@ -198,7 +198,7 @@ to the DNS administrator for .Dv .com so that they could sign the resource records in the file. This assumes that the -.Dv .com +.Dv .com zone is DNSSEC-aware and the administrators of the two zones have some mechanism for authenticating each other and exchanging the keys and signatures securely. diff --git a/bin/dnssec/dnssec-makekeyset.c b/bin/dnssec/dnssec-makekeyset.c index c12d06b954..da4ff209f5 100644 --- a/bin/dnssec/dnssec-makekeyset.c +++ b/bin/dnssec/dnssec-makekeyset.c @@ -1,11 +1,11 @@ /* * Portions Copyright (C) 2000 Internet Software Consortium. * Portions Copyright (C) 1995-2000 by Network Associates, Inc. - * + * * 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 AND * NETWORK ASSOCIATES DISCLAIM ALL WARRANTIES WITH REGARD TO THIS * SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND @@ -17,7 +17,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnssec-makekeyset.c,v 1.30 2000/07/31 15:28:12 bwelling Exp $ */ +/* $Id: dnssec-makekeyset.c,v 1.31 2000/08/01 01:11:22 tale Exp $ */ #include diff --git a/bin/dnssec/dnssec-signkey.8 b/bin/dnssec/dnssec-signkey.8 index 676b121eea..2723aeae7b 100644 --- a/bin/dnssec/dnssec-signkey.8 +++ b/bin/dnssec/dnssec-signkey.8 @@ -1,9 +1,9 @@ .\" 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 .\" 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 @@ -12,9 +12,9 @@ .\" 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: dnssec-signkey.8,v 1.8 2000/07/31 19:39:39 bwelling Exp $ -.\" +.\" +.\" $Id: dnssec-signkey.8,v 1.9 2000/08/01 01:18:51 tale Exp $ +.\" .Dd Jun 30, 2000 .Dt DNSSEC-SIGNKEY 8 .Os BIND9 9 @@ -33,7 +33,7 @@ .Sh DESCRIPTION .Nm dnssec-signkey is used to sign a key set for a child zone. -Typically this would be provided by a +Typically this would be provided by a .Ar keyset file generated by .Xr dnssec-makekeyset 8 . @@ -50,7 +50,7 @@ Each argument will be a key identification string as reported by .Xr dnssec-keygen 8 for the parent zone. -This allows the child's keys to be signed by more than one +This allows the child's keys to be signed by more than one parent zone key. .Pp The diff --git a/bin/dnssec/dnssec-signkey.c b/bin/dnssec/dnssec-signkey.c index a6eaa58d8e..9c04971c10 100644 --- a/bin/dnssec/dnssec-signkey.c +++ b/bin/dnssec/dnssec-signkey.c @@ -1,11 +1,11 @@ /* * Portions Copyright (C) 2000 Internet Software Consortium. * Portions Copyright (C) 1995-2000 by Network Associates, Inc. - * + * * 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 AND * NETWORK ASSOCIATES DISCLAIM ALL WARRANTIES WITH REGARD TO THIS * SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND @@ -17,7 +17,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnssec-signkey.c,v 1.30 2000/07/31 21:07:25 tale Exp $ */ +/* $Id: dnssec-signkey.c,v 1.31 2000/08/01 01:11:23 tale Exp $ */ #include diff --git a/bin/dnssec/dnssec-signzone.8 b/bin/dnssec/dnssec-signzone.8 index e274494af4..6898596462 100644 --- a/bin/dnssec/dnssec-signzone.8 +++ b/bin/dnssec/dnssec-signzone.8 @@ -1,9 +1,9 @@ .\" 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 .\" 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 @@ -12,9 +12,9 @@ .\" 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: dnssec-signzone.8,v 1.10 2000/07/31 19:39:42 bwelling Exp $ -.\" +.\" +.\" $Id: dnssec-signzone.8,v 1.11 2000/08/01 01:18:52 tale Exp $ +.\" .Dd Jun 30, 2000 .Dt DNSSEC-SIGNZONE 8 .Os BIND9 9 @@ -77,7 +77,7 @@ If there is a .Ar signedkey file from the zone's parent, the parent's signatures will be incorporated into the generated signed zone file. -The security status of delegations from the the signed zone +The security status of delegations from the the signed zone - i.e. whether the child zones are DNSSEC-aware or not - is set according to the presence or absence of a .Ar signedkey @@ -112,7 +112,7 @@ A relative start time is supplied when .Ar start-time is given as +N: N seconds from the current time. If no -.Fl s +.Fl s option is supplied, the current date and time is used for the start time of the SIG records. .Pp @@ -152,9 +152,9 @@ Otherwise, it is considered to be expiring soon, and will remove it and generate a new SIG record to replace it. .Pp The default cycle period is one quarter of the difference between the -specified signature end and start dates. So if the +specified signature end and start dates. So if the .Fl e -and +and .Fl s options are not specified, .Nm dnssec-signzone @@ -223,12 +223,12 @@ which is the same as the origin, so there is no need to use the .Fl o option to set the origin. The zone's keys were either appended to the zone file or -incorporated using a -.Dv $INCLUDE +incorporated using a +.Dv $INCLUDE statement. If there was a .Ar signedkey -file from the parent zone - i.e. +file from the parent zone - i.e. .Dv signedkey-example.com. - it should be present in the current directory. This allows the parent zone's signature to be included in the signed diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c index 82298efbfd..384a4e31fa 100644 --- a/bin/dnssec/dnssec-signzone.c +++ b/bin/dnssec/dnssec-signzone.c @@ -1,11 +1,11 @@ /* * Portions Copyright (C) 1999, 2000 Internet Software Consortium. * Portions Copyright (C) 1995-2000 by Network Associates, Inc. - * + * * 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 AND * NETWORK ASSOCIATES DISCLAIM ALL WARRANTIES WITH REGARD TO THIS * SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND @@ -17,7 +17,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnssec-signzone.c,v 1.84 2000/07/31 23:11:21 bwelling Exp $ */ +/* $Id: dnssec-signzone.c,v 1.85 2000/08/01 01:11:25 tale Exp $ */ #include @@ -565,7 +565,7 @@ importparentsig(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node, if (result != ISC_R_SUCCESS) break; } - if (result != ISC_R_NOMORE) + if (result != ISC_R_NOMORE) goto failure; vbprintf(2, "found the parent's signature of our zone key\n"); @@ -808,7 +808,7 @@ signname(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node, nametostr(name)); dns_rdatalist_init(&keyrdatalist); dstkey = NULL; - + result = dst_key_generate(name, DNS_KEYALG_DSA, 0, 0, DNS_KEYTYPE_NOKEY | @@ -824,7 +824,7 @@ signname(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node, dns_rdata_fromregion(&keyrdata, rdataset.rdclass, dns_rdatatype_key, &r); - + ISC_LIST_APPEND(keyrdatalist.rdata, &keyrdata, link); keyrdatalist.rdclass = rdataset.rdclass; @@ -1325,7 +1325,7 @@ main(int argc, char *argv[]) { cycle = (endtime - starttime) / 4; setup_logging(verbose, mctx, &log); - + argc -= isc_commandline_index; argv += isc_commandline_index; diff --git a/bin/dnssec/dnssectool.c b/bin/dnssec/dnssectool.c index 4a604cf84e..2ac4b92a80 100644 --- a/bin/dnssec/dnssectool.c +++ b/bin/dnssec/dnssectool.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnssectool.c,v 1.14 2000/07/31 20:38:27 bwelling Exp $ */ +/* $Id: dnssectool.c,v 1.15 2000/08/01 01:11:26 tale Exp $ */ #include @@ -143,7 +143,7 @@ setup_logging(int verbose, isc_mem_t *mctx, isc_log_t **logp) { level = ISC_LOG_DEBUG(verbose - 2 + 1); break; } - + RUNTIME_CHECK(isc_log_create(mctx, &log, &logconfig) == ISC_R_SUCCESS); isc_log_setcontext(log); dns_log_init(log); @@ -167,7 +167,7 @@ setup_logging(int verbose, isc_mem_t *mctx, isc_log_t **logp) { &destination, ISC_LOG_PRINTTAG|ISC_LOG_PRINTLEVEL); check_result(result, "isc_log_createchannel()"); - + RUNTIME_CHECK(isc_log_usechannel(logconfig, "stderr", NULL, NULL) == ISC_R_SUCCESS); diff --git a/bin/dnssec/dnssectool.h b/bin/dnssec/dnssectool.h index 9a2dcf9ad1..8359007c9f 100644 --- a/bin/dnssec/dnssectool.h +++ b/bin/dnssec/dnssectool.h @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnssectool.h,v 1.7 2000/07/27 09:36:35 tale Exp $ */ +/* $Id: dnssectool.h,v 1.8 2000/08/01 01:11:27 tale Exp $ */ #ifndef DNSSECTOOL_H #define DNSSECTOOL_H 1 diff --git a/bin/lwresd/Makefile.in b/bin/lwresd/Makefile.in index 42c02ab06a..505013ff0c 100644 --- a/bin/lwresd/Makefile.in +++ b/bin/lwresd/Makefile.in @@ -1,9 +1,9 @@ # 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 # 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 @@ -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.11 2000/07/27 09:36:37 tale Exp $ +# $Id: Makefile.in,v 1.12 2000/08/01 01:11:29 tale Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -23,9 +23,9 @@ top_srcdir = @top_srcdir@ @BIND9_INCLUDES@ -CINCLUDES = ${LWRES_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} +CINCLUDES = ${LWRES_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} -CDEFINES = +CDEFINES = CWARNINGS = DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@ diff --git a/bin/lwresd/client.c b/bin/lwresd/client.c index ea843909b9..62ccbd1879 100644 --- a/bin/lwresd/client.c +++ b/bin/lwresd/client.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: client.c,v 1.29 2000/07/27 09:36:38 tale Exp $ */ +/* $Id: client.c,v 1.30 2000/08/01 01:11:30 tale Exp $ */ #include @@ -286,7 +286,7 @@ client_send(isc_task_t *task, isc_event_t *ev) { UNUSED(task); UNUSED(dev); - + INSIST(CLIENT_ISSEND(client)); INSIST(client->sendbuf == dev->region.base); diff --git a/bin/lwresd/client.h b/bin/lwresd/client.h index 72eb24547c..b37b8f0b21 100644 --- a/bin/lwresd/client.h +++ b/bin/lwresd/client.h @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: client.h,v 1.17 2000/07/27 09:36:39 tale Exp $ */ +/* $Id: client.h,v 1.18 2000/08/01 01:11:31 tale Exp $ */ #ifndef LWD_CLIENT_H #define LWD_CLIENT_H 1 diff --git a/bin/lwresd/err_pkt.c b/bin/lwresd/err_pkt.c index 6eb63ddd43..2fc68d5755 100644 --- a/bin/lwresd/err_pkt.c +++ b/bin/lwresd/err_pkt.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: err_pkt.c,v 1.6 2000/07/27 09:36:40 tale Exp $ */ +/* $Id: err_pkt.c,v 1.7 2000/08/01 01:11:32 tale Exp $ */ #include diff --git a/bin/lwresd/main.c b/bin/lwresd/main.c index 097a64df02..cc46f4b610 100644 --- a/bin/lwresd/main.c +++ b/bin/lwresd/main.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,12 +15,12 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: main.c,v 1.44 2000/07/27 09:36:41 tale Exp $ */ +/* $Id: main.c,v 1.45 2000/08/01 01:11:33 tale Exp $ */ /* * Main program for the Lightweight Resolver Daemon. * - * To paraphrase the old saying about X11, "It's not a lightweight deamon + * To paraphrase the old saying about X11, "It's not a lightweight deamon * for resolvers, it's a deamon for lightweight resolvers". */ @@ -82,7 +82,7 @@ static isc_logcategory_t logcategories[] = { }; #define LWRES_LOGCATEGORY_NETWORK (&logcategories[0]) - + static isc_result_t create_view(isc_mem_t *mctx) { @@ -91,8 +91,8 @@ create_view(isc_mem_t *mctx) { dns_db_t *rootdb; unsigned int attrs; dns_dispatch_t *disp4 = NULL; - dns_dispatch_t *disp6 = NULL; - + dns_dispatch_t *disp6 = NULL; + view = NULL; cache = NULL; @@ -121,7 +121,7 @@ create_view(isc_mem_t *mctx) { if (isc_net_probeipv4() == ISC_R_SUCCESS) { isc_sockaddr_t any4; - + isc_sockaddr_any(&any4); attrs = DNS_DISPATCHATTR_IPV4 | DNS_DISPATCHATTR_UDP; result = dns_dispatch_getudp(dispatchmgr, sockmgr, @@ -133,9 +133,9 @@ create_view(isc_mem_t *mctx) { if (isc_net_probeipv6() == ISC_R_SUCCESS) { isc_sockaddr_t any6; - + isc_sockaddr_any6(&any6); - + attrs = DNS_DISPATCHATTR_IPV6 | DNS_DISPATCHATTR_UDP; result = dns_dispatch_getudp(dispatchmgr, sockmgr, taskmgr, &any6, 512, 6, 1024, @@ -143,7 +143,7 @@ create_view(isc_mem_t *mctx) { if (result != ISC_R_SUCCESS) goto out; } - + result = dns_view_createresolver(view, taskmgr, 16, sockmgr, timermgr, 0, dispatchmgr, disp4, disp6); @@ -152,7 +152,7 @@ create_view(isc_mem_t *mctx) { dns_dispatch_detach(&disp4); if (disp6 != NULL) dns_dispatch_detach(&disp6); - + if (result != ISC_R_SUCCESS) goto out; @@ -177,7 +177,7 @@ create_view(isc_mem_t *mctx) { isc_mem_put(mctx, sa, sizeof (*sa)); sa = ISC_LIST_HEAD(forwarders); } - + } dns_view_freeze(view); @@ -379,7 +379,7 @@ main(int argc, char **argv) { isc_result_totext(result)); exit(1); } - + INSIST(result == ISC_R_SUCCESS); cmgr = isc_mem_get(mem, sizeof(clientmgr_t) * NTASKS); @@ -495,7 +495,7 @@ main(int argc, char **argv) { cmgr = NULL; dns_dispatchmgr_destroy(&dispatchmgr); - + isc_log_destroy(&lctx); /* diff --git a/bin/lwresd/process_gabn.c b/bin/lwresd/process_gabn.c index 674d671594..6a92d2501b 100644 --- a/bin/lwresd/process_gabn.c +++ b/bin/lwresd/process_gabn.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: process_gabn.c,v 1.30 2000/07/27 09:36:42 tale Exp $ */ +/* $Id: process_gabn.c,v 1.31 2000/08/01 01:11:34 tale Exp $ */ #include @@ -293,7 +293,7 @@ process_gabn_finddone(isc_task_t *task, isc_event_t *ev) { client->find = NULL; else dns_adb_destroyfind(&client->find); - + } generate_reply(client); return; diff --git a/bin/lwresd/process_gnba.c b/bin/lwresd/process_gnba.c index 87aedf37f6..baa90eb53e 100644 --- a/bin/lwresd/process_gnba.c +++ b/bin/lwresd/process_gnba.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: process_gnba.c,v 1.25 2000/07/27 09:36:44 tale Exp $ */ +/* $Id: process_gnba.c,v 1.26 2000/08/01 01:11:35 tale Exp $ */ #include @@ -91,7 +91,7 @@ byaddr_done(isc_task_t *task, isc_event_t *event) { * fails. */ client->options |= DNS_BYADDROPT_IPV6NIBBLE; - + start_byaddr(client); return; } diff --git a/bin/lwresd/process_noop.c b/bin/lwresd/process_noop.c index e2958f7413..ce60fe5bad 100644 --- a/bin/lwresd/process_noop.c +++ b/bin/lwresd/process_noop.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: process_noop.c,v 1.8 2000/07/27 09:36:45 tale Exp $ */ +/* $Id: process_noop.c,v 1.9 2000/08/01 01:11:36 tale Exp $ */ #include diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in index 838ef3f1bf..ef74c2816e 100644 --- a/bin/named/Makefile.in +++ b/bin/named/Makefile.in @@ -1,9 +1,9 @@ # Copyright (C) 1998-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 # 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 @@ -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.52 2000/07/27 09:36:46 tale Exp $ +# $Id: Makefile.in,v 1.53 2000/08/01 01:11:38 tale Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -27,7 +27,7 @@ CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include \ ${LWRES_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \ ${OMAPI_INCLUDES} -CDEFINES = +CDEFINES = CWARNINGS = OMAPILIBS = ../../lib/omapi/libomapi.@A@ diff --git a/bin/named/aclconf.c b/bin/named/aclconf.c index a489d69999..b00826a7ea 100644 --- a/bin/named/aclconf.c +++ b/bin/named/aclconf.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: aclconf.c,v 1.19 2000/07/27 09:45:50 tale Exp $ */ +/* $Id: aclconf.c,v 1.20 2000/08/01 01:22:08 tale Exp $ */ #include @@ -34,7 +34,7 @@ dns_aclconfctx_init(dns_aclconfctx_t *ctx) { void dns_aclconfctx_destroy(dns_aclconfctx_t *ctx) { - dns_acl_t *dacl, *next; + dns_acl_t *dacl, *next; for (dacl = ISC_LIST_HEAD(ctx->named_acl_cache); dacl != NULL; dacl = next) @@ -103,7 +103,7 @@ convert_keyname(char *txtname, isc_mem_t *mctx, dns_name_t *dnsname) { } return (dns_name_dup(dns_fixedname_name(&fixname), mctx, dnsname)); } - + isc_result_t dns_acl_fromconfig(dns_c_ipmatchlist_t *caml, dns_c_ctx_t *cctx, @@ -118,7 +118,7 @@ dns_acl_fromconfig(dns_c_ipmatchlist_t *caml, dns_c_ipmatchelement_t *ce; REQUIRE(target != NULL && *target == NULL); - + count = 0; for (ce = ISC_LIST_HEAD(caml->elements); ce != NULL; @@ -128,7 +128,7 @@ dns_acl_fromconfig(dns_c_ipmatchlist_t *caml, result = dns_acl_create(mctx, count, &dacl); if (result != ISC_R_SUCCESS) return (result); - + de = dacl->elements; for (ce = ISC_LIST_HEAD(caml->elements); ce != NULL; @@ -192,7 +192,7 @@ dns_acl_fromconfig(dns_c_ipmatchlist_t *caml, *target = dacl; return (ISC_R_SUCCESS); - + cleanup: dns_acl_detach(&dacl); return (result); diff --git a/bin/named/client.c b/bin/named/client.c index ccab520f78..4e083736bc 100644 --- a/bin/named/client.c +++ b/bin/named/client.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: client.c,v 1.105 2000/07/27 09:36:48 tale Exp $ */ +/* $Id: client.c,v 1.106 2000/08/01 01:11:39 tale Exp $ */ #include @@ -114,7 +114,7 @@ struct ns_clientmgr { #define NS_CLIENTSTATE_INACTIVE 1 /* - * The client object exists and has a task and timer. + * The client object exists and has a task and timer. * Its "query" struct and sendbuf are initialized. * It is on the client manager's list of inactive clients. * It has a message and OPT, both in the reset state. @@ -136,7 +136,7 @@ struct ns_clientmgr { #define NS_CLIENTSTATE_READING 3 /* * The client object is a TCP client object that has received - * a connection. It has a tcpsocket, tcpmsg, TCP quota, and an + * a connection. It has a tcpsocket, tcpmsg, TCP quota, and an * outstanding TCP read request. This state is not used for * UDP client objects. */ @@ -147,7 +147,7 @@ struct ns_clientmgr { * on it. It has a view, and it may have any of a non-reset OPT, * recursion quota, and an outstanding write request. If it * is a UDP client object, it has a dispatch event. - */ + */ #define NS_CLIENTSTATE_MAX 9 /* @@ -175,11 +175,11 @@ static void client_request(isc_task_t *task, isc_event_t *event); static void client_deactivate(ns_client_t *client) { REQUIRE(NS_CLIENT_VALID(client)); - + if (client->interface) ns_interface_detach(&client->interface); - INSIST(client->naccepts == 0); + INSIST(client->naccepts == 0); if (client->tcplistener != NULL) isc_socket_detach(&client->tcplistener); @@ -193,8 +193,8 @@ client_deactivate(ns_client_t *client) { } if (client->dispatch != NULL) dns_dispatch_detach(&client->dispatch); - - client->attributes = 0; + + client->attributes = 0; client->mortal = ISC_FALSE; LOCK(&client->manager->lock); @@ -214,7 +214,7 @@ static void client_free(ns_client_t *client) { isc_boolean_t need_clientmgr_destroy = ISC_FALSE; ns_clientmgr_t *manager = NULL; - + REQUIRE(NS_CLIENT_VALID(client)); /* @@ -228,7 +228,7 @@ client_free(ns_client_t *client) { ns_query_free(client); isc_mem_put(client->mctx, client->sendbuf, SEND_BUFFER_SIZE); isc_timer_detach(&client->timer); - + if (client->tcpbuf != NULL) isc_mem_put(client->mctx, client->tcpbuf, TCP_BUFFER_SIZE); if (client->opt != NULL) { @@ -254,7 +254,7 @@ client_free(ns_client_t *client) { CTRACE("free"); client->magic = 0; isc_mem_put(client->mctx, client, sizeof *client); - + if (need_clientmgr_destroy) clientmgr_destroy(manager); } @@ -263,7 +263,7 @@ static void set_timeout(ns_client_t *client, unsigned int seconds) { isc_result_t result; isc_interval_t interval; - + isc_interval_set(&interval, seconds, 0); result = isc_timer_reset(client->timer, isc_timertype_once, NULL, &interval, ISC_FALSE); @@ -302,7 +302,7 @@ exit_check(ns_client_t *client) { * */ if (client->newstate == NS_CLIENTSTATE_FREED && client->view != NULL) - dns_view_detach(&client->view); + dns_view_detach(&client->view); if (client->state == NS_CLIENTSTATE_WORKING) { INSIST(client->newstate <= NS_CLIENTSTATE_READING); @@ -380,7 +380,7 @@ exit_check(ns_client_t *client) { * active and force it to go inactive if not. */ ns_client_checkactive(client); - + if (NS_CLIENTSTATE_READY == client->newstate) { if (TCP_CLIENT(client)) { client_accept(client); @@ -400,14 +400,14 @@ exit_check(ns_client_t *client) { } if (client->state == NS_CLIENTSTATE_READY) { - INSIST(client->newstate <= NS_CLIENTSTATE_INACTIVE); + INSIST(client->newstate <= NS_CLIENTSTATE_INACTIVE); /* * We are trying to enter the inactive state. */ if (client->naccepts > 0) isc_socket_cancel(client->tcplistener, client->task, ISC_SOCKCANCEL_ACCEPT); - + if (! (client->naccepts == 0)) { /* Still waiting for accept cancel completion. */ return (ISC_TRUE); @@ -443,7 +443,7 @@ client_start(isc_task_t *task, isc_event_t *event) { isc_result_t result; INSIST(task == client->task); - + UNUSED(task); if (TCP_CLIENT(client)) { @@ -454,7 +454,7 @@ client_start(isc_task_t *task, isc_event_t *event) { client_request, client, &client->dispentry); - + if (result != ISC_R_SUCCESS) { ns_client_log(client, DNS_LOGCATEGORY_SECURITY, @@ -464,7 +464,7 @@ client_start(isc_task_t *task, isc_event_t *event) { "failed: %s", isc_result_totext(result)); /* - * Not much we can do here but log the failure; + * Not much we can do here but log the failure; * the client will effectively go idle. */ } @@ -531,7 +531,7 @@ ns_client_endrequest(ns_client_t *client) { isc_quota_detach(&client->recursionquota); /* - * Clear all client attributes that are specific to + * Clear all client attributes that are specific to * the request; that's all except the TCP flag. */ client->attributes &= NS_CLIENTATTR_TCP; @@ -542,7 +542,7 @@ ns_client_checkactive(ns_client_t *client) { if (client->mortal) { /* * This client object should normally go inactive - * at this point, but if we have fewer active client + * at this point, but if we have fewer active client * objects than desired due to earlier quota exhaustion, * keep it active to make up for the shortage. */ @@ -550,7 +550,7 @@ ns_client_checkactive(ns_client_t *client) { if (TCP_CLIENT(client)) { LOCK(&client->interface->lock); if (client->interface->ntcpcurrent < - client->interface->ntcptarget) + client->interface->ntcptarget) need_another_client = ISC_TRUE; UNLOCK(&client->interface->lock); } else { @@ -574,12 +574,12 @@ ns_client_checkactive(ns_client_t *client) { void ns_client_next(ns_client_t *client, isc_result_t result) { int newstate; - + REQUIRE(NS_CLIENT_VALID(client)); REQUIRE(client->state == NS_CLIENTSTATE_WORKING); CTRACE("next"); - + if (result != ISC_R_SUCCESS) ns_client_log(client, DNS_LOGCATEGORY_SECURITY, NS_LOGMODULE_CLIENT, ISC_LOG_DEBUG(3), @@ -624,7 +624,7 @@ client_senddone(isc_task_t *task, isc_event_t *event) { INSIST(client->nsends > 0); client->nsends--; - + if (client->tcpbuf != NULL) { INSIST(TCP_CLIENT(client)); isc_mem_put(client->mctx, client->tcpbuf, TCP_BUFFER_SIZE); @@ -657,7 +657,7 @@ ns_client_send(ns_client_t *client) { if ((client->attributes & NS_CLIENTATTR_RA) != 0) client->message->flags |= DNS_MESSAGEFLAG_RA; - + /* * XXXRTH The following doesn't deal with TSIGs, TCP buffer resizing, * or ENDS1 more data packets. @@ -689,7 +689,7 @@ ns_client_send(ns_client_t *client) { goto done; if (client->opt != NULL) { result = dns_message_setopt(client->message, client->opt); - if (result != ISC_R_SUCCESS) + if (result != ISC_R_SUCCESS) goto done; /* * XXXRTH dns_message_setopt() should probably do this... @@ -757,7 +757,7 @@ ns_client_send(ns_client_t *client) { } ns_client_next(client, result); } - + void ns_client_error(ns_client_t *client, isc_result_t result) { dns_rcode_t rcode; @@ -844,7 +844,7 @@ client_addopt(ns_client_t *client) { ISC_LIST_INIT(rdatalist->rdata); ISC_LIST_APPEND(rdatalist->rdata, rdata, link); dns_rdatalist_tordataset(rdatalist, rdataset); - + client->opt = rdataset; return (ISC_R_SUCCESS); @@ -871,7 +871,7 @@ client_request(isc_task_t *task, isc_event_t *event) { REQUIRE(task == client->task); UNUSED(task); - + INSIST(client->recursionquota == NULL); INSIST(client->state == @@ -993,7 +993,7 @@ client_request(isc_task_t *task, isc_event_t *event) { /* * Find a view that matches the client's source address. - * + * * XXXRTH View list management code will be moving to its own module * soon. */ @@ -1029,7 +1029,7 @@ client_request(isc_task_t *task, isc_event_t *event) { ns_client_log(client, NS_LOGCATEGORY_CLIENT, NS_LOGMODULE_CLIENT, ISC_LOG_DEBUG(5), "using view '%s'", view->name); - + /* * Lock the view's configuration data for reading. * We must attach a separate view reference for this @@ -1043,7 +1043,7 @@ client_request(isc_task_t *task, isc_event_t *event) { RWLOCK(&client->lockview->conflock, isc_rwlocktype_read); /* - * Check for a signature. We log bad signatures regardless of + * Check for a signature. We log bad signatures regardless of * whether they ultimately cause the request to be rejected or * not. We do not log the lack of a signature unless we are * debugging. @@ -1143,7 +1143,7 @@ client_timeout(isc_task_t *task, isc_event_t *event) { REQUIRE(client->timer != NULL); UNUSED(task); - + CTRACE("timeout"); isc_event_free(&event); @@ -1153,7 +1153,7 @@ client_timeout(isc_task_t *task, isc_event_t *event) { client->shutdown = NULL; client->shutdown_arg = NULL; } - + if (client->newstate > NS_CLIENTSTATE_READY) client->newstate = NS_CLIENTSTATE_READY; (void) exit_check(client); @@ -1168,7 +1168,7 @@ client_create(ns_clientmgr_t *manager, ns_client_t **clientp) /* * Caller must be holding the manager lock. * - * Note: creating a client does not add the client to the + * Note: creating a client does not add the client to the * manager's client list or set the client's manager pointer. * The caller is responsible for that. */ @@ -1280,7 +1280,7 @@ client_create(ns_clientmgr_t *manager, ns_client_t **clientp) static void client_read(ns_client_t *client) { isc_result_t result; - + CTRACE("read"); result = dns_tcpmsg_readmessage(&client->tcpmsg, client->task, @@ -1293,14 +1293,14 @@ client_read(ns_client_t *client) { * for a request on this TCP connection. */ set_timeout(client, 30); - + client->state = client->newstate = NS_CLIENTSTATE_READING; INSIST(client->nreads == 0); client->nreads++; return; fail: - ns_client_next(client, result); + ns_client_next(client, result); } static void @@ -1308,7 +1308,7 @@ client_newconn(isc_task_t *task, isc_event_t *event) { ns_client_t *client = event->ev_arg; isc_socket_newconnev_t *nevent = (isc_socket_newconnev_t *)event; isc_result_t result; - + REQUIRE(event->ev_type == ISC_SOCKEVENT_NEWCONN); REQUIRE(NS_CLIENT_VALID(client)); REQUIRE(client->task == task); @@ -1355,7 +1355,7 @@ client_newconn(isc_task_t *task, isc_event_t *event) { "accept failed: %s", isc_result_totext(nevent->result)); } - + if (exit_check(client)) goto freeevent; @@ -1383,7 +1383,7 @@ client_newconn(isc_task_t *task, isc_event_t *event) { } client_read(client); } - + freeevent: isc_event_free(&event); } @@ -1420,7 +1420,7 @@ void ns_client_attach(ns_client_t *source, ns_client_t **targetp) { REQUIRE(NS_CLIENT_VALID(source)); REQUIRE(targetp != NULL && *targetp == NULL); - + source->references++; *targetp = source; } @@ -1428,7 +1428,7 @@ ns_client_attach(ns_client_t *source, ns_client_t **targetp) { void ns_client_detach(ns_client_t **clientp) { ns_client_t *client = *clientp; - + client->references--; INSIST(client->references >= 0); *clientp = NULL; @@ -1454,8 +1454,8 @@ ns_client_replace(ns_client_t *client) { return (result); /* - * The responsibility for listening for new requests is hereby - * transferred to the new client. Therefore, the old client + * The responsibility for listening for new requests is hereby + * transferred to the new client. Therefore, the old client * should refrain from listening for any more requests. */ client->mortal = ISC_TRUE; @@ -1492,7 +1492,7 @@ ns_clientmgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr, result = isc_mutex_init(&manager->lock); if (result != ISC_R_SUCCESS) goto cleanup_manager; - + manager->mctx = mctx; manager->taskmgr = taskmgr; manager->timermgr = timermgr; @@ -1518,7 +1518,7 @@ ns_clientmgr_destroy(ns_clientmgr_t **managerp) { ns_clientmgr_t *manager; ns_client_t *client; isc_boolean_t need_destroy = ISC_FALSE; - + REQUIRE(managerp != NULL); manager = *managerp; REQUIRE(VALID_MANAGER(manager)); @@ -1591,7 +1591,7 @@ ns_clientmgr_createclients(ns_clientmgr_t *manager, unsigned int n, } client->state = NS_CLIENTSTATE_READY; - + ns_interface_attach(ifp, &client->interface); if (tcp) { @@ -1644,7 +1644,7 @@ ns_client_checkacl(ns_client_t *client, } isc_netaddr_fromsockaddr(&netaddr, &client->peeraddr); - + result = dns_acl_match(&netaddr, client->signer, acl, &ns_g_server->aclenv, &match, NULL); diff --git a/bin/named/include/named/aclconf.h b/bin/named/include/named/aclconf.h index bfd3e545d8..7a50d60cad 100644 --- a/bin/named/include/named/aclconf.h +++ b/bin/named/include/named/aclconf.h @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: aclconf.h,v 1.8 2000/07/27 09:47:20 tale Exp $ */ +/* $Id: aclconf.h,v 1.9 2000/08/01 01:23:38 tale Exp $ */ #ifndef DNS_ACLCONF_H #define DNS_ACLCONF_H 1 diff --git a/bin/named/include/named/client.h b/bin/named/include/named/client.h index 7f4f754786..9f5dffdd71 100644 --- a/bin/named/include/named/client.h +++ b/bin/named/include/named/client.h @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: client.h,v 1.39 2000/07/27 09:37:11 tale Exp $ */ +/* $Id: client.h,v 1.40 2000/08/01 01:12:03 tale Exp $ */ #ifndef NAMED_CLIENT_H #define NAMED_CLIENT_H 1 @@ -35,21 +35,21 @@ * Each ns_client_t object can handle only one TCP connection or UDP * request at a time. Therefore, several ns_client_t objects are * typically created to serve each network interface, e.g., one - * for handling TCP requests and a few (one per CPU) for handling + * for handling TCP requests and a few (one per CPU) for handling * UDP requests. * * Incoming requests are classified as queries, zone transfer - * requests, update requests, notify requests, etc, and handed off + * requests, update requests, notify requests, etc, and handed off * to the appropriate request handler. When the request has been - * fully handled (which can be much later), the ns_client_t must be - * notified of this by calling one of the following functions + * fully handled (which can be much later), the ns_client_t must be + * notified of this by calling one of the following functions * exactly once in the context of its task: * * ns_client_send() (sending a non-error response) * ns_client_error() (sending an error response) * ns_client_next() (sending no response) * - * This will release any resources used by the request and + * This will release any resources used by the request and * and allow the ns_client_t to listen for the next request. * * A ns_clientmgr_t manages a number of ns_client_t objects. @@ -165,7 +165,7 @@ ns_client_error(ns_client_t *client, isc_result_t result); void ns_client_next(ns_client_t *client, isc_result_t result); /* - * Finish processing the current client request, + * Finish processing the current client request, * return no response to the client. */ @@ -239,7 +239,7 @@ ns_client_checkacl(ns_client_t *client, * Log messages will refer to the request as an 'opname' request. * * Notes: - * This is appropriate for checking allow-update, + * This is appropriate for checking allow-update, * allow-query, allow-transfer, etc. It is not appropriate * for checking the blackhole list because we treat positive * matches as "allow" and negative matches as "deny"; in diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h index 7d92c0523d..63ea57df82 100644 --- a/bin/named/include/named/globals.h +++ b/bin/named/include/named/globals.h @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: globals.h,v 1.43 2000/07/27 09:37:12 tale Exp $ */ +/* $Id: globals.h,v 1.44 2000/08/01 01:12:04 tale Exp $ */ #ifndef NAMED_GLOBALS_H #define NAMED_GLOBALS_H 1 diff --git a/bin/named/include/named/interfacemgr.h b/bin/named/include/named/interfacemgr.h index 29b7875220..0e25d998c9 100644 --- a/bin/named/include/named/interfacemgr.h +++ b/bin/named/include/named/interfacemgr.h @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: interfacemgr.h,v 1.18 2000/07/27 09:37:13 tale Exp $ */ +/* $Id: interfacemgr.h,v 1.19 2000/08/01 01:12:05 tale Exp $ */ #ifndef NAMED_INTERFACEMGR_H #define NAMED_INTERFACEMGR_H 1 @@ -27,8 +27,8 @@ /* * Interface manager * - * The interface manager monitors the operating system's list - * of network interfaces, creating and destroying listeners + * The interface manager monitors the operating system's list + * of network interfaces, creating and destroying listeners * as needed. * * Reliability: @@ -62,7 +62,7 @@ *** Types ***/ -#define IFACE_MAGIC 0x493A2D29U /* I:-). */ +#define IFACE_MAGIC 0x493A2D29U /* I:-). */ #define NS_INTERFACE_VALID(t) ISC_MAGIC_VALID(t, IFACE_MAGIC) struct ns_interface { @@ -103,7 +103,7 @@ ns_interfacemgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr, void ns_interfacemgr_attach(ns_interfacemgr_t *source, ns_interfacemgr_t **target); -void +void ns_interfacemgr_detach(ns_interfacemgr_t **targetp); void @@ -149,7 +149,7 @@ ns_interfacemgr_getaclenv(ns_interfacemgr_t *mgr); void ns_interface_attach(ns_interface_t *source, ns_interface_t **target); -void +void ns_interface_detach(ns_interface_t **targetp); #endif /* NAMED_INTERFACEMGR_H */ diff --git a/bin/named/include/named/listenlist.h b/bin/named/include/named/listenlist.h index 770569e220..1f773629cf 100644 --- a/bin/named/include/named/listenlist.h +++ b/bin/named/include/named/listenlist.h @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: listenlist.h,v 1.8 2000/07/27 09:37:14 tale Exp $ */ +/* $Id: listenlist.h,v 1.9 2000/08/01 01:12:06 tale Exp $ */ #ifndef NAMED_LISTENLIST_H #define NAMED_LISTENLIST_H 1 diff --git a/bin/named/include/named/log.h b/bin/named/include/named/log.h index 65cfc7a345..6a454fd9de 100644 --- a/bin/named/include/named/log.h +++ b/bin/named/include/named/log.h @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: log.h,v 1.14 2000/07/27 09:37:16 tale Exp $ */ +/* $Id: log.h,v 1.15 2000/08/01 01:12:07 tale Exp $ */ #ifndef NAMED_LOG_H #define NAMED_LOG_H 1 @@ -55,7 +55,7 @@ ns_log_init(isc_boolean_t safe); * Initialize the logging system and set up an initial default * logging default configuration that will be used until the * config file has been read. - * + * * If 'safe' is true, use a default configuration that refrains * from opening files. This is to avoid creating log files * as root. diff --git a/bin/named/include/named/logconf.h b/bin/named/include/named/logconf.h index 6cbecb754f..18502a255c 100644 --- a/bin/named/include/named/logconf.h +++ b/bin/named/include/named/logconf.h @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: logconf.h,v 1.7 2000/07/27 09:37:17 tale Exp $ */ +/* $Id: logconf.h,v 1.8 2000/08/01 01:12:08 tale Exp $ */ #ifndef NAMED_LOGCONF_H #define NAMED_LOGCONF_H 1 diff --git a/bin/named/include/named/lwdclient.h b/bin/named/include/named/lwdclient.h index 683c70b9d8..eaa11f2ac0 100644 --- a/bin/named/include/named/lwdclient.h +++ b/bin/named/include/named/lwdclient.h @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lwdclient.h,v 1.4 2000/07/27 09:37:18 tale Exp $ */ +/* $Id: lwdclient.h,v 1.5 2000/08/01 01:12:09 tale Exp $ */ #ifndef NAMED_LWDCLIENT_H #define NAMED_LWDCLIENT_H 1 diff --git a/bin/named/include/named/lwresd.h b/bin/named/include/named/lwresd.h index 29f62069b2..695f2d34fd 100644 --- a/bin/named/include/named/lwresd.h +++ b/bin/named/include/named/lwresd.h @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lwresd.h,v 1.4 2000/07/27 09:37:19 tale Exp $ */ +/* $Id: lwresd.h,v 1.5 2000/08/01 01:12:10 tale Exp $ */ #ifndef NAMED_LWRESD_H #define NAMED_LWRESD_H 1 diff --git a/bin/named/include/named/main.h b/bin/named/include/named/main.h index bb58a5dd99..a33fec15f5 100644 --- a/bin/named/include/named/main.h +++ b/bin/named/include/named/main.h @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: main.h,v 1.5 2000/07/27 09:37:20 tale Exp $ */ +/* $Id: main.h,v 1.6 2000/08/01 01:12:11 tale Exp $ */ #ifndef NAMED_MAIN_H #define NAMED_MAIN_H 1 diff --git a/bin/named/include/named/notify.h b/bin/named/include/named/notify.h index ea5ef80e29..e5d07e1444 100644 --- a/bin/named/include/named/notify.h +++ b/bin/named/include/named/notify.h @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: notify.h,v 1.7 2000/07/27 09:37:21 tale Exp $ */ +/* $Id: notify.h,v 1.8 2000/08/01 01:12:12 tale Exp $ */ #ifndef NAMED_NOTIFY_H #define NAMED_NOTIFY_H 1 diff --git a/bin/named/include/named/omapi.h b/bin/named/include/named/omapi.h index 09620aa367..33b8609919 100644 --- a/bin/named/include/named/omapi.h +++ b/bin/named/include/named/omapi.h @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: omapi.h,v 1.9 2000/07/27 09:37:22 tale Exp $ */ +/* $Id: omapi.h,v 1.10 2000/08/01 01:12:14 tale Exp $ */ #ifndef NAMED_OMAPI_H #define NAMED_OMAPI_H 1 diff --git a/bin/named/include/named/query.h b/bin/named/include/named/query.h index 467436c4af..f2dffc166a 100644 --- a/bin/named/include/named/query.h +++ b/bin/named/include/named/query.h @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: query.h,v 1.20 2000/07/31 21:06:58 explorer Exp $ */ +/* $Id: query.h,v 1.21 2000/08/01 01:12:15 tale Exp $ */ #ifndef NAMED_QUERY_H #define NAMED_QUERY_H 1 diff --git a/bin/named/include/named/server.h b/bin/named/include/named/server.h index d570489a74..e22e40d265 100644 --- a/bin/named/include/named/server.h +++ b/bin/named/include/named/server.h @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: server.h,v 1.34 2000/07/27 09:37:25 tale Exp $ */ +/* $Id: server.h,v 1.35 2000/08/01 01:12:16 tale Exp $ */ #ifndef NAMED_SERVER_H #define NAMED_SERVER_H 1 @@ -43,7 +43,7 @@ struct ns_server { /* Common rwlock for the server's configurable data. */ isc_rwlock_t conflock; - + /* Configurable data. */ isc_quota_t xfroutquota; isc_quota_t tcpquota; @@ -60,7 +60,7 @@ struct ns_server { dns_db_t * in_roothints; dns_tkeyctx_t * tkeyctx; isc_timer_t * interface_timer; - + isc_mutex_t reload_event_lock; isc_event_t * reload_event; }; diff --git a/bin/named/include/named/tkeyconf.h b/bin/named/include/named/tkeyconf.h index bd4beac695..257a7becc5 100644 --- a/bin/named/include/named/tkeyconf.h +++ b/bin/named/include/named/tkeyconf.h @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: tkeyconf.h,v 1.5 2000/07/27 09:48:31 tale Exp $ */ +/* $Id: tkeyconf.h,v 1.6 2000/08/01 01:24:49 tale Exp $ */ #ifndef DNS_TKEYCONF_H #define DNS_TKEYCONF_H 1 @@ -45,7 +45,7 @@ dns_tkeyctx_fromconfig(dns_c_ctx_t *cfg, isc_mem_t *mctx, isc_entropy_t *ectx, * ISC_R_SUCCESS * ISC_R_NOMEMORY */ - + ISC_LANG_ENDDECLS #endif /* DNS_TKEYCONF_H */ diff --git a/bin/named/include/named/tsigconf.h b/bin/named/include/named/tsigconf.h index 97bf2ecca3..f9689a524b 100644 --- a/bin/named/include/named/tsigconf.h +++ b/bin/named/include/named/tsigconf.h @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: tsigconf.h,v 1.5 2000/07/27 09:48:33 tale Exp $ */ +/* $Id: tsigconf.h,v 1.6 2000/08/01 01:24:51 tale Exp $ */ #ifndef DNS_TSIGCONF_H #define DNS_TSIGCONF_H 1 @@ -43,7 +43,7 @@ dns_tsigkeyring_fromconfig(dns_c_view_t *confview, dns_c_ctx_t *confctx, * ISC_R_SUCCESS * ISC_R_NOMEMORY */ - + ISC_LANG_ENDDECLS #endif /* DNS_TSIGCONF_H */ diff --git a/bin/named/include/named/types.h b/bin/named/include/named/types.h index 7954cc2d32..d2e44871b9 100644 --- a/bin/named/include/named/types.h +++ b/bin/named/include/named/types.h @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: types.h,v 1.14 2000/07/27 09:37:26 tale Exp $ */ +/* $Id: types.h,v 1.15 2000/08/01 01:12:17 tale Exp $ */ #ifndef NAMED_TYPES_H #define NAMED_TYPES_H 1 diff --git a/bin/named/include/named/update.h b/bin/named/include/named/update.h index 5ada553b3c..a8a756ee12 100644 --- a/bin/named/include/named/update.h +++ b/bin/named/include/named/update.h @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: update.h,v 1.5 2000/07/27 09:37:27 tale Exp $ */ +/* $Id: update.h,v 1.6 2000/08/01 01:12:18 tale Exp $ */ #ifndef NAMED_UPDATE_H #define NAMED_UPDATE_H 1 diff --git a/bin/named/include/named/xfrout.h b/bin/named/include/named/xfrout.h index 1f2164d286..85b8b5761a 100644 --- a/bin/named/include/named/xfrout.h +++ b/bin/named/include/named/xfrout.h @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: xfrout.h,v 1.5 2000/07/27 09:37:28 tale Exp $ */ +/* $Id: xfrout.h,v 1.6 2000/08/01 01:12:19 tale Exp $ */ #ifndef NAMED_XFROUT_H #define NAMED_XFROUT_H 1 diff --git a/bin/named/include/named/zoneconf.h b/bin/named/include/named/zoneconf.h index 4cb86be221..5326b3c9b9 100644 --- a/bin/named/include/named/zoneconf.h +++ b/bin/named/include/named/zoneconf.h @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: zoneconf.h,v 1.12 2000/07/27 09:48:41 tale Exp $ */ +/* $Id: zoneconf.h,v 1.13 2000/08/01 01:24:59 tale Exp $ */ #ifndef DNS_ZONECONF_H #define DNS_ZONECONF_H 1 diff --git a/bin/named/interfacemgr.c b/bin/named/interfacemgr.c index 24ca6a38ba..a3b2419140 100644 --- a/bin/named/interfacemgr.c +++ b/bin/named/interfacemgr.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: interfacemgr.c,v 1.47 2000/07/27 09:36:49 tale Exp $ */ +/* $Id: interfacemgr.c,v 1.48 2000/08/01 01:11:40 tale Exp $ */ #include @@ -31,7 +31,7 @@ #include #include -#define IFMGR_MAGIC 0x49464D47U /* IFMG. */ +#define IFMGR_MAGIC 0x49464D47U /* IFMG. */ #define NS_INTERFACEMGR_VALID(t) ISC_MAGIC_VALID(t, IFMGR_MAGIC) #define IFMGR_COMMON_LOGARGS \ @@ -68,7 +68,7 @@ ns_interfacemgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr, REQUIRE(mctx != NULL); REQUIRE(mgrp != NULL); REQUIRE(*mgrp == NULL); - + mgr = isc_mem_get(mctx, sizeof(*mgr)); if (mgr == NULL) return (ISC_R_NOMEMORY); @@ -84,7 +84,7 @@ ns_interfacemgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr, mgr->clientmgr = clientmgr; mgr->generation = 1; mgr->listenon4 = NULL; - mgr->listenon6 = NULL; + mgr->listenon6 = NULL; ISC_LIST_INIT(mgr->interfaces); /* @@ -98,7 +98,7 @@ ns_interfacemgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr, result = dns_aclenv_init(mctx, &mgr->aclenv); if (result != ISC_R_SUCCESS) goto cleanup_listenon; - + mgr->references = 1; mgr->magic = IFMGR_MAGIC; *mgrp = mgr; @@ -138,7 +138,7 @@ ns_interfacemgr_attach(ns_interfacemgr_t *source, ns_interfacemgr_t **target) { *target = source; } -void +void ns_interfacemgr_detach(ns_interfacemgr_t **targetp) { isc_result_t need_destroy = ISC_FALSE; ns_interfacemgr_t *target = *targetp; @@ -175,7 +175,7 @@ ns_interface_create(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr, { ns_interface_t *ifp; isc_result_t result; - + REQUIRE(NS_INTERFACEMGR_VALID(mgr)); ifp = isc_mem_get(mgr->mctx, sizeof(*ifp)); if (ifp == NULL) @@ -204,7 +204,7 @@ ns_interface_create(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr, isc_task_setname(ifp->task, "ifp", ifp); ifp->udpdispatch = NULL; - + ifp->tcpsocket = NULL; /* * Create a single TCP client object. It will replace itself @@ -215,7 +215,7 @@ ns_interface_create(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr, ifp->ntcptarget = 1; ifp->ntcpcurrent = 0; - ns_interfacemgr_attach(mgr, &ifp->mgr); + ns_interfacemgr_attach(mgr, &ifp->mgr); ISC_LIST_APPEND(mgr->interfaces, ifp, link); ifp->references = 1; @@ -238,7 +238,7 @@ ns_interface_listenudp(ns_interface_t *ifp) { isc_result_t result; unsigned int attrs; unsigned int attrmask; - + attrs = 0; attrs |= DNS_DISPATCHATTR_UDP; if (isc_sockaddr_pf(&ifp->addr) == AF_INET) @@ -278,7 +278,7 @@ ns_interface_listenudp(ns_interface_t *ifp) { static isc_result_t ns_interface_accepttcp(ns_interface_t *ifp) { isc_result_t result; - + /* * Open a TCP socket. */ @@ -333,7 +333,7 @@ ns_interface_setup(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr, isc_result_t result; ns_interface_t *ifp = NULL; REQUIRE(ifpret != NULL && *ifpret == NULL); - + result = ns_interface_create(mgr, addr, name, &ifp); if (result != ISC_R_SUCCESS) return (result); @@ -354,9 +354,9 @@ ns_interface_setup(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr, } *ifpret = ifp; return (ISC_R_SUCCESS); - + cleanup_interface: - ISC_LIST_UNLINK(ifp->mgr->interfaces, ifp, link); + ISC_LIST_UNLINK(ifp->mgr->interfaces, ifp, link); ns_interface_detach(&ifp); return (result); } @@ -376,7 +376,7 @@ ns_interface_destroy(ns_interface_t *ifp) { isc_mutex_destroy(&ifp->lock); ns_interfacemgr_detach(&ifp->mgr); - + ifp->magic = 0; isc_mem_put(mctx, ifp, sizeof(*ifp)); } @@ -391,7 +391,7 @@ ns_interface_attach(ns_interface_t *source, ns_interface_t **target) { *target = source; } -void +void ns_interface_detach(ns_interface_t **targetp) { isc_result_t need_destroy = ISC_FALSE; ns_interface_t *target = *targetp; @@ -472,7 +472,7 @@ do_ipv4(ns_interfacemgr_t *mgr) { result = clearacl(mgr->mctx, &mgr->aclenv.localnets); if (result != ISC_R_SUCCESS) goto cleanup_iter; - + for (result = isc_interfaceiter_first(iter); result == ISC_R_SUCCESS; result = isc_interfaceiter_next(iter)) @@ -482,7 +482,7 @@ do_ipv4(ns_interfacemgr_t *mgr) { ns_listenelt_t *le; dns_aclelement_t elt; unsigned int prefixlen; - + result = isc_interfaceiter_current(iter, &interface); if (result != ISC_R_SUCCESS) break; @@ -509,7 +509,7 @@ do_ipv4(ns_interfacemgr_t *mgr) { result = dns_acl_appendelement(mgr->aclenv.localhost, &elt); if (result != ISC_R_SUCCESS) goto ignore_interface; - + for (le = ISC_LIST_HEAD(mgr->listenon4->elts); le != NULL; le = ISC_LIST_NEXT(le, link)) @@ -537,7 +537,7 @@ do_ipv4(ns_interfacemgr_t *mgr) { &match, NULL); if (match <= 0) continue; - + ifp = find_matching_interface(mgr, &listen_sockaddr); if (ifp != NULL) { ifp->generation = mgr->generation; @@ -549,7 +549,7 @@ do_ipv4(ns_interfacemgr_t *mgr) { ISC_LOG_INFO, "listening on IPv4 interface " "%s, %s", interface.name, sabuf); - + result = ns_interface_setup(mgr, &listen_sockaddr, interface.name, @@ -609,7 +609,7 @@ listenon_is_ip6_any(ns_listenlist_t *p, in_port_t *portp) { if (ISC_LIST_NEXT(elt, link) != NULL) return (ISC_FALSE); /* More than one listen-on-v6 stmt */ if (elt->acl->length != 1) - return (ISC_FALSE); + return (ISC_FALSE); if (elt->acl->elements[0].negative == ISC_FALSE && elt->acl->elements[0].type == dns_aclelementtype_any) { *portp = elt->port; @@ -628,14 +628,14 @@ do_ipv6(ns_interfacemgr_t *mgr) { if (listenon_is_ip6_none(mgr->listenon6)) return; - + if (! listenon_is_ip6_any(mgr->listenon6, &port)) { isc_log_write(IFMGR_COMMON_LOGARGS, - ISC_LOG_ERROR, + ISC_LOG_ERROR, "bad IPv6 listen-on list: must be 'any' or 'none'"); return; } - + in6a = in6addr_any; isc_sockaddr_fromin6(&listen_addr, &in6a, port); @@ -648,7 +648,7 @@ do_ipv6(ns_interfacemgr_t *mgr) { result = ns_interface_setup(mgr, &listen_addr, "", &ifp); if (result != ISC_R_SUCCESS) { isc_log_write(IFMGR_COMMON_LOGARGS, - ISC_LOG_ERROR, + ISC_LOG_ERROR, "listening on IPv6 interfaces failed"); /* Continue. */ } @@ -660,7 +660,7 @@ ns_interfacemgr_scan(ns_interfacemgr_t *mgr, isc_boolean_t verbose) { REQUIRE(NS_INTERFACEMGR_VALID(mgr)); - mgr->generation++; /* Increment the generation count. */ + mgr->generation++; /* Increment the generation count. */ if (isc_net_probeipv6() == ISC_R_SUCCESS) { do_ipv6(mgr); diff --git a/bin/named/listenlist.c b/bin/named/listenlist.c index 7379ee1253..0d7750686c 100644 --- a/bin/named/listenlist.c +++ b/bin/named/listenlist.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: listenlist.c,v 1.7 2000/07/27 09:36:50 tale Exp $ */ +/* $Id: listenlist.c,v 1.8 2000/08/01 01:11:41 tale Exp $ */ #include @@ -77,7 +77,7 @@ destroy(ns_listenlist_t *list) { next = ISC_LIST_NEXT(elt, link); ns_listenelt_destroy(elt); } - isc_mem_put(list->mctx, list, sizeof(*list)); + isc_mem_put(list->mctx, list, sizeof(*list)); } void @@ -113,7 +113,7 @@ ns_listenlist_default(isc_mem_t *mctx, in_port_t port, result = dns_acl_none(mctx, &acl); if (result != ISC_R_SUCCESS) goto cleanup; - + result = ns_listenelt_create(mctx, port, acl, &elt); if (result != ISC_R_SUCCESS) goto cleanup_acl; diff --git a/bin/named/log.c b/bin/named/log.c index 20a55d51f4..3368c6ff91 100644 --- a/bin/named/log.c +++ b/bin/named/log.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: log.c,v 1.21 2000/07/27 09:36:51 tale Exp $ */ +/* $Id: log.c,v 1.22 2000/08/01 01:11:42 tale Exp $ */ #include @@ -96,7 +96,7 @@ isc_result_t ns_log_setdefaultchannels(isc_logconfig_t *lcfg) { isc_result_t result; isc_logdestination_t destination; - + /* * By default, the logging library makes "default_debug" log to * stderr. In BIND, we want to override this and log to named.run @@ -131,7 +131,7 @@ ns_log_setdefaultchannels(isc_logconfig_t *lcfg) { isc_result_t ns_log_setsafechannels(isc_logconfig_t *lcfg) { isc_result_t result; - + if (! ns_g_logstderr) { result = isc_log_createchannel(lcfg, "default_debug", ISC_LOG_TONULL, diff --git a/bin/named/logconf.c b/bin/named/logconf.c index c322acd026..1446903159 100644 --- a/bin/named/logconf.c +++ b/bin/named/logconf.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: logconf.c,v 1.23 2000/07/27 09:36:52 tale Exp $ */ +/* $Id: logconf.c,v 1.24 2000/08/01 01:11:44 tale Exp $ */ #include @@ -95,14 +95,14 @@ channel_fromconf(dns_c_logchan_t *cchan, isc_logconfig_t *lctx) { unsigned int type; unsigned int flags = 0; int level; - + type = ISC_LOG_TONULL; switch (cchan->ctype) { case dns_c_logchan_file: type = ISC_LOG_TOFILE; { const char *path = NULL; - isc_int32_t versions = ISC_LOG_ROLLNEVER; + isc_int32_t versions = ISC_LOG_ROLLNEVER; /* * XXXDCL should be isc_offset_t, but that * is incompatible with dns_c_logchan_getsize. @@ -171,10 +171,10 @@ channel_fromconf(dns_c_logchan_t *cchan, isc_logconfig_t *lctx) { flags |= ISC_LOG_PRINTLEVEL; /* XXX ISC_LOG_PRINTMODULE */ } - + level = ISC_LOG_INFO; (void)dns_c_logchan_getdebuglevel(cchan, &level); - + result = isc_log_createchannel(lctx, cchan->name, type, level, &dest, flags); return (result); @@ -188,7 +188,7 @@ ns_log_configure(isc_logconfig_t *lcctx, dns_c_logginglist_t *clog) { isc_boolean_t default_set = ISC_FALSE; CHECK(ns_log_setdefaultchannels(lcctx)); - + for (cchan = ISC_LIST_HEAD(clog->channels); cchan != NULL; cchan = ISC_LIST_NEXT(cchan, next)) { diff --git a/bin/named/lwdclient.c b/bin/named/lwdclient.c index f9760a0ff0..89486b03eb 100644 --- a/bin/named/lwdclient.c +++ b/bin/named/lwdclient.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lwdclient.c,v 1.5 2000/07/27 09:36:53 tale Exp $ */ +/* $Id: lwdclient.c,v 1.6 2000/08/01 01:11:45 tale Exp $ */ #include @@ -250,7 +250,7 @@ ns_lwdclient_send(isc_task_t *task, isc_event_t *ev) { UNUSED(task); UNUSED(dev); - + INSIST(NS_LWDCLIENT_ISSEND(client)); INSIST(client->sendbuf == dev->region.base); diff --git a/bin/named/lwderror.c b/bin/named/lwderror.c index d893695ff1..804594b9ad 100644 --- a/bin/named/lwderror.c +++ b/bin/named/lwderror.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lwderror.c,v 1.3 2000/07/27 09:36:54 tale Exp $ */ +/* $Id: lwderror.c,v 1.4 2000/08/01 01:11:46 tale Exp $ */ #include diff --git a/bin/named/lwdgabn.c b/bin/named/lwdgabn.c index c7a8bc4def..dfa5a02874 100644 --- a/bin/named/lwdgabn.c +++ b/bin/named/lwdgabn.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lwdgabn.c,v 1.5 2000/07/27 09:36:55 tale Exp $ */ +/* $Id: lwdgabn.c,v 1.6 2000/08/01 01:11:47 tale Exp $ */ #include @@ -297,7 +297,7 @@ process_gabn_finddone(isc_task_t *task, isc_event_t *ev) { client->find = NULL; else dns_adb_destroyfind(&client->find); - + } generate_reply(client); return; @@ -453,14 +453,14 @@ start_find(ns_lwdclient_t *client) { } -static void +static void init_gabn(ns_lwdclient_t *client) { int i; /* * Initialize the real name and alias arrays in the reply we're * going to build up. - */ + */ for (i = 0 ; i < LWRES_MAX_ALIASES ; i++) { client->aliases[i] = NULL; client->aliaslen[i] = 0; diff --git a/bin/named/lwdgnba.c b/bin/named/lwdgnba.c index 22ce457453..6d9507100e 100644 --- a/bin/named/lwdgnba.c +++ b/bin/named/lwdgnba.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lwdgnba.c,v 1.5 2000/07/27 09:36:57 tale Exp $ */ +/* $Id: lwdgnba.c,v 1.6 2000/08/01 01:11:48 tale Exp $ */ #include @@ -100,7 +100,7 @@ byaddr_done(isc_task_t *task, isc_event_t *event) { * fails. */ client->options |= DNS_BYADDROPT_IPV6NIBBLE; - + start_byaddr(client); return; } diff --git a/bin/named/lwdnoop.c b/bin/named/lwdnoop.c index f9e9592404..c1f6a3e590 100644 --- a/bin/named/lwdnoop.c +++ b/bin/named/lwdnoop.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lwdnoop.c,v 1.3 2000/07/27 09:36:58 tale Exp $ */ +/* $Id: lwdnoop.c,v 1.4 2000/08/01 01:11:49 tale Exp $ */ #include diff --git a/bin/named/lwresd.8 b/bin/named/lwresd.8 index 0da2cb857d..c1f69472d5 100644 --- a/bin/named/lwresd.8 +++ b/bin/named/lwresd.8 @@ -1,9 +1,9 @@ .\" 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 .\" 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 @@ -12,9 +12,9 @@ .\" 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: lwresd.8,v 1.5 2000/07/27 09:42:28 tale Exp $ -.\" +.\" +.\" $Id: lwresd.8,v 1.6 2000/08/01 01:18:43 tale Exp $ +.\" .Dd Jun 30, 2000 .Dt LWRESD 8 .Os BIND9 9 @@ -38,11 +38,11 @@ is the daemon providing name lookup services to clients that use the BIND 9 lightweight resolver library. It is essentially a stripped-down, caching-only name server that -answers queries using the BIND 9 lightweight resolver protocol +answers queries using the BIND 9 lightweight resolver protocol rather than the DNS protocol. .Pp .Nm lwresd -listens for resolver queries on a UDP port on the IPv4 loopback +listens for resolver queries on a UDP port on the IPv4 loopback interface, 127.0.0.1. This means that .Nm lwresd @@ -71,8 +71,8 @@ server. If no .Sy nameserver entries are present, or if forwarding fails, .Nm lwresd -resolves the queries autonomously starting at the -root name servers, using a compiled-in list of root +resolves the queries autonomously starting at the +root name servers, using a compiled-in list of root servers hints. .Pp The options to @@ -104,7 +104,7 @@ write the daemon's process id to .Ar pid-file instead of the default pathname. .It Fl n -create +create .Ar #cpus worker threads to take advantage of multiple CPUs. If no option is given, diff --git a/bin/named/lwresd.c b/bin/named/lwresd.c index 0728494c0e..6b73feb3d4 100644 --- a/bin/named/lwresd.c +++ b/bin/named/lwresd.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,12 +15,12 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lwresd.c,v 1.12 2000/07/27 09:36:59 tale Exp $ */ +/* $Id: lwresd.c,v 1.13 2000/08/01 01:11:50 tale Exp $ */ /* * Main program for the Lightweight Resolver Daemon. * - * To paraphrase the old saying about X11, "It's not a lightweight deamon + * To paraphrase the old saying about X11, "It's not a lightweight deamon * for resolvers, it's a deamon for lightweight resolvers". */ @@ -180,7 +180,7 @@ ns_lwresd_createview(ns_lwresd_t *lwresd, dns_view_t **viewp) { unsigned int attrs; isc_sockaddr_t any4, any6; dns_dispatch_t *disp4 = NULL; - dns_dispatch_t *disp6 = NULL; + dns_dispatch_t *disp6 = NULL; isc_sockaddrlist_t forwarders; dns_view_t *view; @@ -240,7 +240,7 @@ ns_lwresd_createview(ns_lwresd_t *lwresd, dns_view_t **viewp) { } if (disp4 == NULL && disp6 == NULL) fatal("not listening on IPv4 or IPv6", ISC_R_FAILURE); - + result = dns_view_createresolver(view, ns_g_taskmgr, 16, ns_g_socketmgr, ns_g_timermgr, 0, lwresd->dispmgr, disp4, disp6); diff --git a/bin/named/main.c b/bin/named/main.c index 76e3e17293..c9a1fb8140 100644 --- a/bin/named/main.c +++ b/bin/named/main.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: main.c,v 1.75 2000/07/27 09:37:00 tale Exp $ */ +/* $Id: main.c,v 1.76 2000/08/01 01:11:51 tale Exp $ */ #include @@ -38,7 +38,7 @@ * Defining NS_MAIN provides storage declaratons (rather than extern) * for variables in named/globals.h. */ -#define NS_MAIN 1 +#define NS_MAIN 1 #include /* Explicit, though named/log.h includes it. */ #include @@ -185,7 +185,7 @@ usage(void) { " [-p port] [-s] [-t chrootdir] [-u username]\n"); } -static void +static void parse_lwresd_command_line(int argc, char *argv[]) { int ch; unsigned int port; @@ -259,7 +259,7 @@ parse_lwresd_command_line(int argc, char *argv[]) { } } -static void +static void parse_command_line(int argc, char *argv[]) { int ch; unsigned int port; @@ -508,7 +508,7 @@ main(int argc, char *argv[]) { */ do { result = isc_app_run(); - + if (result == ISC_R_RELOAD) { ns_server_reloadwanted(ns_g_server); } else if (result != ISC_R_SUCCESS) { diff --git a/bin/named/named.8 b/bin/named/named.8 index 0e42a5f600..de9b387449 100644 --- a/bin/named/named.8 +++ b/bin/named/named.8 @@ -1,9 +1,9 @@ .\" 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 .\" 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 @@ -12,9 +12,9 @@ .\" 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: named.8,v 1.4 2000/07/27 09:42:29 tale Exp $ -.\" +.\" +.\" $Id: named.8,v 1.5 2000/08/01 01:18:44 tale Exp $ +.\" .Dd Jun 30, 2000 .Dt NAMED 8 .Os BIND9 9 @@ -55,12 +55,12 @@ However when operating as a lightweight resolver server, .Nm named is functionally and logically distinct from a conventional name server. -More information can be found in +More information can be found in .Xr lwresd 8 . .Pp Although some command-line options can be used with .Nm named , -the name server's behaviour is mainly controlled by its configuration file, +the name server's behaviour is mainly controlled by its configuration file, .Pa /etc/named.conf . Refer to the BIND9 Administrator Reference Manual for further details. .Pp @@ -89,7 +89,7 @@ run in the foreground and force all logging to .Dv stderr . .It Fl n -create +create .Ar #cpus worker threads to take advantage of multiple CPUs. If no option is given, @@ -122,7 +122,7 @@ as UID .Ar user-id . .Nm named will change its UID after it has -carried out any privileged operations, such as +carried out any privileged operations, such as creating sockets that listen on privileged ports. .It Fl x load data from diff --git a/bin/named/named.conf.test b/bin/named/named.conf.test index 3c27e89b67..593bcbfe77 100644 --- a/bin/named/named.conf.test +++ b/bin/named/named.conf.test @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf.test,v 1.4 2000/07/27 09:37:01 tale Exp $ */ +/* $Id: named.conf.test,v 1.5 2000/08/01 01:11:52 tale Exp $ */ options { directory "/var/named"; diff --git a/bin/named/notify.c b/bin/named/notify.c index 50f55c0cb2..12a9fe68b0 100644 --- a/bin/named/notify.c +++ b/bin/named/notify.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: notify.c,v 1.19 2000/07/27 09:37:02 tale Exp $ */ +/* $Id: notify.c,v 1.20 2000/08/01 01:11:54 tale Exp $ */ #include @@ -32,7 +32,7 @@ /* * This module implements notify as in RFC 1996. */ - + /**************************************************************************/ /* @@ -145,7 +145,7 @@ ns_notify_start(ns_client_t *client) { dns_name_t *zonename; dns_rdataset_t *zone_rdataset; dns_zone_t *zone = NULL; - + /* * Interpret the question section. */ @@ -188,7 +188,7 @@ ns_notify_start(ns_client_t *client) { } dns_zone_detach(&zone); return; - + failure: if (zone != NULL) dns_zone_detach(&zone); diff --git a/bin/named/omapi.c b/bin/named/omapi.c index 5a8e07442e..796076545b 100644 --- a/bin/named/omapi.c +++ b/bin/named/omapi.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: omapi.c,v 1.15 2000/07/27 09:37:04 tale Exp $ */ +/* $Id: omapi.c,v 1.16 2000/08/01 01:11:55 tale Exp $ */ /* * Principal Author: DCL diff --git a/bin/named/omapiconf.c b/bin/named/omapiconf.c index 66d51c8ccf..d8c35b6451 100644 --- a/bin/named/omapiconf.c +++ b/bin/named/omapiconf.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: omapiconf.c,v 1.9 2000/07/27 09:37:05 tale Exp $ */ +/* $Id: omapiconf.c,v 1.10 2000/08/01 01:11:56 tale Exp $ */ /* * Principal Author: DCL @@ -277,7 +277,7 @@ register_keys(dns_c_ctrl_t *control, dns_c_kdeflist_t *keydeflist, keydef->keyid, socktext, isc_result_totext(result)); } -} +} static void update_listener(ns_omapilistener_t **listenerp, dns_c_ctrl_t *control, @@ -427,7 +427,7 @@ ns_omapi_configure(isc_mem_t *mctx, dns_c_ctx_t *cctx, /* * Run through the new control channel list, noting sockets that * are already being listened on and moving them to the new list. - * + * * Identifying duplicates addr/port combinations is left to either * the underlying config code, or to the bind attempt getting an * address-in-use error. @@ -481,7 +481,7 @@ ns_omapi_configure(isc_mem_t *mctx, dns_c_ctx_t *cctx, */ add_listener(mctx, &listener, control, cctx, aclconfctx, socktext); - + if (listener != NULL) ISC_LIST_APPEND(new_listeners, listener, link); diff --git a/bin/named/query.c b/bin/named/query.c index 80f53e7ba1..1b5b2d3b0a 100644 --- a/bin/named/query.c +++ b/bin/named/query.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: query.c,v 1.119 2000/07/31 21:06:55 explorer Exp $ */ +/* $Id: query.c,v 1.120 2000/08/01 01:11:57 tale Exp $ */ #include @@ -113,7 +113,7 @@ query_reset(ns_client_t *client, isc_boolean_t everything) { */ if (client->query.fetch != NULL) { dns_resolver_cancelfetch(client->query.fetch); - + client->query.fetch = NULL; } @@ -385,7 +385,7 @@ query_getdbversion(ns_client_t *client) { dbversion = ISC_LIST_HEAD(client->query.freeversions); INSIST(dbversion != NULL); ISC_LIST_UNLINK(client->query.freeversions, dbversion, link); - + return (dbversion); } @@ -443,7 +443,7 @@ query_findversion(ns_client_t *client, dns_db_t *db, *newzonep = ISC_TRUE; } else *newzonep = ISC_FALSE; - + return (dbversion); } @@ -593,7 +593,7 @@ query_getcachedb(ns_client_t *client, dns_db_t **dbp, unsigned int options) if (!USECACHE(client)) return (DNS_R_REFUSED); dns_db_attach(client->view->cachedb, dbp); - + if ((client->query.attributes & NS_QUERYATTR_QUERYOKVALID) != 0) { /* @@ -612,7 +612,7 @@ query_getcachedb(ns_client_t *client, dns_db_t **dbp, unsigned int options) */ check_acl = ISC_TRUE; } - + if (check_acl) { isc_boolean_t log = ISC_TF((options & DNS_GETDB_NOLOG) == 0); result = ns_client_checkacl(client, "query", client->view->queryacl, @@ -631,7 +631,7 @@ query_getcachedb(ns_client_t *client, dns_db_t **dbp, unsigned int options) * the NS_QUERYATTR_QUERYOK attribute is now valid. */ client->query.attributes |= NS_QUERYATTR_QUERYOKVALID; - + } else result = ISC_R_SUCCESS; @@ -926,7 +926,7 @@ query_addadditional(void *arg, dns_name_t *name, dns_rdatatype_t qtype) { /* * Most likely the client isn't allowed to query the cache. */ - goto try_glue; + goto try_glue; result = dns_db_find(db, name, version, type, client->query.dboptions, client->now, &node, fname, rdataset, @@ -1019,7 +1019,7 @@ query_addadditional(void *arg, dns_name_t *name, dns_rdatatype_t qtype) { rdataset = query_newrdataset(client); if (rdataset == NULL) goto addname; - } + } if (sigrdataset != NULL) { if (dns_rdataset_isassociated(sigrdataset)) dns_rdataset_disassociate(sigrdataset); @@ -1027,7 +1027,7 @@ query_addadditional(void *arg, dns_name_t *name, dns_rdatatype_t qtype) { sigrdataset = query_newrdataset(client); if (sigrdataset == NULL) goto addname; - } + } result = dns_db_findrdataset(db, node, version, dns_rdatatype_a, 0, client->now, rdataset, @@ -1294,10 +1294,10 @@ query_addrdataset(ns_client_t *client, dns_name_t *fname, dns_rdatatype_t type = rdataset->type; /* - * Add 'rdataset' and any pertinent additional data to + * Add 'rdataset' and any pertinent additional data to * 'fname', a name in the response message for 'client'. */ - + CTRACE("query_addrdataset"); ISC_LIST_APPEND(fname->list, rdataset, link); @@ -1744,7 +1744,7 @@ query_addbestns(ns_client_t *client) { static inline isc_result_t query_checktype(dns_rdatatype_t type) { - + /* * XXXRTH OPT still needs to be added. * Should get help with this from rdata.c @@ -1833,9 +1833,9 @@ query_resume(isc_task_t *task, isc_event_t *event) { RWLOCK(&client->lockview->conflock, isc_rwlocktype_read); query_find(client, devent); - + RWUNLOCK(&client->lockview->conflock, isc_rwlocktype_read); - dns_view_detach(&client->lockview); + dns_view_detach(&client->lockview); dns_zonemgr_unlockconf(ns_g_server->zonemgr, isc_rwlocktype_read); RWUNLOCK(&ns_g_server->conflock, isc_rwlocktype_read); @@ -1853,12 +1853,12 @@ query_recurse(ns_client_t *client, dns_rdatatype_t qtype, dns_name_t *qdomain, * We are about to recurse, which means that this client will * be unavailable for serving new requests for an indeterminate * amount of time. If this client is currently responsible - * for handling incoming queries, set up a new client + * for handling incoming queries, set up a new client * object to handle them while we are waiting for a * response. */ if (! client->mortal) { - result = isc_quota_attach(&ns_g_server->recursionquota, + result = isc_quota_attach(&ns_g_server->recursionquota, &client->recursionquota); if (result == ISC_R_SUCCESS) result = ns_client_replace(client); @@ -1867,7 +1867,7 @@ query_recurse(ns_client_t *client, dns_rdatatype_t qtype, dns_name_t *qdomain, NS_LOGMODULE_QUERY, ISC_LOG_WARNING, "no more recursive clients: %s", isc_result_totext(result)); - return (result); + return (result); } } @@ -1905,7 +1905,7 @@ query_recurse(ns_client_t *client, dns_rdatatype_t qtype, dns_name_t *qdomain, query_putrdataset(client, &rdataset); query_putrdataset(client, &sigrdataset); } - + return (result); } @@ -1949,7 +1949,7 @@ query_findparentkey(ns_client_t *client, dns_name_t *name, result = ISC_R_FAILURE; goto cleanup; } - + result = dns_db_find(pdb, name, pversion, dns_rdatatype_key, client->query.dboptions, client->now, &pnode, @@ -2025,7 +2025,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event) { CTRACE("query_find"); - /* + /* * One-time initialization. * * It's especially important to initialize anything that the cleanup @@ -2597,7 +2597,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event) { result = dns_name_split(client->query.qname, nlabels, nbits, prefix, NULL); if (result != ISC_R_SUCCESS) - goto cleanup; + goto cleanup; INSIST(fname == NULL); dbuf = query_getnamebuf(client); if (dbuf == NULL) @@ -2837,9 +2837,9 @@ query_find(ns_client_t *client, dns_fetchevent_t *event) { if (client->message->rcode == dns_rcode_nxdomain && client->view->auth_nxdomain == ISC_TRUE) client->message->flags |= DNS_MESSAGEFLAG_AA; - + ns_client_send(client); - ns_client_detach(&client); + ns_client_detach(&client); } CTRACE("query_find: done"); } @@ -2855,7 +2855,7 @@ log_query(ns_client_t *client) { /* XXXRTH Allow this to be turned off! */ dns_name_format(client->query.qname, namebuf, sizeof(namebuf)); - + isc_buffer_init(&b, (unsigned char *)text, sizeof(text)); for (rdataset = ISC_LIST_HEAD(client->query.qname->list); rdataset != NULL; @@ -2880,7 +2880,7 @@ ns_query_start(ns_client_t *client) { dns_message_t *message = client->message; dns_rdataset_t *rdataset; ns_client_t *qclient; - + CTRACE("ns_query_start"); /* @@ -2901,7 +2901,7 @@ ns_query_start(ns_client_t *client) { /* * If the client isn't allowed to recurse (due to * "recursion no", the allow-recursion ACL, or the - * lack of a resolver in this view), or if it + * lack of a resolver in this view), or if it * doesn't want recursion, turn recursion off. */ client->query.attributes &= ~NS_QUERYATTR_RECURSIONOK; @@ -2951,7 +2951,7 @@ ns_query_start(ns_client_t *client) { } } } - + /* * Check for meta-queries like IXFR and AXFR. */ diff --git a/bin/named/server.c b/bin/named/server.c index a444070412..aff18ab0f6 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: server.c,v 1.206 2000/07/31 21:06:56 explorer Exp $ */ +/* $Id: server.c,v 1.207 2000/08/01 01:11:59 tale Exp $ */ #include @@ -113,7 +113,7 @@ ns_listenlist_fromconfig(dns_c_lstnlist_t *clist, dns_c_ctx_t *cctx, * (for a global default). */ static isc_result_t -configure_view_acl(dns_c_view_t *cview, +configure_view_acl(dns_c_view_t *cview, dns_c_ctx_t *cctx, dns_aclconfctx_t *actx, isc_mem_t *mctx, isc_result_t (*getvcacl) @@ -123,7 +123,7 @@ configure_view_acl(dns_c_view_t *cview, dns_acl_t **aclp) { isc_result_t result; - + dns_c_ipmatchlist_t *cacl = NULL; if (*aclp != NULL) dns_acl_detach(aclp); @@ -155,14 +155,14 @@ base64_cstring_tobuffer(isc_mem_t *mctx, char *cstr, isc_buffer_t *target) { isc_buffer_t source; isc_lex_t *lex = NULL; isc_boolean_t isopen = ISC_FALSE; - + isc_buffer_init(&source, cstr, strlen(cstr)); isc_buffer_add(&source, strlen(cstr)); CHECK(isc_lex_create(mctx, 256, &lex)); CHECK(isc_lex_openbuffer(lex, &source)); isopen = ISC_TRUE; CHECK(isc_base64_tobuffer(lex, target, -1)); - + cleanup: if (isopen) (void)isc_lex_close(lex); @@ -174,9 +174,9 @@ base64_cstring_tobuffer(isc_mem_t *mctx, char *cstr, isc_buffer_t *target) { /* * Configure DNSSEC keys for a view. Currently used only for * the security roots. - * + * * The per-view configuration values and their server-global - * defaults are are read from 'cview' and 'cctx' using + * defaults are are read from 'cview' and 'cctx' using * the function 'cgetv' and 'cgets', respectively. * The variable to be configured is '*target'. */ @@ -195,7 +195,7 @@ configure_view_dnsseckeys(dns_c_view_t *cview, dns_c_tkey_t *ckey; dns_keytable_t *keytable = NULL; dst_key_t *dstkey = NULL; - + CHECK(dns_keytable_create(mctx, &keytable)); result = ISC_R_FAILURE; @@ -220,7 +220,7 @@ configure_view_dnsseckeys(dns_c_view_t *cview, dns_fixedname_t fkeyname; dns_name_t *keyname; isc_buffer_t namebuf; - + if (cview == NULL) viewclass = dns_rdataclass_in; else @@ -229,13 +229,13 @@ configure_view_dnsseckeys(dns_c_view_t *cview, keystruct.common.rdclass = viewclass; keystruct.common.rdtype = dns_rdatatype_key; /* - * The key data in keystruct is not + * The key data in keystruct is not * dynamically allocated. */ - keystruct.mctx = NULL; - + keystruct.mctx = NULL; + ISC_LINK_INIT(&keystruct.common, link); - + flags = ckey->pubkey->flags; proto = ckey->pubkey->protocol; alg = ckey->pubkey->algorithm; @@ -248,16 +248,16 @@ configure_view_dnsseckeys(dns_c_view_t *cview, keystruct.flags = flags; keystruct.protocol = proto; keystruct.algorithm = alg; - + isc_buffer_init(&keydatabuf, keydata, sizeof(keydata)); isc_buffer_init(&rrdatabuf, rrdata, sizeof(rrdata)); - + CHECK(base64_cstring_tobuffer(mctx, ckey->pubkey->key, &keydatabuf)); isc_buffer_usedregion(&keydatabuf, &r); keystruct.datalen = r.length; keystruct.data = r.base; - + CHECK(dns_rdata_fromstruct(NULL, keystruct.common.rdclass, keystruct.common.rdtype, @@ -272,13 +272,13 @@ configure_view_dnsseckeys(dns_c_view_t *cview, NULL)); CHECK(dst_key_fromdns(keyname, &rrdatabuf, mctx, &dstkey)); - + CHECK(dns_keytable_add(keytable, &dstkey)); INSIST(dstkey == NULL); } } else if (result != ISC_R_NOTFOUND) goto cleanup; - + dns_keytable_detach(target); *target = keytable; /* Transfer ownership. */ keytable = NULL; @@ -289,7 +289,7 @@ configure_view_dnsseckeys(dns_c_view_t *cview, dst_key_free(&dstkey); return (result); } - + /* * Get a dispatch appropriate for the resolver of a given view. @@ -325,12 +325,12 @@ get_view_querysource_dispatch(dns_c_ctx_t *cctx, dns_c_view_t *cview, if (result != ISC_R_SUCCESS) result = dns_c_ctx_getquerysourcev6(cctx, &sa); if (result != ISC_R_SUCCESS) - isc_sockaddr_any6(&sa); + isc_sockaddr_any6(&sa); break; default: INSIST(0); } - + INSIST(isc_sockaddr_pf(&sa) == af); /* @@ -390,7 +390,7 @@ get_view_querysource_dispatch(dns_c_ctx_t *cctx, dns_c_view_t *cview, * Configure 'view' according to 'cview', taking defaults from 'cctx' * where values are missing in cctx. * - * When configuring the default view, cctx will be NULL and the + * When configuring the default view, cctx will be NULL and the * glboal defaults in cview used exclusively. */ static isc_result_t @@ -412,7 +412,7 @@ configure_view(dns_view_t *view, dns_c_ctx_t *cctx, dns_c_view_t *cview, dns_dispatch_t *dispatch4 = NULL; dns_dispatch_t *dispatch6 = NULL; in_port_t port; - + REQUIRE(DNS_VIEW_VALID(view)); ISC_LIST_INIT(addresses); @@ -427,13 +427,13 @@ configure_view(dns_view_t *view, dns_c_ctx_t *cctx, dns_c_view_t *cview, if (result != ISC_R_SUCCESS) port = 53; dns_view_setdstport(view, port); - + /* * Configure the view's cache. Try to reuse an existing * cache if possible, otherwise create a new cache. * Note that the ADB is not preserved in either case. - * - * XXX Determining when it is safe to reuse a cache is + * + * XXX Determining when it is safe to reuse a cache is * tricky. When the view's configuration changes, the cached * data may become invalid because it reflects our old * view of the world. As more view attributes become @@ -559,7 +559,7 @@ configure_view(dns_view_t *view, dns_c_ctx_t *cctx, dns_c_view_t *cview, result = ISC_R_FAILURE; goto cleanup; } - + /* * Configure the view's TSIG keys. */ @@ -573,7 +573,7 @@ configure_view(dns_view_t *view, dns_c_ctx_t *cctx, dns_c_view_t *cview, { dns_peerlist_t *newpeers = NULL; - result = ISC_R_NOTFOUND; + result = ISC_R_NOTFOUND; if (cview != NULL) result = dns_c_view_getpeerlist(cview, &newpeers); if (result != ISC_R_SUCCESS) @@ -589,7 +589,7 @@ configure_view(dns_view_t *view, dns_c_ctx_t *cctx, dns_c_view_t *cview, /* * Configure the "match-clients" ACL. */ - CHECK(configure_view_acl(cview, cctx, actx, ns_g_mctx, + CHECK(configure_view_acl(cview, cctx, actx, ns_g_mctx, dns_c_view_getmatchclients, NULL, &view->matchclients)); @@ -607,7 +607,7 @@ configure_view(dns_view_t *view, dns_c_ctx_t *cctx, dns_c_view_t *cview, (void)dns_c_view_getauthnxdomain(cview, &view->auth_nxdomain); result = ISC_R_NOTFOUND; - if (cview != NULL) + if (cview != NULL) result = dns_c_view_gettransferformat(cview, &view->transfer_format); if (result != ISC_R_SUCCESS) @@ -643,7 +643,7 @@ configure_view(dns_view_t *view, dns_c_ctx_t *cctx, dns_c_view_t *cview, dns_c_view_getallowquery, dns_c_ctx_getallowquery, &view->queryacl)); - + CHECK(configure_view_acl(cview, cctx, actx, ns_g_mctx, dns_c_view_getrecursionacl, dns_c_ctx_getallowrecursion, @@ -776,13 +776,13 @@ create_version_view(dns_c_ctx_t *cctx, dns_zonemgr_t *zmgr, dns_view_t **viewp) CHECK(dns_zone_setorigin(zone, &origin)); dns_zone_settype(zone, dns_zone_master); dns_zone_setclass(zone, dns_rdataclass_ch); - dns_zone_setview(zone, view); - + dns_zone_setview(zone, view); + CHECK(dns_zonemgr_managezone(zmgr, zone)); CHECK(dns_db_create(ns_g_mctx, "rbt", &origin, dns_dbtype_zone, dns_rdataclass_ch, 0, NULL, &db)); - + CHECK(dns_db_newversion(db, &dbver)); CHECK(dns_difftuple_create(ns_g_mctx, DNS_DIFFOP_ADD, &origin, @@ -872,7 +872,7 @@ find_or_create_view(dns_c_view_t *cview, dns_viewlist_t *viewlist, result = dns_view_create(ns_g_mctx, viewclass, viewname, &view); if (result != ISC_R_SUCCESS) return (result); - + ISC_LIST_APPEND(*viewlist, view, link); dns_view_attach(view, viewp); return (ISC_R_SUCCESS); @@ -891,10 +891,10 @@ configure_zone(dns_c_ctx_t *cctx, dns_c_zone_t *czone, dns_c_view_t *cview, dns_view_t *pview = NULL; /* Production view */ dns_zone_t *zone = NULL; /* New or reused zone */ dns_zone_t *dupzone = NULL; - + isc_result_t result; - char *corigin; + char *corigin; isc_buffer_t buffer; dns_fixedname_t fixorigin; dns_name_t *origin; @@ -911,7 +911,7 @@ configure_zone(dns_c_ctx_t *cctx, dns_c_zone_t *czone, dns_c_view_t *cview, CHECK(dns_name_fromtext(dns_fixedname_name(&fixorigin), &buffer, dns_rootname, ISC_FALSE, NULL)); origin = dns_fixedname_name(&fixorigin); - + /* * Find or create the view in the new view list. */ @@ -926,7 +926,7 @@ configure_zone(dns_c_ctx_t *cctx, dns_c_zone_t *czone, dns_c_view_t *cview, result = ISC_R_FAILURE; goto cleanup; } - + /* * Master zones must have 'file' set. */ @@ -999,7 +999,7 @@ configure_zone(dns_c_ctx_t *cctx, dns_c_zone_t *czone, dns_c_view_t *cview, * - The zone's view exists * - A zone with the right name exists in the view * - The zone is compatible with the config - * options (e.g., an existing master zone cannot + * options (e.g., an existing master zone cannot * be reused if the options specify a slave zone) */ result = dns_viewlist_find(&ns_g_server->viewlist, @@ -1098,7 +1098,7 @@ options_callback(dns_c_ctx_t *cctx, void *uap) { } -static void +static void scan_interfaces(ns_server_t *server, isc_boolean_t verbose) { ns_interfacemgr_scan(server->interfacemgr, verbose); dns_aclenv_copy(&server->aclenv, @@ -1111,7 +1111,7 @@ scan_interfaces(ns_server_t *server, isc_boolean_t verbose) { */ static void interface_timer_tick(isc_task_t *task, isc_event_t *event) { - ns_server_t *server = (ns_server_t *) event->ev_arg; + ns_server_t *server = (ns_server_t *) event->ev_arg; UNUSED(task); isc_event_free(&event); RWLOCK(&server->conflock, isc_rwlocktype_write); @@ -1136,12 +1136,12 @@ load_configuration(const char *filename, ns_server_t *server, char *pidfilename; isc_uint32_t interface_interval; in_port_t listen_port; - + dns_aclconfctx_init(&aclconfctx); RWLOCK(&server->conflock, isc_rwlocktype_write); dns_zonemgr_lockconf(server->zonemgr, isc_rwlocktype_write); - + lctx.mctx = ns_g_mctx; lctx.aclconf = &aclconfctx; ISC_LIST_INIT(lctx.viewlist); @@ -1163,7 +1163,7 @@ load_configuration(const char *filename, ns_server_t *server, cctx = NULL; CHECK(dns_c_parse_namedconf(filename, ns_g_mctx, &cctx, &callbacks)); - + /* * Configure various server options. */ @@ -1247,7 +1247,7 @@ load_configuration(const char *filename, ns_server_t *server, ns_interfacemgr_setlistenon6(server->interfacemgr, listenon); ns_listenlist_detach(&listenon); } - + /* * Rescan the interface list to pick up changes in the * listen-on option. It's important that we do this before we try @@ -1295,10 +1295,10 @@ load_configuration(const char *filename, ns_server_t *server, } } INSIST(view == NULL); - + /* - * Make sure we have a default view if and only if there - * were no explicit views. + * Make sure we have a default view if and only if there + * were no explicit views. */ if (cctx->views == NULL || ISC_LIST_EMPTY(cctx->views->views)) { /* @@ -1317,7 +1317,7 @@ load_configuration(const char *filename, ns_server_t *server, * There are explicit views. There should not be * a default view. If there is one, complain. */ - result = dns_viewlist_find(&lctx.viewlist, "_default", + result = dns_viewlist_find(&lctx.viewlist, "_default", dns_rdataclass_in, &view); if (result == ISC_R_SUCCESS) { dns_view_detach(&view); @@ -1329,7 +1329,7 @@ load_configuration(const char *filename, ns_server_t *server, goto cleanup; } } - + /* * Create (or recreate) the version view. */ @@ -1372,8 +1372,8 @@ load_configuration(const char *filename, ns_server_t *server, /* * Configure the logging system. - * - * Do this after changing UID to make sure that any log + * + * Do this after changing UID to make sure that any log * files specified in named.conf get created by the * unprivileged user, not root. */ @@ -1417,10 +1417,10 @@ load_configuration(const char *filename, ns_server_t *server, else ns_os_writepidfile(ns_g_defaultpidfile); - dns_aclconfctx_destroy(&aclconfctx); + dns_aclconfctx_destroy(&aclconfctx); dns_c_ctx_delete(&cctx); - + cleanup: /* * This cleans up either the old production view list @@ -1452,7 +1452,7 @@ load_zones(ns_server_t *server, isc_boolean_t stop) { dns_view_t *view; dns_zonemgr_lockconf(server->zonemgr, isc_rwlocktype_read); - + /* * Load zone data from disk. */ @@ -1470,7 +1470,7 @@ load_zones(ns_server_t *server, isc_boolean_t stop) { */ CHECK(dns_zonemgr_forcemaint(server->zonemgr)); cleanup: - dns_zonemgr_unlockconf(server->zonemgr, isc_rwlocktype_read); + dns_zonemgr_unlockconf(server->zonemgr, isc_rwlocktype_read); return (result); } @@ -1490,7 +1490,7 @@ run_server(isc_task_t *task, isc_event_t *event) { CHECKFATAL(ns_clientmgr_create(ns_g_mctx, ns_g_taskmgr, ns_g_timermgr, &server->clientmgr), "creating client manager"); - + CHECKFATAL(ns_interfacemgr_create(ns_g_mctx, ns_g_taskmgr, ns_g_socketmgr, ns_g_dispatchmgr, server->clientmgr, @@ -1517,7 +1517,7 @@ static void shutdown_server(isc_task_t *task, isc_event_t *event) { dns_view_t *view, *view_next; ns_server_t *server = (ns_server_t *)event->ev_arg; - + UNUSED(task); RWLOCK(&server->conflock, isc_rwlocktype_write); @@ -1537,7 +1537,7 @@ shutdown_server(isc_task_t *task, isc_event_t *event) { isc_timer_detach(&server->interface_timer); ns_interfacemgr_shutdown(server->interfacemgr); - ns_interfacemgr_detach(&server->interfacemgr); + ns_interfacemgr_detach(&server->interfacemgr); dns_dispatchmgr_destroy(&ns_g_dispatchmgr); @@ -1553,36 +1553,36 @@ shutdown_server(isc_task_t *task, isc_event_t *event) { void ns_server_create(isc_mem_t *mctx, ns_server_t **serverp) { isc_result_t result; - + ns_server_t *server = isc_mem_get(mctx, sizeof(*server)); if (server == NULL) fatal("allocating server object", ISC_R_NOMEMORY); server->mctx = mctx; server->task = NULL; - + CHECKFATAL(isc_rwlock_init(&server->conflock, 1, 1), "initializing server configuration lock"); /* Initialize configuration data with default values. */ result = isc_quota_init(&server->xfroutquota, 10); - RUNTIME_CHECK(result == ISC_R_SUCCESS); + RUNTIME_CHECK(result == ISC_R_SUCCESS); result = isc_quota_init(&server->tcpquota, 10); - RUNTIME_CHECK(result == ISC_R_SUCCESS); + RUNTIME_CHECK(result == ISC_R_SUCCESS); result = isc_quota_init(&server->recursionquota, 100); - RUNTIME_CHECK(result == ISC_R_SUCCESS); + RUNTIME_CHECK(result == ISC_R_SUCCESS); result = dns_aclenv_init(mctx, &server->aclenv); RUNTIME_CHECK(result == ISC_R_SUCCESS); - + /* Initialize server data structures. */ server->zonemgr = NULL; server->clientmgr = NULL; server->interfacemgr = NULL; ISC_LIST_INIT(server->viewlist); server->in_roothints = NULL; - + CHECKFATAL(dns_rootns_create(mctx, dns_rdataclass_in, NULL, &server->in_roothints), "setting up root hints"); @@ -1630,7 +1630,7 @@ ns_server_create(isc_mem_t *mctx, ns_server_t **serverp) { server->magic = NS_SERVER_MAGIC; *serverp = server; } - + void ns_server_destroy(ns_server_t **serverp) { ns_server_t *server = *serverp; @@ -1644,11 +1644,11 @@ ns_server_destroy(ns_server_t **serverp) { dst_lib_destroy(); isc_event_free(&server->reload_event); - + INSIST(ISC_LIST_EMPTY(server->viewlist)); dns_db_detach(&server->in_roothints); - + dns_aclenv_destroy(&server->aclenv); isc_quota_destroy(&server->recursionquota); @@ -1675,7 +1675,7 @@ ns_server_reload(isc_task_t *task, isc_event_t *event) { isc_result_t result; ns_server_t *server = (ns_server_t *)event->ev_arg; UNUSED(task); - + result = load_configuration(ns_g_conffile, server, ISC_FALSE); if (result != ISC_R_SUCCESS) { isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, @@ -1712,13 +1712,13 @@ ns_listenlist_fromconfig(dns_c_lstnlist_t *clist, dns_c_ctx_t *cctx, dns_c_lstnon_t *ce; isc_result_t result; ns_listenlist_t *dlist = NULL; - + REQUIRE(target != NULL && *target == NULL); result = ns_listenlist_create(mctx, &dlist); if (result != ISC_R_SUCCESS) return (result); - + for (ce = ISC_LIST_HEAD(clist->elements); ce != NULL; ce = ISC_LIST_NEXT(ce, next)) diff --git a/bin/named/tkeyconf.c b/bin/named/tkeyconf.c index d85610072c..36600c9518 100644 --- a/bin/named/tkeyconf.c +++ b/bin/named/tkeyconf.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: tkeyconf.c,v 1.12 2000/07/27 09:46:42 tale Exp $ */ +/* $Id: tkeyconf.c,v 1.13 2000/08/01 01:22:59 tale Exp $ */ #include diff --git a/bin/named/tsigconf.c b/bin/named/tsigconf.c index 639fe82e27..f146d61d9e 100644 --- a/bin/named/tsigconf.c +++ b/bin/named/tsigconf.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: tsigconf.c,v 1.10 2000/07/27 09:46:44 tale Exp $ */ +/* $Id: tsigconf.c,v 1.11 2000/08/01 01:23:02 tale Exp $ */ #include @@ -135,7 +135,7 @@ dns_tsigkeyring_fromconfig(dns_c_view_t *confview, dns_c_ctx_t *confctx, goto failure; if (confview != NULL) { - keylist = NULL; + keylist = NULL; result = dns_c_view_getkeydefs(confview, &keylist); if (result == ISC_R_SUCCESS) result = add_initial_keys(keylist, ring, mctx); diff --git a/bin/named/unix/Makefile.in b/bin/named/unix/Makefile.in index 4e3ccdc1ec..9133c3b6b1 100644 --- a/bin/named/unix/Makefile.in +++ b/bin/named/unix/Makefile.in @@ -1,9 +1,9 @@ # Copyright (C) 1999, 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 # 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 @@ -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.4 2000/07/27 09:37:29 tale Exp $ +# $Id: Makefile.in,v 1.5 2000/08/01 01:12:20 tale Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -22,9 +22,9 @@ top_srcdir = @top_srcdir@ @BIND9_INCLUDES@ CINCLUDES = -I${srcdir}/include -I${srcdir}/../include \ - ${DNS_INCLUDES} ${ISC_INCLUDES} + ${DNS_INCLUDES} ${ISC_INCLUDES} -CDEFINES = +CDEFINES = CWARNINGS = OBJS = os.@O@ diff --git a/bin/named/unix/include/named/os.h b/bin/named/unix/include/named/os.h index 92cf04895e..7b78a7c3eb 100644 --- a/bin/named/unix/include/named/os.h +++ b/bin/named/unix/include/named/os.h @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: os.h,v 1.10 2000/07/27 09:37:32 tale Exp $ */ +/* $Id: os.h,v 1.11 2000/08/01 01:12:23 tale Exp $ */ #ifndef NS_OS_H #define NS_OS_H 1 diff --git a/bin/named/unix/os.c b/bin/named/unix/os.c index 358b411bc7..414b837220 100644 --- a/bin/named/unix/os.c +++ b/bin/named/unix/os.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: os.c,v 1.28 2000/07/27 09:37:30 tale Exp $ */ +/* $Id: os.c,v 1.29 2000/08/01 01:12:21 tale Exp $ */ #include @@ -298,7 +298,7 @@ ns_os_changeuser(void) { if (!non_root_caps) ns_main_earlyfatal( "-u not supported on Linux kernels older than 2.3.99-pre3"); -#endif +#endif if (setgid(runas_pw->pw_gid) < 0) ns_main_earlyfatal("setgid(): %s", strerror(errno)); diff --git a/bin/named/update.c b/bin/named/update.c index 872f937c02..0569027801 100644 --- a/bin/named/update.c +++ b/bin/named/update.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: update.c,v 1.59 2000/07/27 09:37:09 tale Exp $ */ +/* $Id: update.c,v 1.60 2000/08/01 01:12:00 tale Exp $ */ #include @@ -45,7 +45,7 @@ /* * This module implements dynamic update as in RFC2136. */ - + /* XXX TODO: - forwarding @@ -147,7 +147,7 @@ struct update_event { ISC_EVENT_COMMON(update_event_t); dns_zone_t *zone; isc_result_t result; - + }; /**************************************************************************/ @@ -175,7 +175,7 @@ do_one_tuple(dns_difftuple_t **tuple, { dns_diff_t temp_diff; isc_result_t result; - + /* * Create a singleton diff. */ @@ -201,10 +201,10 @@ do_one_tuple(dns_difftuple_t **tuple, */ return (ISC_R_SUCCESS); } - + static isc_result_t update_one_rr(dns_db_t *db, dns_dbversion_t *ver, dns_diff_t *diff, - dns_diffop_t op, dns_name_t *name, + dns_diffop_t op, dns_name_t *name, dns_ttl_t ttl, dns_rdata_t *rdata) { dns_difftuple_t *tuple = NULL; @@ -220,10 +220,10 @@ update_one_rr(dns_db_t *db, dns_dbversion_t *ver, dns_diff_t *diff, /* * Callback-style iteration over rdatasets and rdatas. * - * foreach_rrset() can be used to iterate over the RRsets + * foreach_rrset() can be used to iterate over the RRsets * of a name and call a callback function with each * one. Similarly, foreach_rr() can be used to iterate - * over the individual RRs at name, optionally restricted + * over the individual RRs at name, optionally restricted * to RRs of a given type. * * The callback functions are called "actions" and take @@ -280,7 +280,7 @@ foreach_node_rr_action(void *data, dns_rdataset_t *rdataset) { /* * For each rdataset of 'name' in 'ver' of 'db', call 'action' * with the rdataset and 'action_data' as arguments. If the name - * does not exist, do nothing. + * does not exist, do nothing. * * If 'action' returns an error, abort iteration and return the error. */ @@ -294,14 +294,14 @@ foreach_rrset(dns_db_t *db, isc_result_t result; dns_dbnode_t *node; dns_rdatasetiter_t *iter; - + node = NULL; result = dns_db_findnode(db, name, ISC_FALSE, &node); if (result == ISC_R_NOTFOUND) return (ISC_R_SUCCESS); if (result != ISC_R_SUCCESS) return (result); - + iter = NULL; result = dns_db_allrdatasets(db, node, ver, (isc_stdtime_t) 0, &iter); @@ -330,7 +330,7 @@ foreach_rrset(dns_db_t *db, dns_rdatasetiter_destroy(&iter); cleanup_node: - dns_db_detachnode(db, &node); + dns_db_detachnode(db, &node); return (result); } @@ -361,10 +361,10 @@ foreach_node_rr(dns_db_t *db, /* * For each of the RRs specified by 'db', 'ver', 'name', 'type', * (which can be dns_rdatatype_any to match any type), and 'covers', call - * 'action' with the RR and 'action_data' as arguments. If the name + * 'action' with the RR and 'action_data' as arguments. If the name * does not exist, or if no RRset of the given type exists at the name, * do nothing. - * + * * If 'action' returns an error, abort iteration and return the error. */ static isc_result_t @@ -382,9 +382,9 @@ foreach_rr(dns_db_t *db, dns_rdataset_t rdataset; if (type == dns_rdatatype_any) - return (foreach_node_rr(db, ver, name, + return (foreach_node_rr(db, ver, name, rr_action, rr_action_data)); - + node = NULL; result = dns_db_findnode(db, name, ISC_FALSE, &node); if (result == ISC_R_NOTFOUND) @@ -420,7 +420,7 @@ foreach_rr(dns_db_t *db, cleanup_rdataset: dns_rdataset_disassociate(&rdataset); cleanup_node: - dns_db_detachnode(db, &node); + dns_db_detachnode(db, &node); return (result); } @@ -465,7 +465,7 @@ rrset_exists_action(void *data, rr_t *rr) { ((result == ISC_R_SUCCESS) ? \ (*exists = ISC_FALSE, ISC_R_SUCCESS) : \ result)); - + /* * Set '*exists' to true iff an rrset of the given type exists, * to false otherwise. @@ -504,8 +504,8 @@ cname_compatibility_action(void *data, dns_rdataset_t *rrset) { static isc_result_t cname_incompatible_rrset_exists(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, isc_boolean_t *exists) { - isc_result_t result; - result = foreach_rrset(db, ver, name, + isc_result_t result; + result = foreach_rrset(db, ver, name, cname_compatibility_action, NULL); RETURN_EXISTENCE_FLAG; } @@ -513,7 +513,7 @@ cname_incompatible_rrset_exists(dns_db_t *db, dns_dbversion_t *ver, /* * Helper function for rr_count(). */ -static isc_result_t +static isc_result_t count_rr_action(void *data, rr_t *rr) { int *countp = data; UNUSED(rr); @@ -549,7 +549,7 @@ typedef struct { * Helper function for matching_rr_exists(). */ -static isc_result_t +static isc_result_t matching_rr_exists_action(void *data, rr_t *rr) { matching_rr_exists_ctx_t *ctx = data; if ((*ctx->predicate)(ctx->update_rr, &rr->rdata)) @@ -558,7 +558,7 @@ matching_rr_exists_action(void *data, rr_t *rr) { } /* - * Compare the 'update_rr' with all RRs in the RRset specified by 'db', + * Compare the 'update_rr' with all RRs in the RRset specified by 'db', * 'ver', 'name', and 'type' using 'predicate'. If the predicate returns * true for at least one of them, set '*exists' to ISC_TRUE. Otherwise, * set it to ISC_FALSE. @@ -661,12 +661,12 @@ ssu_checkall(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, /* * Append a tuple asserting the existence of the RR with * 'name' and 'rdata' to 'diff'. - */ + */ static isc_result_t temp_append(dns_diff_t *diff, dns_name_t *name, dns_rdata_t *rdata) { isc_result_t result; dns_difftuple_t *tuple = NULL; - + REQUIRE(DNS_DIFF_VALID(diff)); CHECK(dns_difftuple_create(diff->mctx, DNS_DIFFOP_EXISTS, name, 0, rdata, &tuple)); @@ -681,7 +681,7 @@ temp_append(dns_diff_t *diff, dns_name_t *name, dns_rdata_t *rdata) { * Return ISC_R_SUCCESS if the rdatasets are equal, rcode(dns_rcode_nxrrset) * if not. */ -static isc_result_t +static isc_result_t temp_check_rrset(dns_difftuple_t *a, dns_difftuple_t *b) { for (;;) { if (a == NULL || b == NULL) @@ -705,12 +705,12 @@ temp_check_rrset(dns_difftuple_t *a, dns_difftuple_t *b) { * in the "temp" data structure. The major sort key is the owner name, * followed by the type and rdata. */ -static int +static int temp_order(const void *av, const void *bv) { dns_difftuple_t * const *ap = av; dns_difftuple_t * const *bp = bv; dns_difftuple_t *a = *ap; - dns_difftuple_t *b = *bp; + dns_difftuple_t *b = *bp; int r; r = dns_name_compare(&a->name, &b->name); if (r != 0) @@ -739,7 +739,7 @@ temp_check(isc_mem_t *mctx, dns_diff_t *temp, dns_db_t *db, dns_dbnode_t *node; dns_difftuple_t *t; dns_diff_t trash; - + /* Exit early if the list is empty (for efficiency only). */ if (ISC_LIST_HEAD(temp->tuples) == NULL) return (ISC_R_SUCCESS); @@ -753,7 +753,7 @@ temp_check(isc_mem_t *mctx, dns_diff_t *temp, dns_db_t *db, return (result); dns_diff_init(mctx, &trash); - + /* * For each name and type in the prerequisites, * construct a sorted rdata list of the corresponding @@ -771,11 +771,11 @@ temp_check(isc_mem_t *mctx, dns_diff_t *temp, dns_db_t *db, if (result != ISC_R_SUCCESS) return (result); - /* A new unique type begins here. */ + /* A new unique type begins here. */ while (t != NULL && dns_name_equal(&t->name, name)) { dns_rdatatype_t type, covers; dns_rdataset_t rdataset; - dns_diff_t d_rrs; /* Database RRs with + dns_diff_t d_rrs; /* Database RRs with this name and type */ dns_diff_t u_rrs; /* Update RRs with this name and type */ @@ -815,12 +815,12 @@ temp_check(isc_mem_t *mctx, dns_diff_t *temp, dns_db_t *db, if (result != ISC_R_NOMORE) goto failure; result = dns_diff_sort(&d_rrs, temp_order); - if (result != ISC_R_SUCCESS) + if (result != ISC_R_SUCCESS) goto failure; /* * Collect all update RRs for this name and type - * onto u_rrs. No need to sort them here - + * onto u_rrs. No need to sort them here - * they are already sorted. */ while (t != NULL && @@ -862,8 +862,8 @@ temp_check(isc_mem_t *mctx, dns_diff_t *temp, dns_db_t *db, dns_db_detachnode(db, &node); } - - dns_diff_clear(&trash); + + dns_diff_clear(&trash); return (ISC_R_SUCCESS); } @@ -945,7 +945,7 @@ replaces_p(dns_rdata_t *update_rr, dns_rdata_t *db_rr) { if (db_rr->type == dns_rdatatype_wks) { /* * Compare the address and protocol fields only. These - * form the first five bytes of the RR data. Do a + * form the first five bytes of the RR data. Do a * raw binary comparison; unpacking the WKS RRs using * dns_rdata_tostruct() might be cleaner in some ways, * but it would require us to pass around an mctx. @@ -960,7 +960,7 @@ replaces_p(dns_rdata_t *update_rr, dns_rdata_t *db_rr) { /* * Internal helper function for delete_if(). */ -static isc_result_t +static isc_result_t delete_if_action(void *data, rr_t *rr) { conditional_delete_ctx_t *ctx = data; if ((*ctx->predicate)(ctx->update_rr, &rr->rdata)) { @@ -978,7 +978,7 @@ delete_if_action(void *data, rr_t *rr) { * Conditionally delete RRs. Apply 'predicate' to the RRs * specified by 'db', 'ver', 'name', and 'type' (which can * be dns_rdatatype_any to match any type). Delete those - * RRs for which the predicate returns true, and log the + * RRs for which the predicate returns true, and log the * deletions in 'diff'. */ static isc_result_t @@ -1039,7 +1039,7 @@ get_current_rr(dns_message_t *msg, dns_section_t section, /* * Increment the SOA serial number of database 'db', version 'ver'. - * Replace the SOA record in the database, and log the + * Replace the SOA record in the database, and log the * change in 'diff'. */ @@ -1057,23 +1057,23 @@ increment_soa_serial(dns_db_t *db, dns_dbversion_t *ver, dns_difftuple_t *addtuple = NULL; isc_uint32_t serial; isc_result_t result; - + CHECK(dns_db_createsoatuple(db, ver, mctx, DNS_DIFFOP_DEL, &deltuple)); CHECK(dns_difftuple_copy(deltuple, &addtuple)); addtuple->op = DNS_DIFFOP_ADD; serial = dns_soa_getserial(&addtuple->rdata); - + /* RFC1982 */ serial = (serial + 1) & 0xFFFFFFFF; - if (serial == 0) + if (serial == 0) serial = 1; dns_soa_setserial(serial, &addtuple->rdata); CHECK(do_one_tuple(&addtuple, db, ver, diff)); CHECK(do_one_tuple(&deltuple, db, ver, diff)); result = ISC_R_SUCCESS; - + failure: if (addtuple != NULL) dns_difftuple_free(&addtuple); @@ -1091,11 +1091,11 @@ increment_soa_serial(dns_db_t *db, dns_dbversion_t *ver, * * William King points out that RFC2136 is inconsistent about * the case where the serial number stays unchanged: - * + * * section 3.4.2.2 requires a server to ignore a SOA update request * if the serial number on the update SOA is less_than_or_equal to * the zone SOA serial. - * + * * section 3.6 requires a server to ignore a SOA update request if * the serial is less_than the zone SOA serial. * @@ -1103,7 +1103,7 @@ increment_soa_serial(dns_db_t *db, dns_dbversion_t *ver, * */ static isc_result_t -check_soa_increment(dns_db_t *db, dns_dbversion_t *ver, +check_soa_increment(dns_db_t *db, dns_dbversion_t *ver, dns_rdata_t *update_rdata, isc_boolean_t *ok) { @@ -1112,7 +1112,7 @@ check_soa_increment(dns_db_t *db, dns_dbversion_t *ver, isc_result_t result; update_serial = dns_soa_getserial(update_rdata); - + result = dns_db_getsoaserial(db, ver, &db_serial); if (result != ISC_R_SUCCESS) return (result); @@ -1157,12 +1157,12 @@ namelist_append_subdomain(dns_db_t *db, dns_name_t *name, dns_diff_t *affected) dns_fixedname_t fixedname; dns_name_t *child; dns_dbiterator_t *dbit = NULL; - + dns_fixedname_init(&fixedname); child = dns_fixedname_name(&fixedname); CHECK(dns_db_createiterator(db, ISC_FALSE, &dbit)); - + for (result = dns_dbiterator_seek(dbit, name); result == ISC_R_SUCCESS; result = dns_dbiterator_next(dbit)) @@ -1208,8 +1208,8 @@ static isc_result_t non_nxt_rrset_exists(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, isc_boolean_t *exists) { - isc_result_t result; - result = foreach_rrset(db, ver, name, + isc_result_t result; + result = foreach_rrset(db, ver, name, is_non_nxt_action, NULL); RETURN_EXISTENCE_FLAG; } @@ -1217,12 +1217,12 @@ non_nxt_rrset_exists(dns_db_t *db, dns_dbversion_t *ver, /* * A comparison function for sorting dns_diff_t:s by name. */ -static int +static int name_order(const void *av, const void *bv) { dns_difftuple_t * const *ap = av; dns_difftuple_t * const *bp = bv; dns_difftuple_t *a = *ap; - dns_difftuple_t *b = *bp; + dns_difftuple_t *b = *bp; return (dns_name_compare(&a->name, &b->name)); } @@ -1230,7 +1230,7 @@ static isc_result_t uniqify_name_list(dns_diff_t *list) { isc_result_t result; dns_difftuple_t *p, *q; - + CHECK(dns_diff_sort(list, name_order)); p = ISC_LIST_HEAD(list->tuples); @@ -1277,7 +1277,7 @@ is_glue(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, } /* - * Find the next/previous name that has a NXT record. + * Find the next/previous name that has a NXT record. * In other words, skip empty database nodes and names that * have had their NXTs removed because they are obscured by * a zone cut. @@ -1291,11 +1291,11 @@ next_active(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *oldname, isc_boolean_t has_nxt; CHECK(dns_db_createiterator(db, ISC_FALSE, &dbit)); - + CHECK(dns_dbiterator_seek(dbit, oldname)); do { dns_dbnode_t *node = NULL; - + if (forward) result = dns_dbiterator_next(dbit); else @@ -1306,7 +1306,7 @@ next_active(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *oldname, */ if (forward) CHECK(dns_dbiterator_first(dbit)); - else + else CHECK(dns_dbiterator_last(dbit)); } dns_dbiterator_current(dbit, &node, newname); @@ -1345,9 +1345,9 @@ add_nxt(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, dns_diff_t *diff) dns_name_t *target; dns_fixedname_init(&fixedname); - target = dns_fixedname_name(&fixedname); - - + target = dns_fixedname_name(&fixedname); + + /* * Find the successor name, aka NXT target. */ @@ -1359,17 +1359,17 @@ add_nxt(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, dns_diff_t *diff) CHECK(dns_db_findnode(db, name, ISC_FALSE, &node)); dns_rdata_init(&rdata); CHECK(dns_buildnxtrdata(db, ver, node, target, buffer, &rdata)); - dns_db_detachnode(db, &node); + dns_db_detachnode(db, &node); /* * Create a diff tuple, update the database, and record the change. */ CHECK(dns_difftuple_create(diff->mctx, DNS_DIFFOP_ADD, name, - 3600, /* XXXRTH */ + 3600, /* XXXRTH */ &rdata, &tuple)); CHECK(do_one_tuple(&tuple, db, ver, diff)); INSIST(tuple == NULL); - + failure: if (node != NULL) dns_db_detachnode(db, &node); @@ -1438,7 +1438,7 @@ add_sigs(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, CHECK(dns_db_findrdataset(db, node, ver, type, 0, (isc_stdtime_t) 0, &rdataset, NULL)); - dns_db_detachnode(db, &node); + dns_db_detachnode(db, &node); for (i = 0; i < nkeys; i++) { /* Calculate the signature, creating a SIG RDATA. */ @@ -1451,18 +1451,18 @@ add_sigs(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name, CHECK(update_one_rr(db, ver, diff, DNS_DIFFOP_ADD, name, rdataset.ttl, &sig_rdata)); } - + failure: if (dns_rdataset_isassociated(&rdataset)) dns_rdataset_disassociate(&rdataset); if (node != NULL) dns_db_detachnode(db, &node); return (result); -} +} /* * Update SIG and NXT records affected by an update. The original - * update, including the SOA serial update but exluding the SIG & NXT + * update, including the SOA serial update but exluding the SIG & NXT * changes, is in "diff" and has already been applied to "newver" of "db". * The database version prior to the update is "oldver". * @@ -1488,15 +1488,15 @@ update_signatures(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *oldver, unsigned int nkeys = 0; unsigned int i; isc_stdtime_t now, inception, expire; - + dns_diff_init(mctx, &diffnames); dns_diff_init(mctx, &affected); - + dns_diff_init(mctx, &sig_diff); dns_diff_init(mctx, &nxt_diff); dns_diff_init(mctx, &nxt_mindiff); - result = find_zone_keys(db, newver, mctx, + result = find_zone_keys(db, newver, mctx, MAXZONEKEYS, zone_keys, &nkeys); if (result != ISC_R_SUCCESS) { isc_log_write(ns_g_lctx, NS_LOGCATEGORY_UPDATE, @@ -1509,9 +1509,9 @@ update_signatures(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *oldver, isc_stdtime_get(&now); inception = now - 3600; /* Allow for some clock skew. */ expire = now + sigvalidityinterval; - + /* - * Find all RRsets directly affected by the update, and + * Find all RRsets directly affected by the update, and * update their SIGs. Also build a list of names affected * by the update in "diffnames". */ @@ -1523,14 +1523,14 @@ update_signatures(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *oldver, /* Now "name" is a new, unique name affected by the update. */ CHECK(namelist_append_name(&diffnames, name)); - + while (t != NULL && dns_name_equal(&t->name, name)) { dns_rdatatype_t type; type = t->rdata.type; /* * Now "name" and "type" denote a new unique RRset - * affected by the update. + * affected by the update. */ /* Don't sign SIGs. */ @@ -1540,7 +1540,7 @@ update_signatures(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *oldver, /* * Delete all old SIGs covering this type, since they * are all invalid when the signed RRset has changed. - * We may not be able to recreate all of them - tough. + * We may not be able to recreate all of them - tough. */ CHECK(delete_if(true_p, db, newver, name, dns_rdatatype_sig, type, @@ -1581,7 +1581,7 @@ update_signatures(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *oldver, } /* - * When a name is created or deleted, its predecessor needs to + * When a name is created or deleted, its predecessor needs to * have its NXT updated. */ for (t = ISC_LIST_HEAD(diffnames.tuples); @@ -1607,7 +1607,7 @@ update_signatures(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *oldver, * the NXTs have not yet been updated to reflect the delegation * change. This should not matter because in this case, * the correct predecessor is either the delegation node or - * a newly unobscured node, and those nodes are on the + * a newly unobscured node, and those nodes are on the * "affected" list in any case. */ CHECK(next_active(db, newver, &t->name, prevname, ISC_FALSE)); @@ -1628,7 +1628,7 @@ update_signatures(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *oldver, if (exists == existed) continue; /* - * There was a delegation change. Mark all subdomains + * There was a delegation change. Mark all subdomains * of t->name as potentially needing a NXT update. */ CHECK(namelist_append_subdomain(db, &t->name, &affected)); @@ -1636,9 +1636,9 @@ update_signatures(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *oldver, ISC_LIST_APPENDLIST(affected.tuples, diffnames.tuples, link); INSIST(ISC_LIST_EMPTY(diffnames.tuples)); - + CHECK(uniqify_name_list(&affected)); - + /* * Determine which names should have NXTs, and delete/create * NXTs to make it so. We don't know the final NXT targets yet, @@ -1675,7 +1675,7 @@ update_signatures(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *oldver, } } } - + /* * Now we know which names are part of the NXT chain. * Make them all point at their correct targets. @@ -1699,7 +1699,7 @@ update_signatures(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *oldver, * (XXX what if the zone keys are missing?). * Because the SIG NXTs have not necessarily been * created yet, the correctness of the bit mask relies - * on the assumption that NXTs are only created if + * on the assumption that NXTs are only created if * there is other data, and if there is other data, * there are other SIGs. */ @@ -1712,7 +1712,7 @@ update_signatures(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *oldver, /* * Minimize the set of NXT updates so that we don't - * have to regenerate the SIG NXTs for NXTs that were + * have to regenerate the SIG NXTs for NXTs that were * replaced with identical ones. */ while ((t = ISC_LIST_HEAD(nxt_diff.tuples)) != NULL) { @@ -1760,11 +1760,11 @@ update_signatures(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *oldver, dns_diff_clear(&affected); dns_diff_clear(&diffnames); - for (i = 0; i < nkeys; i++) + for (i = 0; i < nkeys; i++) dst_key_free(&zone_keys[i]); - + return (result); -} +} /**************************************************************************/ @@ -1779,7 +1779,7 @@ send_update_event(ns_client_t *client, dns_zone_t *zone) { update_event_t *event = NULL; isc_task_t *zonetask = NULL; ns_client_t *evclient; - + event = (update_event_t *) isc_event_allocate(client->mctx, client, DNS_EVENT_UPDATE, update_action, NULL, sizeof(*event)); @@ -1812,7 +1812,7 @@ respond(ns_client_t *client, isc_result_t result) { ns_client_send(client); return; - + msg_failure: isc_log_write(ns_g_lctx, NS_LOGCATEGORY_UPDATE, NS_LOGMODULE_UPDATE, ISC_LOG_ERROR, @@ -1828,7 +1828,7 @@ ns_update_start(ns_client_t *client) { dns_name_t *zonename; dns_rdataset_t *zone_rdataset; dns_zone_t *zone = NULL; - + /* * Interpret the zone section. */ @@ -1865,7 +1865,7 @@ ns_update_start(ns_client_t *client) { switch(dns_zone_gettype(zone)) { case dns_zone_master: - CHECK(send_update_event(client, zone)); + CHECK(send_update_event(client, zone)); break; /* OK. */ case dns_zone_slave: FAILS(DNS_R_NOTIMP, @@ -1875,11 +1875,11 @@ ns_update_start(ns_client_t *client) { "not authoritative for update zone"); } return; - + failure: /* * We failed without having sent an update event to the zone. - * We are still in the client task context, so we can + * We are still in the client task context, so we can * simply give an error response without switching tasks. */ respond(client, result); @@ -1904,7 +1904,7 @@ update_action(isc_task_t *task, isc_event_t *event) { dns_rdataclass_t zoneclass; dns_name_t *zonename; dns_ssutable_t *ssutable = NULL; - + INSIST(event->ev_type == DNS_EVENT_UPDATE); dns_diff_init(mctx, &diff); @@ -1916,7 +1916,7 @@ update_action(isc_task_t *task, isc_event_t *event) { dns_zone_getssutable(zone, &ssutable); dns_db_currentversion(db, &oldver); CHECK(dns_db_newversion(db, &ver)); - + /* * Check prerequisites. */ @@ -1984,7 +1984,7 @@ update_action(isc_task_t *task, isc_event_t *event) { "'rrset does not exist' " "prerequisite not satisfied"); } - } + } } else if (update_class == zoneclass) { /* "temp += rr;" */ result = temp_append(&temp, name, &rdata); @@ -2037,7 +2037,7 @@ update_action(isc_task_t *task, isc_event_t *event) { dns_name_t *name = NULL; dns_rdata_t rdata; dns_ttl_t ttl; - dns_rdataclass_t update_class; + dns_rdataclass_t update_class; get_current_rr(request, DNS_SECTION_UPDATE, zoneclass, &name, &rdata, &covers, &ttl, &update_class); @@ -2058,17 +2058,17 @@ update_action(isc_task_t *task, isc_event_t *event) { if (ttl != 0 || rdata.length != 0 || (dns_rdatatype_ismeta(rdata.type) && rdata.type != dns_rdatatype_any)) - FAILC(DNS_R_FORMERR, + FAILC(DNS_R_FORMERR, "meta-RR in update"); } else if (update_class == dns_rdataclass_none) { - if (ttl != 0 || + if (ttl != 0 || dns_rdatatype_ismeta(rdata.type)) - FAILC(DNS_R_FORMERR, + FAILC(DNS_R_FORMERR, "meta-RR in update"); } else { isc_log_write(ns_g_lctx, NS_LOGCATEGORY_UPDATE, NS_LOGMODULE_UPDATE, ISC_LOG_WARNING, - "update RR has incorrect class %d", + "update RR has incorrect class %d", update_class); FAIL(DNS_R_FORMERR); } @@ -2110,7 +2110,7 @@ update_action(isc_task_t *task, isc_event_t *event) { FAIL(result); isc_log_write(UPDATE_DEBUG_LOGARGS, "update section prescan OK"); - + /* * Process the Update Section. */ @@ -2124,7 +2124,7 @@ update_action(isc_task_t *task, isc_event_t *event) { dns_ttl_t ttl; dns_rdataclass_t update_class; isc_boolean_t flag; - + get_current_rr(request, DNS_SECTION_UPDATE, zoneclass, &name, &rdata, &covers, &ttl, &update_class); @@ -2144,7 +2144,7 @@ update_action(isc_task_t *task, isc_event_t *event) { CHECK(rrset_exists(db, ver, name, dns_rdatatype_cname, 0, &flag)); - if (flag && + if (flag && ! dns_rdatatype_isdnssec(rdata.type)) { isc_log_write(UPDATE_PROTOCOL_LOGARGS, @@ -2155,7 +2155,7 @@ update_action(isc_task_t *task, isc_event_t *event) { } if (rdata.type == dns_rdatatype_soa) { isc_boolean_t ok; - CHECK(rrset_exists(db, ver, name, + CHECK(rrset_exists(db, ver, name, dns_rdatatype_soa, 0, &flag)); if (! flag) { @@ -2177,7 +2177,7 @@ update_action(isc_task_t *task, isc_event_t *event) { } /* * Add an RR. If an identical RR already exists, - * do nothing. If a similar but not identical + * do nothing. If a similar but not identical * CNAME, SOA, or WKS exists, remove it first. */ CHECK(matching_rr_exists(rr_equal_p, db, ver, name, @@ -2205,11 +2205,11 @@ update_action(isc_task_t *task, isc_event_t *event) { "delete all rrsets from a name"); if (dns_name_equal(name, zonename)) { CHECK(delete_if(type_not_soa_nor_ns_p, - db, ver, name, + db, ver, name, dns_rdatatype_any, 0, &rdata, &diff)); } else { - CHECK(delete_if(true_p, db, ver, name, + CHECK(delete_if(true_p, db, ver, name, dns_rdatatype_any, 0, &rdata, &diff)); } @@ -2271,7 +2271,7 @@ update_action(isc_task_t *task, isc_event_t *event) { dns_journal_t *journal; /* - * Increment the SOA serial, but only if it was not + * Increment the SOA serial, but only if it was not * changed as a result of an update operation. */ if (! soa_serial_changed) { @@ -2279,7 +2279,7 @@ update_action(isc_task_t *task, isc_event_t *event) { } if (dns_db_issecure(db)) { - + result = update_signatures(mctx, db, oldver, ver, &diff, dns_zone_getsigvalidityinterval(zone)); if (result != ISC_R_SUCCESS) { @@ -2323,17 +2323,17 @@ update_action(isc_task_t *task, isc_event_t *event) { * Notify slaves of the change we just made. */ dns_zone_notify(zone); - + result = ISC_R_SUCCESS; goto common; - + failure: /* * The reason for failure should have been logged at this point. */ if (ver != NULL) { isc_log_write(UPDATE_DEBUG_LOGARGS, - "rolling back"); + "rolling back"); dns_db_closeversion(db, &ver, ISC_FALSE); } @@ -2343,7 +2343,7 @@ update_action(isc_task_t *task, isc_event_t *event) { if (oldver != NULL) dns_db_closeversion(db, &oldver, ISC_FALSE); - + if (db != NULL) dns_db_detach(&db); @@ -2361,10 +2361,10 @@ update_action(isc_task_t *task, isc_event_t *event) { static void updatedone_action(isc_task_t *task, isc_event_t *event) { update_event_t *uev = (update_event_t *) event; - ns_client_t *client = (ns_client_t *) event->ev_arg; + ns_client_t *client = (ns_client_t *) event->ev_arg; UNUSED(task); - + INSIST(event->ev_type == DNS_EVENT_UPDATEDONE); INSIST(task == client->task); diff --git a/bin/named/xfrout.c b/bin/named/xfrout.c index ebb044eea3..bd7b48d15f 100644 --- a/bin/named/xfrout.c +++ b/bin/named/xfrout.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: xfrout.c,v 1.69 2000/07/27 09:37:10 tale Exp $ */ +/* $Id: xfrout.c,v 1.70 2000/08/01 01:12:01 tale Exp $ */ #include @@ -84,9 +84,9 @@ /**************************************************************************/ /* * A db_rr_iterator_t is an iterator that iterates over an entire database, - * returning one RR at a time, in some arbitrary order. + * returning one RR at a time, in some arbitrary order. */ - + typedef struct db_rr_iterator db_rr_iterator_t; struct db_rr_iterator { @@ -147,21 +147,21 @@ db_rr_iterator_first(db_rr_iterator_t *it) { return (it->result); it->result = dns_dbiterator_current(it->dbit, &it->node, dns_fixedname_name(&it->fixedname)); - if (it->result != ISC_R_SUCCESS) + if (it->result != ISC_R_SUCCESS) return (it->result); it->result = dns_db_allrdatasets(it->db, it->node, it->ver, it->now, &it->rdatasetit); - if (it->result != ISC_R_SUCCESS) + if (it->result != ISC_R_SUCCESS) return (it->result); - + it->result = dns_rdatasetiter_first(it->rdatasetit); - if (it->result != ISC_R_SUCCESS) + if (it->result != ISC_R_SUCCESS) return (it->result); dns_rdatasetiter_current(it->rdatasetit, &it->rdataset); - + it->result = dns_rdataset_first(&it->rdataset); return (it->result); } @@ -258,7 +258,7 @@ log_rr(dns_name_t *name, dns_rdata_t *rdata, isc_uint32_t ttl) { dns_rdataset_init(&rds); ISC_LIST_APPEND(rdl.rdata, rdata, link); RUNTIME_CHECK(dns_rdatalist_tordataset(&rdl, &rds) == ISC_R_SUCCESS); - + isc_buffer_init(&buf, mem, sizeof(mem)); result = dns_rdataset_totext(&rds, name, ISC_FALSE, ISC_FALSE, &buf); @@ -295,7 +295,7 @@ typedef struct rrstream { rrstream_methods_t *methods; } rrstream_t; -struct rrstream_methods { +struct rrstream_methods { isc_result_t (*first)(rrstream_t *); isc_result_t (*next)(rrstream_t *); void (*current)(rrstream_t *, @@ -350,7 +350,7 @@ ixfr_rrstream_create(isc_mem_t *mctx, s->common.mctx = mctx; s->common.methods = &ixfr_rrstream_methods; s->journal = NULL; - + CHECK(dns_journal_open(mctx, journal_filename, ISC_FALSE, &s->journal)); CHECK(dns_journal_iter_init(s->journal, begin_serial, end_serial)); @@ -371,7 +371,7 @@ ixfr_rrstream_first(rrstream_t *rs) { static isc_result_t ixfr_rrstream_next(rrstream_t *rs) { - ixfr_rrstream_t *s = (ixfr_rrstream_t *) rs; + ixfr_rrstream_t *s = (ixfr_rrstream_t *) rs; return (dns_journal_next_rr(s->journal)); } @@ -380,7 +380,7 @@ ixfr_rrstream_current(rrstream_t *rs, dns_name_t **name, isc_uint32_t *ttl, dns_rdata_t **rdata) { - ixfr_rrstream_t *s = (ixfr_rrstream_t *) rs; + ixfr_rrstream_t *s = (ixfr_rrstream_t *) rs; dns_journal_current_rr(s->journal, name, ttl, rdata); } @@ -395,7 +395,7 @@ ixfr_rrstream_destroy(rrstream_t **rsp) { static rrstream_methods_t ixfr_rrstream_methods = { ixfr_rrstream_first, ixfr_rrstream_next, - ixfr_rrstream_current, + ixfr_rrstream_current, ixfr_rrstream_destroy }; @@ -477,7 +477,7 @@ static isc_result_t axfr_rrstream_next(rrstream_t *rs) { axfr_rrstream_t *s = (axfr_rrstream_t *) rs; isc_result_t result; - + /* Skip SOA records. */ for (;;) { dns_name_t *name_dummy = NULL; @@ -506,14 +506,14 @@ static void axfr_rrstream_destroy(rrstream_t **rsp) { axfr_rrstream_t *s = (axfr_rrstream_t *) *rsp; if (s->it_valid) - db_rr_iterator_destroy(&s->it); + db_rr_iterator_destroy(&s->it); isc_mem_put(s->common.mctx, s, sizeof(*s)); } static rrstream_methods_t axfr_rrstream_methods = { axfr_rrstream_first, axfr_rrstream_next, - axfr_rrstream_current, + axfr_rrstream_current, axfr_rrstream_destroy }; @@ -551,7 +551,7 @@ soa_rrstream_create(isc_mem_t *mctx, dns_db_t *db, dns_dbversion_t *ver, s->common.mctx = mctx; s->common.methods = &soa_rrstream_methods; s->soa_tuple = NULL; - + CHECK(dns_db_createsoatuple(db, ver, mctx, DNS_DIFFOP_EXISTS, &s->soa_tuple)); @@ -579,7 +579,7 @@ static void soa_rrstream_current(rrstream_t *rs, dns_name_t **name, isc_uint32_t *ttl, dns_rdata_t **rdata) { - soa_rrstream_t *s = (soa_rrstream_t *) rs; + soa_rrstream_t *s = (soa_rrstream_t *) rs; *name = &s->soa_tuple->name; *ttl = s->soa_tuple->ttl; *rdata = &s->soa_tuple->rdata; @@ -596,7 +596,7 @@ soa_rrstream_destroy(rrstream_t **rsp) { static rrstream_methods_t soa_rrstream_methods = { soa_rrstream_first, soa_rrstream_next, - soa_rrstream_current, + soa_rrstream_current, soa_rrstream_destroy }; @@ -607,7 +607,7 @@ static rrstream_methods_t soa_rrstream_methods = { * a concatenated stream consisting of the soa_rrstream, then * the data stream, then the soa_rrstream again. * - * The component streams are owned by the compound_rrstream_t + * The component streams are owned by the compound_rrstream_t * and are destroyed with it. */ @@ -681,7 +681,7 @@ compound_rrstream_first(rrstream_t *rs) { static isc_result_t compound_rrstream_next(rrstream_t *rs) { compound_rrstream_t *s = (compound_rrstream_t *) rs; - rrstream_t *curstream = s->components[s->state]; + rrstream_t *curstream = s->components[s->state]; s->result = curstream->methods->next(curstream); while (s->result == ISC_R_NOMORE) { if (s->state == 2) @@ -717,7 +717,7 @@ compound_rrstream_destroy(rrstream_t **rsp) { static rrstream_methods_t compound_rrstream_methods = { compound_rrstream_first, compound_rrstream_next, - compound_rrstream_current, + compound_rrstream_current, compound_rrstream_destroy }; @@ -807,7 +807,7 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) { dns_rdataset_t *soa_rdataset; dns_rdata_t soa_rdata; isc_boolean_t have_soa = ISC_FALSE; - const char *mnemonic = NULL; + const char *mnemonic = NULL; isc_mem_t *mctx = client->mctx; dns_message_t *request = client->message; xfrout_ctx_t *xfr = NULL; @@ -828,7 +828,7 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) { INSIST(0); break; } - + ns_client_log(client, DNS_LOGCATEGORY_XFER_OUT, NS_LOGMODULE_XFER_OUT, ISC_LOG_DEBUG(6), "%s request", mnemonic); @@ -873,12 +873,12 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) { case dns_zone_slave: break; /* Master and slave zones are OK for transfer. */ default: - FAILC(DNS_R_NOTAUTH, "non-authoritative zone"); + FAILC(DNS_R_NOTAUTH, "non-authoritative zone"); } CHECK(dns_zone_getdb(zone, &db)); dns_db_currentversion(db, &ver); - xfrout_log1(client, question_name, ISC_LOG_DEBUG(6), + xfrout_log1(client, question_name, ISC_LOG_DEBUG(6), "%s question section OK", mnemonic); /* @@ -898,7 +898,7 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) { */ if (! dns_name_equal(soa_name, question_name)) continue; - + for (soa_rdataset = ISC_LIST_HEAD(soa_name->list); soa_rdataset != NULL; soa_rdataset = ISC_LIST_NEXT(soa_rdataset, link)) @@ -926,7 +926,7 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) { if (result != ISC_R_NOMORE) CHECK(result); - xfrout_log1(client, question_name, ISC_LOG_DEBUG(6), + xfrout_log1(client, question_name, ISC_LOG_DEBUG(6), "%s authority section OK", mnemonic); /* @@ -948,13 +948,13 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) { */ isc_netaddr_fromsockaddr(&na, &client->peeraddr); (void)dns_peerlist_peerbyaddr(client->view->peers, &na, &peer); - + /* * Decide on the transfer format (one-answer or many-answers). */ if (peer != NULL) (void)dns_peer_gettransferformat(peer, &format); - + /* * Get a dynamically allocated copy of the current SOA. */ @@ -964,7 +964,7 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) { if (reqtype == dns_rdatatype_ixfr) { isc_uint32_t begin_serial, current_serial; isc_boolean_t provide_ixfr; - + /* * Outgoing IXFR may have been disabled for this peer * or globally. @@ -974,7 +974,7 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) { (void) dns_peer_getprovideixfr(peer, &provide_ixfr); if (provide_ixfr == ISC_FALSE) goto axfr_fallback; - + if (! have_soa) FAILC(DNS_R_FORMERR, "IXFR request missing SOA"); @@ -984,13 +984,13 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) { /* * RFC1995 says "If an IXFR query with the same or - * newer version number than that of the server - * is received, it is replied to with a single SOA + * newer version number than that of the server + * is received, it is replied to with a single SOA * record of the server's current version, just as * in AXFR". The claim about AXFR is incorrect, * but other than that, we do as the RFC says. * - * Sending a single SOA record is also how we refuse + * Sending a single SOA record is also how we refuse * IXFR over UDP (currently, we always do). */ if (DNS_SERIAL_GE(begin_serial, current_serial) || @@ -1006,7 +1006,7 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) { &data_stream); if (result == ISC_R_NOTFOUND || result == ISC_R_RANGE) { - xfrout_log1(client, question_name, ISC_LOG_DEBUG(4), + xfrout_log1(client, question_name, ISC_LOG_DEBUG(4), "IXFR version not in journal, " "falling back to AXFR"); goto axfr_fallback; @@ -1033,7 +1033,7 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) { * Create the xfrout context object. This transfers the ownership * of "stream", "db", "ver", and "quota" to the xfrout context object. */ - CHECK(xfrout_ctx_create(mctx, client, request->id, question_name, + CHECK(xfrout_ctx_create(mctx, client, request->id, question_name, reqtype, db, ver, quota, stream, dns_message_gettsigkey(request), tsigbuf, @@ -1046,7 +1046,7 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) { db = NULL; ver = NULL; quota = NULL; - + CHECK(xfr->stream->methods->first(xfr->stream)); /* @@ -1056,7 +1056,7 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) { */ sendstream(xfr); xfr = NULL; - + result = ISC_R_SUCCESS; failure: @@ -1082,7 +1082,7 @@ ns_xfr_start(ns_client_t *client, dns_rdatatype_t reqtype) { } else if (result != ISC_R_SUCCESS) { ns_client_log(client, DNS_LOGCATEGORY_XFER_OUT, NS_LOGMODULE_XFER_OUT, - ISC_LOG_DEBUG(3), "zone transfer setup failed"); + ISC_LOG_DEBUG(3), "zone transfer setup failed"); ns_client_error(client, result); } } @@ -1102,7 +1102,7 @@ xfrout_ctx_create(isc_mem_t *mctx, ns_client_t *client, unsigned int id, void *mem; isc_interval_t maxinterval, idleinterval; isc_time_t expires; - + INSIST(xfrp != NULL && *xfrp == NULL); xfr = isc_mem_get(mctx, sizeof(*xfr)); if (xfr == NULL) @@ -1126,7 +1126,7 @@ xfrout_ctx_create(isc_mem_t *mctx, ns_client_t *client, unsigned int id, xfr->many_answers = many_answers, xfr->sends = 0; xfr->shuttingdown = ISC_FALSE; - + /* * Allocate a temporary buffer for the uncompressed response * message data. The size should be no more than 65535 bytes @@ -1176,10 +1176,10 @@ xfrout_ctx_create(isc_mem_t *mctx, ns_client_t *client, unsigned int id, */ xfr->client->shutdown = xfrout_client_shutdown; xfr->client->shutdown_arg = xfr; - + *xfrp = xfr; return (ISC_R_SUCCESS); - + failure: xfrout_ctx_destroy(&xfr); return (result); @@ -1191,7 +1191,7 @@ failure: * * Requires: * The stream iterator is initialized and points at an RR, - * or possiby at the end of the stream (that is, the + * or possiby at the end of the stream (that is, the * _first method of the iterator has been called). */ static void @@ -1208,7 +1208,7 @@ sendstream(xfrout_ctx_t *xfr) { isc_buffer_clear(&xfr->txbuf); /* - * Build a response dns_message_t, temporarily storing the raw, + * Build a response dns_message_t, temporarily storing the raw, * uncompressed owner names and RR data contiguously in xfr->buf. * We know that if the uncompressed data fits in xfr->buf, * the compressed data will surely fit in a TCP message. @@ -1228,7 +1228,7 @@ sendstream(xfrout_ctx_t *xfr) { isc_buffer_free(&xfr->lasttsig); /* - * Include a question section in the first message only. + * Include a question section in the first message only. * BIND 8.2.1 will not recognize an IXFR if it does not have a * question section. */ @@ -1241,7 +1241,7 @@ sendstream(xfrout_ctx_t *xfr) { * and 4 bytes of question. */ isc_buffer_add(&xfr->buf, 12 + 4); - + qrdataset = NULL; result = dns_message_gettemprdataset(msg, &qrdataset); if (result != ISC_R_SUCCESS) @@ -1268,7 +1268,7 @@ sendstream(xfrout_ctx_t *xfr) { } else msg->tcp_continuation = 1; - + /* * Try to fit in as many RRs as possible, unless "one-answer" * format has been requested. @@ -1277,12 +1277,12 @@ sendstream(xfrout_ctx_t *xfr) { dns_name_t *name = NULL; isc_uint32_t ttl; dns_rdata_t *rdata = NULL; - + dns_name_t *msgname = NULL; dns_rdata_t *msgrdata = NULL; dns_rdatalist_t *msgrdl = NULL; dns_rdataset_t *msgrds = NULL; - + unsigned int size; isc_region_t r; @@ -1292,19 +1292,19 @@ sendstream(xfrout_ctx_t *xfr) { isc_buffer_availableregion(&xfr->buf, &r); if (size >= r.length) { /* - * RR would not fit. If there are other RRs in the - * buffer, send them now and leave this RR to the + * RR would not fit. If there are other RRs in the + * buffer, send them now and leave this RR to the * next message. If this RR overflows the buffer * all by itself, fail. * - * In theory some RRs might fit in a TCP message + * In theory some RRs might fit in a TCP message * when compressed even if they do not fit when * uncompressed, but surely we don't want * to send such monstrosities to an unsuspecting * slave. */ if (n_rrs == 0) { - xfrout_log(xfr, ISC_LOG_WARNING, + xfrout_log(xfr, ISC_LOG_WARNING, "RR too large for zone transfer " "(%d bytes)", size); /* XXX DNS_R_RRTOOLARGE? */ @@ -1315,7 +1315,7 @@ sendstream(xfrout_ctx_t *xfr) { } log_rr(name, rdata, ttl); /* XXX */ - + dns_message_gettempname(msg, &msgname); dns_name_init(msgname, NULL); isc_buffer_availableregion(&xfr->buf, &r); @@ -1326,7 +1326,7 @@ sendstream(xfrout_ctx_t *xfr) { /* Reserve space for RR header. */ isc_buffer_add(&xfr->buf, 10); - + dns_message_gettemprdata(msg, &msgrdata); isc_buffer_availableregion(&xfr->buf, &r); r.length = rdata->length; @@ -1368,12 +1368,12 @@ sendstream(xfrout_ctx_t *xfr) { CHECK(dns_message_rendersection(msg, DNS_SECTION_QUESTION, 0)); CHECK(dns_message_rendersection(msg, DNS_SECTION_ANSWER, 0)); CHECK(dns_message_renderend(msg)); - + isc_buffer_usedregion(&xfr->txbuf, &used); isc_buffer_putuint16(&xfr->txlenbuf, used.length); region.base = xfr->txlenbuf.base; region.length = 2 + used.length; - xfrout_log(xfr, ISC_LOG_DEBUG(8), + xfrout_log(xfr, ISC_LOG_DEBUG(8), "sending TCP message of %d bytes", used.length); CHECK(isc_socket_send(xfr->client->tcpsocket, /* XXX */ @@ -1429,8 +1429,8 @@ xfrout_ctx_destroy(xfrout_ctx_t **xfrp) { if (xfr->lasttsig != NULL) isc_buffer_free(&xfr->lasttsig); if (xfr->quota != NULL) - isc_quota_detach(&xfr->quota); - if (xfr->ver != NULL) + isc_quota_detach(&xfr->quota); + if (xfr->ver != NULL) dns_db_closeversion(xfr->db, &xfr->ver, ISC_FALSE); if (xfr->db != NULL) dns_db_detach(&xfr->db); @@ -1444,7 +1444,7 @@ xfrout_ctx_destroy(xfrout_ctx_t **xfrp) { static void xfrout_senddone(isc_task_t *task, isc_event_t *event) { - isc_socketevent_t *sev = (isc_socketevent_t *)event; + isc_socketevent_t *sev = (isc_socketevent_t *)event; xfrout_ctx_t *xfr = (xfrout_ctx_t *)event->ev_arg; isc_result_t evresult = sev->result; @@ -1504,7 +1504,7 @@ xfrout_client_shutdown(void *arg, isc_result_t result) { /* * Log outgoing zone transfer messages in a format like - * : transfer of : + * : transfer of : */ static void xfrout_logv(ns_client_t *client, dns_name_t *zonename, int level, diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c index 9353903cf7..237bad5d2f 100644 --- a/bin/named/zoneconf.c +++ b/bin/named/zoneconf.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: zoneconf.c,v 1.50 2000/07/31 19:36:48 explorer Exp $ */ +/* $Id: zoneconf.c,v 1.51 2000/08/01 01:23:10 tale Exp $ */ #include @@ -199,7 +199,7 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_c_view_t *cview, } else RETERR(dns_zone_setalsonotify(zone, NULL, 0)); - + RETERR(configure_zone_acl(czone, cctx, cview, ac, zone, dns_c_zone_getallowtransfer, dns_c_view_gettransferacl, @@ -219,10 +219,10 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_c_view_t *cview, dns_zone_setmaxxfrout(zone, uintval); result = dns_c_zone_getmaxtransidleout(czone, &uintval); - if (result != ISC_R_SUCCESS && cview != NULL) + if (result != ISC_R_SUCCESS && cview != NULL) result = dns_c_view_getmaxtransferidleout(cview, &uintval); - if (result != ISC_R_SUCCESS) + if (result != ISC_R_SUCCESS) result = dns_c_ctx_getmaxtransferidleout(cctx, &uintval); if (result != ISC_R_SUCCESS) @@ -280,13 +280,13 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_c_view_t *cview, #else /* NOMINUM_PUBLIC */ result = dns_zone_setmasters(zone, iplist->ips, iplist->nextidx); -#endif /* NOMINUM_PUBLIC */ +#endif /* NOMINUM_PUBLIC */ else result = dns_zone_setmasters(zone, NULL, 0); RETERR(result); result = dns_c_zone_getmaxtranstimein(czone, &uintval); - if (result != ISC_R_SUCCESS) + if (result != ISC_R_SUCCESS) result = dns_c_ctx_getmaxtransfertimein(cctx, &uintval); if (result != ISC_R_SUCCESS) @@ -294,7 +294,7 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_c_view_t *cview, dns_zone_setmaxxfrin(zone, uintval); result = dns_c_zone_getmaxtransidlein(czone, &uintval); - if (result != ISC_R_SUCCESS) + if (result != ISC_R_SUCCESS) result = dns_c_ctx_getmaxtransferidlein(cctx, &uintval); if (result != ISC_R_SUCCESS) @@ -312,10 +312,10 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_c_view_t *cview, dns_zone_setxfrsource4(zone, &sockaddr); result = dns_c_zone_gettransfersourcev6(czone, &sockaddr); - if (result != ISC_R_SUCCESS && cview != NULL) + if (result != ISC_R_SUCCESS && cview != NULL) result = dns_c_view_gettransfersourcev6(cview, &sockaddr); - if (result != ISC_R_SUCCESS) + if (result != ISC_R_SUCCESS) result = dns_c_ctx_gettransfersourcev6(cctx, &sockaddr); if (result != ISC_R_SUCCESS) @@ -323,7 +323,7 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_c_view_t *cview, dns_zone_setxfrsource6(zone, &sockaddr); break; - + default: break; } @@ -348,12 +348,12 @@ dns_zone_reusable(dns_zone_t *zone, dns_c_zone_t *czone) { return (ISC_TRUE); } - + isc_result_t dns_zonemgr_configure(dns_c_ctx_t *cctx, dns_zonemgr_t *zmgr) { isc_uint32_t val; isc_result_t result; - + result = dns_c_ctx_gettransfersin(cctx, &val); if (result != ISC_R_SUCCESS) val = 10; diff --git a/bin/nsupdate/Makefile.in b/bin/nsupdate/Makefile.in index 7fd8f5dee1..5469963c1b 100644 --- a/bin/nsupdate/Makefile.in +++ b/bin/nsupdate/Makefile.in @@ -1,9 +1,9 @@ # 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 # 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 @@ -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.5 2000/07/27 09:37:33 tale Exp $ +# $Id: Makefile.in,v 1.6 2000/08/01 01:12:24 tale Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -25,7 +25,7 @@ top_srcdir = @top_srcdir@ CINCLUDES = -I${srcdir}/include ${LWRES_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} -CDEFINES = +CDEFINES = CWARNINGS = LWRESLIBS = ../../lib/lwres/liblwres.@A@ @@ -40,13 +40,13 @@ DEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS} LIBS = ${LWRESLIBS} ${DNSLIBS} ${ISCLIBS} @LIBS@ -SUBDIRS = +SUBDIRS = TARGETS = nsupdate OBJS = nsupdate.@O@ -UOBJS = +UOBJS = SRCS = nsupdate.c diff --git a/bin/nsupdate/nsupdate.8 b/bin/nsupdate/nsupdate.8 index fc953806b8..5c37905de0 100644 --- a/bin/nsupdate/nsupdate.8 +++ b/bin/nsupdate/nsupdate.8 @@ -1,9 +1,9 @@ .\" 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 .\" 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 @@ -12,9 +12,9 @@ .\" 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: nsupdate.8,v 1.3 2000/07/27 09:42:30 tale Exp $ -.\" +.\" +.\" $Id: nsupdate.8,v 1.4 2000/08/01 01:18:45 tale Exp $ +.\" .Dd Jun 30, 2000 .Dt NSUPDATE 8 .Os BIND9 9 @@ -67,7 +67,7 @@ These use the TSIG resource record type described in RFC2845. The signatures rely on a shared secret that should only be known to .Nm nsupdate and the name server. -Currently, the only supported encryption algorithm for TSIG is +Currently, the only supported encryption algorithm for TSIG is HMAC-MD5, which is defined in RFC 2104. Once other algorithms are defined for TSIG, applications will need to ensure they select the appropriate algorithm as well as the key when @@ -141,7 +141,7 @@ Updates will be rejected if the tests for the prerequisite conditions fail. Every update request consists of zero or more prerequisites and one or more updates. This allows a suitably authenticated update request to proceed if some -specified resource records are present or missing from the zone. +specified resource records are present or missing from the zone. A blank input line causes the accumulated commands to be sent as one Dynamic DNS update request to the name server. .Pp @@ -259,7 +259,7 @@ could be used to insert and delete resource records from the zone. Notice that the input in each example contains a trailing blank line so that a group of commands are sent as one dynamic update request to the -master name server for +master name server for .Dv example.com . .Bd -literal -offset indent # nsupdate @@ -272,10 +272,10 @@ Any A records for .Dv oldhost.example.com are deleted. and an A record for -.Dv newhost.example.com +.Dv newhost.example.com it IP address 172.16.1.1 is added. The newly-added record has a 1 day TTL (86400 seconds) -.Bd -literal -offset indent +.Bd -literal -offset indent # nsupdate > prereq nxdomain nickname.example.com > update add nickname.example.com CNAME somehost.example.com @@ -312,7 +312,7 @@ name server configuration file .It Pa K{name}.+157.+{random}.key base-64 encoding of HMAC-MD5 key created by .Xr dnssec-keygen 8 . -.It Pa K{name}.+157.+{random}.private +.It Pa K{name}.+157.+{random}.private base-64 encoding of HMAC-MD5 key created by .Xr dnssec-keygen 8 . .El @@ -325,7 +325,7 @@ base-64 encoding of HMAC-MD5 key created by .Xr RFC2535 , .Xr named 8 , .Xr dnssec-keygen 8 . -.Sh BUGS +.Sh BUGS The .Fl D and @@ -333,4 +333,4 @@ and options are not documented apart from this self-referential paragraph. They provide additional debugging information which is primarily of interest to the BIND9 developers. -These options might be changed or removed in future releases. +These options might be changed or removed in future releases. diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c index 500cb9f94b..656727fcbf 100644 --- a/bin/nsupdate/nsupdate.c +++ b/bin/nsupdate/nsupdate.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: nsupdate.c,v 1.37 2000/07/31 22:11:13 bwelling Exp $ */ +/* $Id: nsupdate.c,v 1.38 2000/08/01 01:12:25 tale Exp $ */ #include @@ -122,7 +122,7 @@ static void fatal(const char *format, ...) { va_list args; - va_start(args, format); + va_start(args, format); vfprintf(stderr, format, args); va_end(args); fprintf(stderr, "\n"); @@ -134,7 +134,7 @@ debug(const char *format, ...) { va_list args; if (debugging) { - va_start(args, format); + va_start(args, format); vfprintf(stderr, format, args); va_end(args); fprintf(stderr, "\n"); @@ -146,7 +146,7 @@ ddebug(const char *format, ...) { va_list args; if (ddebugging) { - va_start(args, format); + va_start(args, format); vfprintf(stderr, format, args); va_end(args); fprintf(stderr, "\n"); @@ -303,7 +303,7 @@ setup_key() { } keyname = dst_key_name(dstkey); } - + debug("keycreate"); result = dns_tsigkey_create(keyname, dns_tsig_hmacmd5_name, secret, secretlen, ISC_TRUE, NULL, 0, 0, @@ -554,7 +554,7 @@ parse_rdata(char **cmdlinep, dns_rdataclass_t rdataclass, if (*cmdline != 0) { result = isc_lex_create(mctx, WORDLEN, &lex); - check_result(result, "isc_lex_create"); + check_result(result, "isc_lex_create"); isc_buffer_init(&source, cmdline, strlen(cmdline)); isc_buffer_add(&source, strlen(cmdline)); @@ -670,7 +670,7 @@ make_prereq(char *cmdline, isc_boolean_t ispositive, isc_boolean_t isrrset) { ISC_LIST_INIT(rdatalist->rdata); ISC_LIST_APPEND(rdatalist->rdata, rdata, link); dns_rdataset_init(rdataset); - dns_rdatalist_tordataset(rdatalist, rdataset); + dns_rdatalist_tordataset(rdatalist, rdataset); ISC_LIST_INIT(name->list); ISC_LIST_APPEND(name->list, rdataset, link); dns_message_addname(updatemsg, name, DNS_SECTION_PREREQUISITE); @@ -943,7 +943,7 @@ show_message(void) { (int)isc_buffer_usedlength(&buf), (char*)isc_buffer_base(&buf)); } - + static isc_uint16_t get_next_command(void) { @@ -1011,7 +1011,7 @@ update_completed(isc_task_t *task, isc_event_t *event) { isc_buffer_t buf; dns_message_t *rcvmsg = NULL; char bufstore[MSGTEXT]; - + UNUSED(task); ddebug("updated_completed()"); @@ -1108,7 +1108,7 @@ recvsoa(isc_task_t *task, isc_event_t *event) { if (eresult != ISC_R_SUCCESS) { char addrbuf[ISC_SOCKADDR_FORMATSIZE]; - + isc_sockaddr_format(addr, addrbuf, sizeof(addrbuf)); fprintf(stderr, "; Communication with %s failed: %s\n", addrbuf, isc_result_totext(eresult)); @@ -1329,7 +1329,7 @@ cleanup(void) { lwres_context_destroy(&lwctx); isc_mem_put(mctx, servers, ns_total * sizeof(isc_sockaddr_t)); - + ddebug("Shutting down request manager"); dns_requestmgr_shutdown(requestmgr); dns_requestmgr_detach(&requestmgr); diff --git a/bin/rndc/Makefile.in b/bin/rndc/Makefile.in index e325a66891..2a5a524ef1 100644 --- a/bin/rndc/Makefile.in +++ b/bin/rndc/Makefile.in @@ -1,9 +1,9 @@ # 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 # 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 @@ -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.11 2000/07/27 09:37:36 tale Exp $ +# $Id: Makefile.in,v 1.12 2000/08/01 01:12:27 tale Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -26,7 +26,7 @@ top_srcdir = @top_srcdir@ CINCLUDES = -I${top_srcdir}/bin/named/include \ ${ISC_INCLUDES} ${DNS_INCLUDES} ${OMAPI_INCLUDES} -CDEFINES = +CDEFINES = CWARNINGS = OMAPILIBS = ../../lib/omapi/libomapi.@A@ diff --git a/bin/rndc/rndc.8 b/bin/rndc/rndc.8 index 80b0c771b5..a8c5381505 100644 --- a/bin/rndc/rndc.8 +++ b/bin/rndc/rndc.8 @@ -1,9 +1,9 @@ .\" 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 .\" 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 @@ -12,9 +12,9 @@ .\" 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: rndc.8,v 1.7 2000/07/27 23:49:40 tale Exp $ -.\" +.\" +.\" $Id: rndc.8,v 1.8 2000/08/01 01:18:46 tale Exp $ +.\" .Dd Jun 30, 2000 .Dt RDNC 8 .Os BIND9 9 @@ -31,7 +31,7 @@ .Op Fl s Ar server .Op Fl v .Op Fl y Ar key_id -.Ar command .... +.Ar command .... .Sh DESCRIPTION This command allows the system administrator to control the operation of a name server. @@ -45,16 +45,16 @@ prints a short summary of the supported commands and the available options and their arguments. .Pp .Nm rndc -communicates with the name server over a TCP connection, -sending commands authenticated with digital signatures. +communicates with the name server over a TCP connection, +sending commands authenticated with digital signatures. In the current versions of .Nm rndc -and +and .Xr named 8 the only supported encryption algorithm is HMAC-MD5, which uses a shared secret on each end of the connection. This provides TSIG-style authentication for the command request -and the name server's response. +and the name server's response. All commands sent over the channel must be signed by a key_id known to the server. .Pp @@ -86,7 +86,7 @@ option can be used to make .Nm rndc send commands to TCP port number .Ar port# -on the system running the name server instead of BIND 9's +on the system running the name server instead of BIND 9's default control channel port of 953. .Pp The @@ -103,7 +103,7 @@ If no .Fl y option is provided, .Nm rndc -will first look for a +will first look for a .Dv key clause in the .Dv server{} @@ -148,7 +148,7 @@ offers at least as many management capabilities as the old .Xr ndc utility. .Pp -There is currently no way to provide the shared secret for a key_id +There is currently no way to provide the shared secret for a key_id without using the configuration file. .Pp Several error messages could be clearer. diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c index 7227e97d6e..375ea249af 100644 --- a/bin/rndc/rndc.c +++ b/bin/rndc/rndc.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,9 +15,9 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rndc.c,v 1.21 2000/07/27 23:27:37 bwelling Exp $ */ +/* $Id: rndc.c,v 1.22 2000/08/01 01:12:28 tale Exp $ */ -/* +/* * Principal Author: DCL */ @@ -462,7 +462,7 @@ main(int argc, char **argv) { if (strcmp(command, "dumpdb") == 0) { result = ISC_R_NOTIMPLEMENTED; - + } else if (strcmp(command, "notrace") == 0) { result = ISC_R_NOTIMPLEMENTED; diff --git a/bin/rndc/rndc.conf b/bin/rndc/rndc.conf index 9dde134727..924767a445 100644 --- a/bin/rndc/rndc.conf +++ b/bin/rndc/rndc.conf @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rndc.conf,v 1.5 2000/07/27 09:37:38 tale Exp $ */ +/* $Id: rndc.conf,v 1.6 2000/08/01 01:12:29 tale Exp $ */ /* * Sample rndc configuration file. diff --git a/bin/rndc/rndc.conf.5 b/bin/rndc/rndc.conf.5 index 93066a59d0..dcf25eae1a 100644 --- a/bin/rndc/rndc.conf.5 +++ b/bin/rndc/rndc.conf.5 @@ -1,9 +1,9 @@ .\" 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 .\" 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 @@ -12,9 +12,9 @@ .\" 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: rndc.conf.5,v 1.5 2000/07/27 09:42:31 tale Exp $ -.\" +.\" +.\" $Id: rndc.conf.5,v 1.6 2000/08/01 01:18:48 tale Exp $ +.\" .Dd Jun 30, 2000 .Dt RDNC.CONF 5 .Os BIND9 9 @@ -24,7 +24,7 @@ .Nd rdnc configuration file .Sh SYNOPSIS .Nm rdnc.conf -.Sh DESCRIPTION +.Sh DESCRIPTION The BIND9 utility for controlling the name server, .Nm rndc , has its own configuration file @@ -65,13 +65,13 @@ be used when no name server is given as an argument to The .Dv default-key clause -is followed by the name of a key which is identified by a +is followed by the name of a key which is identified by a .Dv key{} statement. -If no +If no .Fl y option is provided on the -.Xr rndc +.Xr rndc command line, and no .Dv key clause is found in a a matching @@ -81,7 +81,7 @@ commands and responses. .Pp After the keyword .Dv server , -the +the .Dv server{} statement is followed by a string which is the hostname or address for a name server. @@ -99,7 +99,7 @@ The statement has two clauses. identifies the encryption algorithm for .Nm rndc to use; currently only HMAC-MD5 is supported. -This is followed by a +This is followed by a .Dv secret clause which contains the base-64 encoding of the algorithm's encryption key. @@ -161,9 +161,9 @@ To generate a random secret with $ dnssec-keygen -a hmac-md5 -b 128 -n user rndc .Ed .Pp -The base-64 string will appear in two files, +The base-64 string will appear in two files, .Pa Krndc.+157.+{random}.key -and +and .Pa Krndc.+157.+{random}.private . After extracting the key to be placed in the diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in index ad77eb58f9..1fc2347e73 100644 --- a/bin/tests/Makefile.in +++ b/bin/tests/Makefile.in @@ -1,9 +1,9 @@ # Copyright (C) 1998-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 # 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 @@ -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.97 2000/07/27 09:37:39 tale Exp $ +# $Id: Makefile.in,v 1.98 2000/08/01 01:12:30 tale Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -42,7 +42,7 @@ LIBS = @LIBS@ SUBDIRS = db dst master mem names net rbt sockaddr tasks timers system # Alphabetically -TARGETS = +TARGETS = XTARGETS = adb_test \ byaddr_test \ diff --git a/bin/tests/adb_test.c b/bin/tests/adb_test.c index fffd469945..7c1881cbf0 100644 --- a/bin/tests/adb_test.c +++ b/bin/tests/adb_test.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: adb_test.c,v 1.56 2000/07/27 09:37:40 tale Exp $ */ +/* $Id: adb_test.c,v 1.57 2000/08/01 01:12:31 tale Exp $ */ #include @@ -67,7 +67,7 @@ check_result(isc_result_t result, const char *format, ...) { if (result == ISC_R_SUCCESS) return; - va_start(args, format); + va_start(args, format); vfprintf(stderr, format, args); va_end(args); fprintf(stderr, "\n"); @@ -182,7 +182,7 @@ create_view(void) { unsigned int attrs; isc_sockaddr_t any4, any6; dns_dispatch_t *disp4 = NULL; - dns_dispatch_t *disp6 = NULL; + dns_dispatch_t *disp6 = NULL; isc_sockaddr_any(&any4); isc_sockaddr_any6(&any6); diff --git a/bin/tests/b8status.pl b/bin/tests/b8status.pl index 455c1b09f3..03ed3815f7 100755 --- a/bin/tests/b8status.pl +++ b/bin/tests/b8status.pl @@ -1,9 +1,9 @@ # Copyright (C) 1999, 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 # 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 @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: b8status.pl,v 1.6 2000/07/27 09:37:41 tale Exp $ +# $Id: b8status.pl,v 1.7 2000/08/01 01:12:33 tale Exp $ # # aggregate reports from all bind8 build environments @@ -134,7 +134,7 @@ sub doHost { $junk = ; close(XXX); @junk = split(/\s/, $junk); - ($hostname = $junk[1]) =~ s/\..*//; + ($hostname = $junk[1]) =~ s/\..*//; } print DEBUG "Host: $hostid, Hostname: $hostname\n" if ($Debug); diff --git a/bin/tests/b8t.mk b/bin/tests/b8t.mk index 229366955c..ec9bcea2f0 100644 --- a/bin/tests/b8t.mk +++ b/bin/tests/b8t.mk @@ -1,9 +1,9 @@ # Copyright (C) 1999, 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 # 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 @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: b8t.mk,v 1.6 2000/07/27 09:37:42 tale Exp $ +# $Id: b8t.mk,v 1.7 2000/08/01 01:12:34 tale Exp $ # # bind 8 multi-host make @@ -31,7 +31,7 @@ all: clobber populate config build clobber: @echo "CLOBBBER `date`" - @if test ! -d $(BASE) ; then mkdir -p $(BASE) ; fi + @if test ! -d $(BASE) ; then mkdir -p $(BASE) ; fi @rm -fr $(BDIR) @echo "DONE `date`" diff --git a/bin/tests/b9status.pl b/bin/tests/b9status.pl index 04a5bfa962..d848c771c5 100755 --- a/bin/tests/b9status.pl +++ b/bin/tests/b9status.pl @@ -1,9 +1,9 @@ # Copyright (C) 1999, 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 # 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 @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: b9status.pl,v 1.9 2000/07/27 09:37:43 tale Exp $ +# $Id: b9status.pl,v 1.10 2000/08/01 01:12:35 tale Exp $ # # aggregate reports from all bind9 build environments @@ -147,7 +147,7 @@ sub doHost { close(XXX); @junk = split(/\s/, $junk); $hostname = $junk[1]; - $hostname =~ s/\..*//; + $hostname =~ s/\..*//; } print DEBUG "Host: $hostid, Hostname: $hostname\n" if ($Debug); diff --git a/bin/tests/b9t.mk b/bin/tests/b9t.mk index 27a181f9e8..831b55e3c0 100644 --- a/bin/tests/b9t.mk +++ b/bin/tests/b9t.mk @@ -1,9 +1,9 @@ # Copyright (C) 1999, 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 # 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 @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: b9t.mk,v 1.8 2000/07/27 09:37:45 tale Exp $ +# $Id: b9t.mk,v 1.9 2000/08/01 01:12:36 tale Exp $ # # makefile to configure, build and test bind9 diff --git a/bin/tests/byaddr_test.c b/bin/tests/byaddr_test.c index e0efc185d8..6094a4328f 100644 --- a/bin/tests/byaddr_test.c +++ b/bin/tests/byaddr_test.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: byaddr_test.c,v 1.18 2000/07/27 09:37:46 tale Exp $ */ +/* $Id: byaddr_test.c,v 1.19 2000/08/01 01:12:37 tale Exp $ */ /* * Principal Author: Bob Halley @@ -123,7 +123,7 @@ main(int argc, char *argv[]) { task = NULL; RUNTIME_CHECK(isc_task_create(taskmgr, 0, &task) == ISC_R_SUCCESS); - isc_task_setname(task, "byaddr", NULL); + isc_task_setname(task, "byaddr", NULL); dispatchmgr = NULL; RUNTIME_CHECK(dns_dispatchmgr_create(mctx, NULL, &dispatchmgr) @@ -147,10 +147,10 @@ main(int argc, char *argv[]) { unsigned int attrs; dns_dispatch_t *disp4 = NULL; dns_dispatch_t *disp6 = NULL; - + if (isc_net_probeipv4() == ISC_R_SUCCESS) { isc_sockaddr_t any4; - + isc_sockaddr_any(&any4); attrs = DNS_DISPATCHATTR_IPV4 | DNS_DISPATCHATTR_UDP; @@ -158,7 +158,7 @@ main(int argc, char *argv[]) { socketmgr, taskmgr, &any4, 512, 6, 1024, - 17, 19, attrs, + 17, 19, attrs, attrs, &disp4) == ISC_R_SUCCESS); INSIST(disp4 != NULL); @@ -166,15 +166,15 @@ main(int argc, char *argv[]) { if (isc_net_probeipv6() == ISC_R_SUCCESS) { isc_sockaddr_t any6; - + isc_sockaddr_any6(&any6); attrs = DNS_DISPATCHATTR_IPV6 | DNS_DISPATCHATTR_UDP; - RUNTIME_CHECK(dns_dispatch_getudp(dispatchmgr, + RUNTIME_CHECK(dns_dispatch_getudp(dispatchmgr, socketmgr, - taskmgr, &any6, + taskmgr, &any6, 512, 6, 1024, - 17, 19, attrs, + 17, 19, attrs, attrs, &disp6) == ISC_R_SUCCESS); INSIST(disp6 != NULL); diff --git a/bin/tests/byname_test.c b/bin/tests/byname_test.c index 0f00a9b957..1e9130b989 100644 --- a/bin/tests/byname_test.c +++ b/bin/tests/byname_test.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: byname_test.c,v 1.20 2000/07/27 09:37:47 tale Exp $ */ +/* $Id: byname_test.c,v 1.21 2000/08/01 01:12:38 tale Exp $ */ /* * Principal Author: Bob Halley @@ -260,12 +260,12 @@ main(int argc, char *argv[]) { { unsigned int attrs; dns_dispatch_t *disp4 = NULL; - dns_dispatch_t *disp6 = NULL; + dns_dispatch_t *disp6 = NULL; if (isc_net_probeipv4() == ISC_R_SUCCESS) { isc_sockaddr_t any4; isc_sockaddr_any(&any4); - + attrs = DNS_DISPATCHATTR_IPV4 | DNS_DISPATCHATTR_UDP; RUNTIME_CHECK(dns_dispatch_getudp(dispatchmgr, socketmgr, @@ -279,9 +279,9 @@ main(int argc, char *argv[]) { if (isc_net_probeipv6() == ISC_R_SUCCESS) { isc_sockaddr_t any6; - + isc_sockaddr_any6(&any6); - + attrs = DNS_DISPATCHATTR_IPV6 | DNS_DISPATCHATTR_UDP; RUNTIME_CHECK(dns_dispatch_getudp(dispatchmgr, socketmgr, @@ -292,7 +292,7 @@ main(int argc, char *argv[]) { == ISC_R_SUCCESS); INSIST(disp6 != NULL); } - + RUNTIME_CHECK(dns_view_createresolver(view, taskmgr, 10, socketmgr, timermgr, 0, @@ -302,8 +302,8 @@ main(int argc, char *argv[]) { if (disp4 != NULL) dns_dispatch_detach(&disp4); - if (disp6 != NULL) - dns_dispatch_detach(&disp6); + if (disp6 != NULL) + dns_dispatch_detach(&disp6); } { @@ -344,12 +344,12 @@ main(int argc, char *argv[]) { isc_task_detach(&task); dns_dispatchmgr_destroy(&dispatchmgr); - + isc_taskmgr_destroy(&taskmgr); isc_socketmgr_destroy(&socketmgr); isc_timermgr_destroy(&timermgr); - + isc_log_destroy(&lctx); if (verbose) diff --git a/bin/tests/compress_test.c b/bin/tests/compress_test.c index 9517a307a7..5199b4694f 100644 --- a/bin/tests/compress_test.c +++ b/bin/tests/compress_test.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: compress_test.c,v 1.19 2000/07/27 09:37:48 tale Exp $ */ +/* $Id: compress_test.c,v 1.20 2000/08/01 01:12:39 tale Exp $ */ #include @@ -145,7 +145,7 @@ test(unsigned int allowed, dns_name_t *name1, dns_name_t *name2, RUNTIME_CHECK(dns_name_towire(name1, &cctx, &source) == ISC_R_SUCCESS); /* - RUNTIME_CHECK(dns_compress_localinit(&cctx, name1, &source) == + RUNTIME_CHECK(dns_compress_localinit(&cctx, name1, &source) == ISC_R_SUCCESS); */ dns_compress_setmethods(&cctx, allowed); diff --git a/bin/tests/db/Makefile.in b/bin/tests/db/Makefile.in index f592fbe51a..a58a54522e 100644 --- a/bin/tests/db/Makefile.in +++ b/bin/tests/db/Makefile.in @@ -1,9 +1,9 @@ # Copyright (C) 1999, 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 # 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 @@ -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.16 2000/07/27 09:38:41 tale Exp $ +# $Id: Makefile.in,v 1.17 2000/08/01 01:13:34 tale Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/bin/tests/db/t_db.c b/bin/tests/db/t_db.c index 41b8a0537a..9b9fdc160a 100644 --- a/bin/tests/db/t_db.c +++ b/bin/tests/db/t_db.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: t_db.c,v 1.24 2000/07/27 09:38:42 tale Exp $ */ +/* $Id: t_db.c,v 1.25 2000/08/01 01:13:35 tale Exp $ */ #include @@ -236,7 +236,7 @@ t1(void) { int result; t_assert("dns_db_load", 1, T_REQUIRED, a1); - result = t_eval("dns_db_load_data", t_dns_db_load, 9); + result = t_eval("dns_db_load_data", t_dns_db_load, 9); t_result(result); } @@ -1454,7 +1454,7 @@ t_dns_db_closeversion_1(char **av) { t_info("dns_rdata_compare returned %d\n", rval); ++nfails; } - + /* * Now check the rdata deletion. */ @@ -1808,7 +1808,7 @@ t_dns_db_closeversion_2(char **av) { t_info("dns_rdata_compare returned %d\n", rval); ++nfails; } - + /* * Now check the rdata deletion. */ @@ -1876,7 +1876,7 @@ t_dns_db_closeversion_2(char **av) { isc_mem_destroy(&mctx); return(T_FAIL); } - + /* * Now check the rdata deletion. */ @@ -2083,7 +2083,7 @@ t_dns_db_expirenode(char **av) { */ dns_db_detachnode(db, &nodep); } - + dns_db_detach(&db); isc_mem_destroy(&mctx); @@ -2213,7 +2213,7 @@ t_dns_db_findnode_1(char **av) { cversionp = NULL; dns_db_currentversion(db, &cversionp); dns_rdataset_init(&rdataset); - + dns_result = dns_db_findrdataset(db, nodep, cversionp, rdatatype, 0, 0, &rdataset, NULL); @@ -2230,7 +2230,7 @@ t_dns_db_findnode_1(char **av) { } else { result = T_PASS; } - + dns_db_detach(&db); isc_mem_destroy(&mctx); @@ -2718,7 +2718,7 @@ t25(void) { int result; t_assert("dns_db_load", 25, T_REQUIRED, a25); - result = t_eval("dns_db_load_soa_not_top", t_dns_db_load, 9); + result = t_eval("dns_db_load_soa_not_top", t_dns_db_load, 9); t_result(result); } diff --git a/bin/tests/db_test.c b/bin/tests/db_test.c index 49e42de30f..2fd0d1d78b 100644 --- a/bin/tests/db_test.c +++ b/bin/tests/db_test.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: db_test.c,v 1.52 2000/07/27 09:37:49 tale Exp $ */ +/* $Id: db_test.c,v 1.53 2000/08/01 01:12:40 tale Exp $ */ /* * Principal Author: Bob Halley @@ -173,7 +173,7 @@ list(dbinfo *dbi, char *seektext) { else dns_db_currentversion(dbi->db, &dbi->iversion); } - + result = dns_db_createiterator(dbi->db, ISC_FALSE, &dbi->dbiterator); if (result == ISC_R_SUCCESS) { @@ -262,7 +262,7 @@ load(const char *filename, const char *origintext, isc_boolean_t cache) { dbi->iversion = NULL; dbi->pause_every = pause_every; dbi->ascending = ascending; - + len = strlen(origintext); isc_buffer_init(&source, origintext, len); isc_buffer_add(&source, len); @@ -310,7 +310,7 @@ load(const char *filename, const char *origintext, isc_boolean_t cache) { static void unload_all(void) { dbinfo *dbi, *dbi_next; - + for (dbi = ISC_LIST_HEAD(dbs); dbi != NULL; dbi = dbi_next) { dbi_next = ISC_LIST_NEXT(dbi, link); if (dns_db_iszone(dbi->db)) @@ -331,7 +331,7 @@ if ((dbi) == NULL) { \ printf("You must first select a database with !DB\n"); \ continue; \ } - + int main(int argc, char *argv[]) { dns_db_t *db; diff --git a/bin/tests/dispatch_tcp_test.c b/bin/tests/dispatch_tcp_test.c index 39dbaffa61..61ab27e4d8 100644 --- a/bin/tests/dispatch_tcp_test.c +++ b/bin/tests/dispatch_tcp_test.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1998-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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dispatch_tcp_test.c,v 1.34 2000/07/27 09:37:50 tale Exp $ */ +/* $Id: dispatch_tcp_test.c,v 1.35 2000/08/01 01:12:42 tale Exp $ */ #include @@ -174,7 +174,7 @@ got_request(isc_task_t *task, isc_event_t *ev_in) { dns_dispatch_detach(&disp); isc_app_shutdown(); break; - + case 3: printf("--- removing request\n"); dns_dispatch_removerequest(&resp, &ev); diff --git a/bin/tests/dispatch_test.c b/bin/tests/dispatch_test.c index 920dd18845..8d7a257604 100644 --- a/bin/tests/dispatch_test.c +++ b/bin/tests/dispatch_test.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1998-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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dispatch_test.c,v 1.45 2000/07/27 09:37:52 tale Exp $ */ +/* $Id: dispatch_test.c,v 1.46 2000/08/01 01:12:43 tale Exp $ */ #include @@ -349,7 +349,7 @@ got_request(isc_task_t *task, isc_event_t *ev_in) { start_response(&clients[4], "vix.com", task); start_response(&clients[5], "isc.org", task); break; - + case 2: printf("--- removing request\n"); dns_dispatch_removerequest(&cli->resp, &ev); @@ -394,7 +394,7 @@ main(int argc, char *argv[]) { isc_log_setcontext(log); dns_log_init(log); dns_log_setcontext(log); - + destination.file.stream = stderr; destination.file.name = NULL; destination.file.versions = ISC_LOG_ROLLNEVER; @@ -435,7 +435,7 @@ main(int argc, char *argv[]) { attrs = 0; attrs |= DNS_DISPATCHATTR_IPV4; attrs |= DNS_DISPATCHATTR_UDP; - + disp = NULL; RUNTIME_CHECK(dns_dispatch_getudp(dispatchmgr, socketmgr, taskmgr, &sa, 512, 6, 1024, diff --git a/bin/tests/dst/Ktest.+001+00000.key b/bin/tests/dst/Ktest.+001+00000.key index e46d582bdd..7a5ec2fabe 100644 --- a/bin/tests/dst/Ktest.+001+00000.key +++ b/bin/tests/dst/Ktest.+001+00000.key @@ -1 +1 @@ -test. IN KEY 49152 2 1 +test. IN KEY 49152 2 1 diff --git a/bin/tests/dst/Ktest.+003+00000.key b/bin/tests/dst/Ktest.+003+00000.key index 809263acca..18ab1475eb 100644 --- a/bin/tests/dst/Ktest.+003+00000.key +++ b/bin/tests/dst/Ktest.+003+00000.key @@ -1 +1 @@ -test. IN KEY 49152 2 3 +test. IN KEY 49152 2 3 diff --git a/bin/tests/dst/Makefile.in b/bin/tests/dst/Makefile.in index a9101d03d2..79b967ed5b 100644 --- a/bin/tests/dst/Makefile.in +++ b/bin/tests/dst/Makefile.in @@ -1,9 +1,9 @@ # Copyright (C) 1999, 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 # 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 @@ -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.22 2000/07/27 09:38:44 tale Exp $ +# $Id: Makefile.in,v 1.23 2000/08/01 01:13:39 tale Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/bin/tests/dst/dst_test.c b/bin/tests/dst/dst_test.c index 9cd57c0f3a..445483ca7b 100644 --- a/bin/tests/dst/dst_test.c +++ b/bin/tests/dst/dst_test.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dst_test.c,v 1.29 2000/07/27 09:38:45 tale Exp $ */ +/* $Id: dst_test.c,v 1.30 2000/08/01 01:13:40 tale Exp $ */ #include diff --git a/bin/tests/dst/t_dst.c b/bin/tests/dst/t_dst.c index 22f5578e37..0fb99ae456 100644 --- a/bin/tests/dst/t_dst.c +++ b/bin/tests/dst/t_dst.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: t_dst.c,v 1.35 2000/07/27 09:38:46 tale Exp $ */ +/* $Id: t_dst.c,v 1.36 2000/08/01 01:13:41 tale Exp $ */ #include @@ -541,7 +541,7 @@ sig_fromfile(char *path, isc_buffer_t *iscbuf) { t_info("malloc failed, errno == %d\n", errno); return(1); } - + fd = open(path, O_RDONLY); if (fd < 0) { t_info("open failed, errno == %d\n", errno); diff --git a/bin/tests/entropy2_test.c b/bin/tests/entropy2_test.c index 3d712977ed..4b81d9f2d3 100644 --- a/bin/tests/entropy2_test.c +++ b/bin/tests/entropy2_test.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: entropy2_test.c,v 1.7 2000/07/27 09:37:53 tale Exp $ */ +/* $Id: entropy2_test.c,v 1.8 2000/08/01 01:12:44 tale Exp $ */ #include diff --git a/bin/tests/entropy_test.c b/bin/tests/entropy_test.c index 81d646d5a8..04e8538d69 100644 --- a/bin/tests/entropy_test.c +++ b/bin/tests/entropy_test.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: entropy_test.c,v 1.14 2000/07/27 09:37:54 tale Exp $ */ +/* $Id: entropy_test.c,v 1.15 2000/08/01 01:12:45 tale Exp $ */ #include diff --git a/bin/tests/fsaccess_test.c b/bin/tests/fsaccess_test.c index 1d41528fbc..03afda1547 100644 --- a/bin/tests/fsaccess_test.c +++ b/bin/tests/fsaccess_test.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: fsaccess_test.c,v 1.6 2000/07/27 09:37:55 tale Exp $ */ +/* $Id: fsaccess_test.c,v 1.7 2000/08/01 01:12:46 tale Exp $ */ #include diff --git a/bin/tests/gxba_test.c b/bin/tests/gxba_test.c index fadaa28a83..4ae33e4efa 100644 --- a/bin/tests/gxba_test.c +++ b/bin/tests/gxba_test.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: gxba_test.c,v 1.5 2000/07/27 09:37:56 tale Exp $ */ +/* $Id: gxba_test.c,v 1.6 2000/08/01 01:12:47 tale Exp $ */ #include diff --git a/bin/tests/gxbn_test.c b/bin/tests/gxbn_test.c index 6dad7b8d6f..86be6aac93 100644 --- a/bin/tests/gxbn_test.c +++ b/bin/tests/gxbn_test.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: gxbn_test.c,v 1.8 2000/07/27 09:37:57 tale Exp $ */ +/* $Id: gxbn_test.c,v 1.9 2000/08/01 01:12:49 tale Exp $ */ #include diff --git a/bin/tests/hash_test.c b/bin/tests/hash_test.c index e6612df99c..cdf6b2acec 100644 --- a/bin/tests/hash_test.c +++ b/bin/tests/hash_test.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: hash_test.c,v 1.6 2000/07/27 09:37:58 tale Exp $ */ +/* $Id: hash_test.c,v 1.7 2000/08/01 01:12:50 tale Exp $ */ #include diff --git a/bin/tests/headerdep_test.sh.in b/bin/tests/headerdep_test.sh.in index 0f26c5bc45..1e1a0fe58c 100644 --- a/bin/tests/headerdep_test.sh.in +++ b/bin/tests/headerdep_test.sh.in @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: headerdep_test.sh.in,v 1.3 2000/07/27 09:37:59 tale Exp $ +# $Id: headerdep_test.sh.in,v 1.4 2000/08/01 01:12:51 tale Exp $ # # Check the installed bind9 headers to make sure that no header @@ -43,7 +43,7 @@ do EOF # Compile the test program. - if + if gcc @STD_CWARNINGS@ @STD_CINCLUDES@ -I$prefix/include -c test.c 2>&1 then : diff --git a/bin/tests/inter_test.c b/bin/tests/inter_test.c index b269d9614c..824f4325d1 100644 --- a/bin/tests/inter_test.c +++ b/bin/tests/inter_test.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: inter_test.c,v 1.6 2000/07/27 09:38:00 tale Exp $ */ +/* $Id: inter_test.c,v 1.7 2000/08/01 01:12:52 tale Exp $ */ #include diff --git a/bin/tests/keyboard_test.c b/bin/tests/keyboard_test.c index 8d95859327..0838457237 100644 --- a/bin/tests/keyboard_test.c +++ b/bin/tests/keyboard_test.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: keyboard_test.c,v 1.6 2000/07/27 09:38:01 tale Exp $ */ +/* $Id: keyboard_test.c,v 1.7 2000/08/01 01:12:53 tale Exp $ */ #include diff --git a/bin/tests/lex_test.c b/bin/tests/lex_test.c index e8383b8cf3..6dbbf4b60b 100644 --- a/bin/tests/lex_test.c +++ b/bin/tests/lex_test.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1998-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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lex_test.c,v 1.16 2000/07/27 09:38:03 tale Exp $ */ +/* $Id: lex_test.c,v 1.17 2000/08/01 01:12:54 tale Exp $ */ #include diff --git a/bin/tests/lfsr_test.c b/bin/tests/lfsr_test.c index f8f12a07f1..b53bb2e31f 100644 --- a/bin/tests/lfsr_test.c +++ b/bin/tests/lfsr_test.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lfsr_test.c,v 1.8 2000/07/27 09:38:04 tale Exp $ */ +/* $Id: lfsr_test.c,v 1.9 2000/08/01 01:12:55 tale Exp $ */ #include diff --git a/bin/tests/log_test.c b/bin/tests/log_test.c index ac28e7181b..a4c294bb0e 100644 --- a/bin/tests/log_test.c +++ b/bin/tests/log_test.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: log_test.c,v 1.19 2000/07/27 09:38:05 tale Exp $ */ +/* $Id: log_test.c,v 1.20 2000/08/01 01:12:56 tale Exp $ */ /* Principal Authors: DCL */ @@ -310,7 +310,7 @@ main (int argc, char **argv) { isc_log_setduplicateinterval(lcfg, 1); message = "This message should appear twice on stderr"; - + isc_log_write1(lctx, DNS_LOGCATEGORY_GENERAL, DNS_LOGMODULE_RBTDB, ISC_LOG_CRITICAL, message); sleep(2); diff --git a/bin/tests/lwres_test.c b/bin/tests/lwres_test.c index 45af819e4b..ebf28fdce8 100644 --- a/bin/tests/lwres_test.c +++ b/bin/tests/lwres_test.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lwres_test.c,v 1.22 2000/07/27 09:38:06 tale Exp $ */ +/* $Id: lwres_test.c,v 1.23 2000/08/01 01:12:57 tale Exp $ */ #include diff --git a/bin/tests/lwresconf_test.c b/bin/tests/lwresconf_test.c index 6b331370d8..2b044ac0a0 100644 --- a/bin/tests/lwresconf_test.c +++ b/bin/tests/lwresconf_test.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lwresconf_test.c,v 1.8 2000/07/27 09:38:07 tale Exp $ */ +/* $Id: lwresconf_test.c,v 1.9 2000/08/01 01:12:58 tale Exp $ */ #include @@ -64,7 +64,7 @@ main(int argc, char *argv[]) { if (argc > 1) { file = argv[1]; } - + #ifdef USE_ISC_MEM mem = NULL; result = isc_mem_create(0, 0, &mem); diff --git a/bin/tests/master/Makefile.in b/bin/tests/master/Makefile.in index 7ac7309cf4..3d45e80218 100644 --- a/bin/tests/master/Makefile.in +++ b/bin/tests/master/Makefile.in @@ -1,9 +1,9 @@ # Copyright (C) 1999, 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 # 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 @@ -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.15 2000/07/27 09:38:47 tale Exp $ +# $Id: Makefile.in,v 1.16 2000/08/01 01:13:42 tale Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/bin/tests/master/master10.data b/bin/tests/master/master10.data index 4e1c81a631..9ee052fca9 100644 --- a/bin/tests/master/master10.data +++ b/bin/tests/master/master10.data @@ -1,6 +1,6 @@ ; ; the following black line contains spaces - + ; @ 300 IN A 10.0.0.1 ; diff --git a/bin/tests/master/t_master.c b/bin/tests/master/t_master.c index 6bb4091bd3..1ec38d5726 100644 --- a/bin/tests/master/t_master.c +++ b/bin/tests/master/t_master.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1998-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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: t_master.c,v 1.27 2000/07/27 09:38:48 tale Exp $ */ +/* $Id: t_master.c,v 1.28 2000/08/01 01:13:45 tale Exp $ */ #include @@ -50,7 +50,7 @@ t1_add_callback(void *arg, dns_name_t *owner, dns_rdataset_t *dataset) { char buf[BIGBUFLEN]; isc_buffer_t target; isc_result_t result; - + UNUSED(arg); isc_buffer_init(&target, buf, BIGBUFLEN); @@ -103,7 +103,7 @@ test_master(char *testfile, char *origin, char *class, isc_result_t exp_result) dns_rdatacallbacks_init_stdio(&callbacks); callbacks.add = t1_add_callback; - + textregion.base = class; textregion.length = strlen(class); diff --git a/bin/tests/master_test.c b/bin/tests/master_test.c index af56244b1e..da608239d1 100644 --- a/bin/tests/master_test.c +++ b/bin/tests/master_test.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: master_test.c,v 1.23 2000/07/27 09:38:08 tale Exp $ */ +/* $Id: master_test.c,v 1.24 2000/08/01 01:13:00 tale Exp $ */ #include @@ -38,7 +38,7 @@ print_dataset(void *arg, dns_name_t *owner, dns_rdataset_t *dataset) { char buf[64*1024]; isc_buffer_t target; isc_result_t result; - + UNUSED(arg); isc_buffer_init(&target, buf, 64*1024); @@ -47,7 +47,7 @@ print_dataset(void *arg, dns_name_t *owner, dns_rdataset_t *dataset) { if (result == ISC_R_SUCCESS) fprintf(stdout, "%.*s\n", (int)target.used, (char*)target.base); - else + else fprintf(stdout, "dns_rdataset_totext: %s\n", dns_result_totext(result)); @@ -80,10 +80,10 @@ main(int argc, char *argv[]) { dns_result_totext(result)); exit(1); } - + dns_rdatacallbacks_init_stdio(&callbacks); callbacks.add = print_dataset; - + result = dns_master_loadfile(argv[1], &origin, &origin, 1, ISC_FALSE, &callbacks, mctx); diff --git a/bin/tests/mem/Makefile.in b/bin/tests/mem/Makefile.in index a161def6df..2c96e7ab26 100644 --- a/bin/tests/mem/Makefile.in +++ b/bin/tests/mem/Makefile.in @@ -1,9 +1,9 @@ # Copyright (C) 1998-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 # 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 @@ -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.21 2000/07/27 09:38:50 tale Exp $ +# $Id: Makefile.in,v 1.22 2000/08/01 01:13:46 tale Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -32,7 +32,7 @@ TAPIDEPLIBS = ../../../lib/tests/libt_api.@A@ ISCDEPLIBS = ../../../lib/isc/libisc.@A@ TAPILIBS = ../../../lib/tests/libt_api.@A@ -DEPLIBS = ${TAPIDEPLIBS} ${ISCDEPLIBS} +DEPLIBS = ${TAPIDEPLIBS} ${ISCDEPLIBS} LIBS = ${TAPILIBS} ${ISCLIBS} @LIBS@ diff --git a/bin/tests/mem/t_mem.c b/bin/tests/mem/t_mem.c index abe3362ad1..6a8a719c25 100644 --- a/bin/tests/mem/t_mem.c +++ b/bin/tests/mem/t_mem.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: t_mem.c,v 1.7 2000/07/27 09:38:51 tale Exp $ */ +/* $Id: t_mem.c,v 1.8 2000/08/01 01:13:47 tale Exp $ */ #include @@ -128,7 +128,7 @@ memtest(void) { rval, MP1_MAXALLOC - 11); ++nfails; } - + if (T_debug) isc_mem_stats(mctx, stderr); @@ -166,7 +166,7 @@ memtest(void) { isc_mempool_put(mp1, items1[i]); items1[i] = NULL; } - + isc_mempool_destroy(&mp1); if (T_debug) @@ -200,7 +200,7 @@ t1(void) { result = T_FAIL; t_result(result); } - + testspec_t T_testlist[] = { { t1, "basic memory subsystem" }, { NULL, NULL } diff --git a/bin/tests/mempool_test.c b/bin/tests/mempool_test.c index b9f37ffc12..820345e02c 100644 --- a/bin/tests/mempool_test.c +++ b/bin/tests/mempool_test.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: mempool_test.c,v 1.9 2000/07/27 09:38:09 tale Exp $ */ +/* $Id: mempool_test.c,v 1.10 2000/08/01 01:13:01 tale Exp $ */ #include @@ -111,7 +111,7 @@ main(int argc, char *argv[]) { isc_mempool_put(mp1, items1[i]); items1[i] = NULL; } - + isc_mempool_destroy(&mp1); isc_mem_stats(mctx, stderr); diff --git a/bin/tests/name_test.c b/bin/tests/name_test.c index 47a69459a1..111f5a548c 100644 --- a/bin/tests/name_test.c +++ b/bin/tests/name_test.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1998-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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: name_test.c,v 1.30 2000/07/27 09:38:10 tale Exp $ */ +/* $Id: name_test.c,v 1.31 2000/08/01 01:13:02 tale Exp $ */ #include @@ -31,7 +31,7 @@ static void print_wirename(isc_region_t *name) { unsigned char *ccurr, *cend; - + if (name->length == 0) { printf("\n"); return; @@ -194,7 +194,7 @@ main(int argc, char *argv[]) { dns_fixedname_init(&wname2); continue; } - + if (check_absolute && dns_name_countlabels(name) > 0) { if (dns_name_isabsolute(name)) printf("absolute\n"); @@ -354,6 +354,6 @@ main(int argc, char *argv[]) { name = &wname.name; } } - + return (0); } diff --git a/bin/tests/named.conf b/bin/tests/named.conf index ff2bb0e9ae..08abca544e 100644 --- a/bin/tests/named.conf +++ b/bin/tests/named.conf @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.44 2000/07/27 09:38:12 tale Exp $ */ +/* $Id: named.conf,v 1.45 2000/08/01 01:13:03 tale Exp $ */ /* * This is a worthless, nonrunnable example of a named.conf file that has @@ -62,7 +62,7 @@ options { // servers won't like it. # Obsolete - deallocate-on-exit no; + deallocate-on-exit no; dialup yes; @@ -119,26 +119,26 @@ options { allow-recursion { !any; }; blackhole { 45/24; }; - listen-on { + listen-on { 10/24; 10.0.0.3; }; - listen-on port 53 { any; }; - - listen-on { 5.6.7.8; }; - - listen-on port 1234 { - !1.2.3.4; - 1.2.3/24; - }; + listen-on port 53 { any; }; + + listen-on { 5.6.7.8; }; + + listen-on port 1234 { + !1.2.3.4; + 1.2.3/24; + }; listen-on-v6 { - 1:1:1:1:1:1:1:1; + 1:1:1:1:1:1:1:1; }; listen-on-v6 port 777 { - 2:2:2:2:2:2:2:2; + 2:2:2:2:2:2:2:2; }; query-source-v6 address 8:7:6:5:4:3:2:1 port *; @@ -150,7 +150,7 @@ options { max-transfer-time-out 10; max-transfer-idle-in 100; max-transfer-idle-out 11; - + max-ncache-ttl 333; min-roots 15; serial-queries 34; @@ -180,15 +180,15 @@ options { heartbeat-interval 1001; interface-interval 1002; statistics-interval 1003; - + topology { - 10/8; - - !1.2.3/24; - - { 1.2/16; 3/8; }; - - + 10/8; + + !1.2.3/24; + + { 1.2/16; 3/8; }; + + }; sortlist { 10/8; 11/8; }; @@ -203,14 +203,14 @@ options { controls { // 'inet' lines without a 'port' defaults to 'port 953' // 'keys' must be used and the list must have at least one entry - inet * port 52 allow { any; } keys { "key2"; }; + inet * port 52 allow { any; } keys { "key2"; }; inet 10.0.0.1 allow { any; } keys { "key4";}; inet 10.0.0.2 allow { none; } keys { "key-1"; "key-2"; }; unix "/var/run/ndc" perm 0600 owner 0 group 0; // ignored by named. }; zone "master.demo.zone" { - type master; // what used to be called "primary" + type master; // what used to be called "primary" database "somedb -option1 -option2 arg1 arg2 arg3"; file "master.demo.zone"; check-names fail; @@ -231,7 +231,7 @@ zone "master.demo.zone" { }; zone "slave.demo.zone" { - type slave; // what used to be called "secondary" + type slave; // what used to be called "secondary" file "slave.demo.zone"; ixfr-base "slave.demo.zone.ixfr"; // File name for IXFR transaction log file masters { @@ -259,9 +259,9 @@ key "non-viewkey" { secret "aaa" ; algorithm "zzz" ; }; view "test-view" in { key "viewkey" { algorithm "xxx" ; secret "yyy" ; }; also-notify { 10.2.2.3; }; - trusted-keys { + trusted-keys { foo.com. 4 3 2 "abdefghijklmnopqrstuvwxyz"; - }; + }; sig-validity-interval 45; max-cache-size 100000; allow-query { 10.0.0.30;}; @@ -328,13 +328,13 @@ zone "stub.demo.zone" { zone "." { type hint; // used to be specified w/ "cache" - file "cache.db"; + file "cache.db"; // pubkey 257 255 1 "AQP2fHpZ4VMpKo/jc9Fod821uyfY5p8j5h/Am0V/KpBTMZjdXmp9QJe6yFRoIIzkaNCgTIftASdpXGgCwFB2j2KXP/rick6gvEer5VcDEkLR5Q=="; }; -trusted-keys { +trusted-keys { "." 257 255 1 "AQP2fHpZ4VMpKo/jc9Fod821uyfY5p8j5h/Am0V/KpBTMZjdXmp9QJe6yFRoIIzkaNCgTIftASdpXGgCwFB2j2KXP/rick6gvEer5VcDEkLR5Q=="; -}; +}; acl can_query { !1.2.3/24; any; }; // network 1.2.3.0 mask 255.255.255.0 @@ -364,17 +364,17 @@ zone "non-default-acl.demo.zone" { // identity or name not absolute // 'wildcard' match type and no wildcard character in name // - // issues: + // issues: // - certain rdatatype values (such as "key") are config file keywords and // must be quoted or a syntax error will occur. // update-policy { - grant root.domain. subdomain host.domain. A MX CNAME; - grant sub.root.domain. wildcard *.host.domain. A; - grant root.domain. name host.domain. a ns md mf cname soa mb mg + grant root.domain. subdomain host.domain. A MX CNAME; + grant sub.root.domain. wildcard *.host.domain. A; + grant root.domain. name host.domain. a ns md mf cname soa mb mg mr "null" wks ptr hinfo minfo mx txt rp afsdb x25 - isdn rt nsap sig "key" px gpos aaaa loc nxt srv naptr kx + isdn rt nsap sig "key" px gpos aaaa loc nxt srv naptr kx cert a6 dname opt unspec tkey tsig ; grant foo.bar.com. self foo.bar.com. a; }; @@ -408,7 +408,7 @@ server 1.2.3.4 { // rest of the server # Now called 'request-ixfr' # support-ixfr yes; // for IXFR supported by server - // if yes, the listed server talks IXFR + // if yes, the listed server talks IXFR }; logging { @@ -427,13 +427,13 @@ logging { }; /* - * Channels have a severity level. Messages at severity levels + * Channels have a severity level. Messages at severity levels * greater than or equal to the channel's level will be logged on * the channel. In order of decreasing severity, the levels are: * * critical a fatal error * error - * warning + * warning * notice a normal, but significant event * info an informational message * debug 1 the least detailed debugging info @@ -532,7 +532,7 @@ logging { category lame-servers { null; }; // don't log these at all - channel moderate_debug { + channel moderate_debug { file "foo"; // foo severity debug 3; // level 3 debugging to file print-time yes; // timestamp log entries diff --git a/bin/tests/names/Makefile.in b/bin/tests/names/Makefile.in index 580c1c7efd..19f5e7050d 100644 --- a/bin/tests/names/Makefile.in +++ b/bin/tests/names/Makefile.in @@ -1,9 +1,9 @@ # Copyright (C) 1999, 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 # 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 @@ -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.15 2000/07/27 09:38:52 tale Exp $ +# $Id: Makefile.in,v 1.16 2000/08/01 01:13:48 tale Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/bin/tests/names/dns_name_compare_data b/bin/tests/names/dns_name_compare_data index f3fa08ee96..0467fcfeb0 100644 --- a/bin/tests/names/dns_name_compare_data +++ b/bin/tests/names/dns_name_compare_data @@ -3,7 +3,7 @@ # format: # # where: exp_order may be one of: -1, 0, 1 -# +# # and where: exp_nlabels and exp_nbits are not tested if < 0 # c.d a.b.c.d -1 diff --git a/bin/tests/names/dns_name_fromregion_data b/bin/tests/names/dns_name_fromregion_data index 4711f192a9..64cf117cbe 100644 --- a/bin/tests/names/dns_name_fromregion_data +++ b/bin/tests/names/dns_name_fromregion_data @@ -3,7 +3,7 @@ # format: # # where: exp_order may be one of: -1, 0, 1 -# +# # and where: exp_nlabels and exp_nbits are not tested if < 0 # #c.d.\[x31].abc.\[b110011] diff --git a/bin/tests/names/dns_name_fromwire_1_data b/bin/tests/names/dns_name_fromwire_1_data index 7816699dde..f329150219 100644 --- a/bin/tests/names/dns_name_fromwire_1_data +++ b/bin/tests/names/dns_name_fromwire_1_data @@ -28,5 +28,5 @@ # DNS_R_BADPOINTER # ISC_R_UNEXPECTEDEND # DNS_R_TOOMANYHOPS -# +# wire_test1.data 25 1 DNS_COMPRESS_ALL vix.com. ISC_R_SUCCESS diff --git a/bin/tests/names/dns_name_fromwire_2_data b/bin/tests/names/dns_name_fromwire_2_data index 728d5da2a6..fd790c0a7c 100644 --- a/bin/tests/names/dns_name_fromwire_2_data +++ b/bin/tests/names/dns_name_fromwire_2_data @@ -28,5 +28,5 @@ # DNS_R_BADPOINTER # ISC_R_UNEXPECTEDEND # DNS_R_TOOMANYHOPS -# +# wire_test2.data 25 1 DNS_COMPRESS_ALL vix.com. ISC_R_NOSPACE diff --git a/bin/tests/names/dns_name_fromwire_3_data b/bin/tests/names/dns_name_fromwire_3_data index 22277891dd..04a1638572 100644 --- a/bin/tests/names/dns_name_fromwire_3_data +++ b/bin/tests/names/dns_name_fromwire_3_data @@ -28,6 +28,6 @@ # DNS_R_BADPOINTER # ISC_R_UNEXPECTEDEND # DNS_R_TOOMANYHOPS -# +# wire_test3_1.data 25 1 DNS_COMPRESS_ALL vix.com. DNS_R_BADLABELTYPE wire_test3_2.data 25 1 DNS_COMPRESS_ALL vix.com. DNS_R_BADLABELTYPE diff --git a/bin/tests/names/dns_name_fromwire_4_data b/bin/tests/names/dns_name_fromwire_4_data index af4d515f75..4dc9104924 100644 --- a/bin/tests/names/dns_name_fromwire_4_data +++ b/bin/tests/names/dns_name_fromwire_4_data @@ -28,5 +28,5 @@ # DNS_R_BADPOINTER # ISC_R_UNEXPECTEDEND # DNS_R_TOOMANYHOPS -# +# wire_test4.data 550 1 DNS_COMPRESS_ALL vix.com. DNS_R_NAMETOOLONG diff --git a/bin/tests/names/dns_name_fromwire_5_data b/bin/tests/names/dns_name_fromwire_5_data index b813557d07..0803e0df0e 100644 --- a/bin/tests/names/dns_name_fromwire_5_data +++ b/bin/tests/names/dns_name_fromwire_5_data @@ -28,5 +28,5 @@ # DNS_R_BADPOINTER # ISC_R_UNEXPECTEDEND # DNS_R_TOOMANYHOPS -# +# wire_test5.data 25 1 DNS_COMPRESS_NONE vix.com. DNS_R_DISALLOWED diff --git a/bin/tests/names/dns_name_fromwire_6_data b/bin/tests/names/dns_name_fromwire_6_data index 319515da2a..fdd6ca8dfd 100644 --- a/bin/tests/names/dns_name_fromwire_6_data +++ b/bin/tests/names/dns_name_fromwire_6_data @@ -28,5 +28,5 @@ # DNS_R_BADPOINTER # ISC_R_UNEXPECTEDEND # DNS_R_TOOMANYHOPS -# +# wire_test6.data 25 1 DNS_COMPRESS_ALL vix.com. DNS_R_BADPOINTER diff --git a/bin/tests/names/dns_name_fromwire_7_data b/bin/tests/names/dns_name_fromwire_7_data index 7b47691ce0..fd13d53344 100644 --- a/bin/tests/names/dns_name_fromwire_7_data +++ b/bin/tests/names/dns_name_fromwire_7_data @@ -28,5 +28,5 @@ # DNS_R_BADPOINTER # ISC_R_UNEXPECTEDEND # DNS_R_TOOMANYHOPS -# +# wire_test7.data 25 1 DNS_COMPRESS_ALL vix.com. ISC_R_UNEXPECTEDEND diff --git a/bin/tests/names/dns_name_fromwire_8_data b/bin/tests/names/dns_name_fromwire_8_data index ddf49f3ce9..b0523abb4a 100644 --- a/bin/tests/names/dns_name_fromwire_8_data +++ b/bin/tests/names/dns_name_fromwire_8_data @@ -28,5 +28,5 @@ # DNS_R_BADPOINTER # ISC_R_UNEXPECTEDEND # DNS_R_TOOMANYHOPS -# +# wire_test8.data 383 1 DNS_COMPRESS_ALL vix.com. DNS_R_TOOMANYHOPS diff --git a/bin/tests/names/dns_name_fromwire_9_data b/bin/tests/names/dns_name_fromwire_9_data index 2f6cb1bc79..fb92336cbf 100644 --- a/bin/tests/names/dns_name_fromwire_9_data +++ b/bin/tests/names/dns_name_fromwire_9_data @@ -28,5 +28,5 @@ # DNS_R_BADPOINTER # ISC_R_UNEXPECTEDEND # DNS_R_TOOMANYHOPS -# +# wire_test9.data 25 1 DNS_COMPRESS_ALL vix.com. ISC_R_NOSPACE diff --git a/bin/tests/names/dns_name_getlabel_data b/bin/tests/names/dns_name_getlabel_data index cdaf7aad8f..d8dc880a09 100644 --- a/bin/tests/names/dns_name_getlabel_data +++ b/bin/tests/names/dns_name_getlabel_data @@ -4,7 +4,7 @@ # # where: label1_pos and label2_pos identify the label position of # the common label shared by name1 and name2 respectively -# +# c.d 1 a.b.c.d 3 a.b.c.d 3 c.d 1 a.b.c. 3 a.b.c. 3 diff --git a/bin/tests/names/dns_name_getlabelsequence_data b/bin/tests/names/dns_name_getlabelsequence_data index 2f39ce969e..339604afb0 100644 --- a/bin/tests/names/dns_name_getlabelsequence_data +++ b/bin/tests/names/dns_name_getlabelsequence_data @@ -2,7 +2,7 @@ # test data for dns_name_getlabelsequence # format: # -# +# # c.d 1 a.b.c.d 3 1 a.b.c.d.e 2 c.d 0 2 diff --git a/bin/tests/names/dns_name_issubdomain_data b/bin/tests/names/dns_name_issubdomain_data index 3f74bcbec2..102b0721f3 100644 --- a/bin/tests/names/dns_name_issubdomain_data +++ b/bin/tests/names/dns_name_issubdomain_data @@ -3,7 +3,7 @@ # format: # # where: issubdomain is 0 if false, else non-zero -# +# # and where: exp_nlabels and exp_nbits are not tested if < 0 # c.d a.b.c.d 0 diff --git a/bin/tests/names/dns_name_rdatacompare_data b/bin/tests/names/dns_name_rdatacompare_data index 45041e517b..7f0c6a2109 100644 --- a/bin/tests/names/dns_name_rdatacompare_data +++ b/bin/tests/names/dns_name_rdatacompare_data @@ -3,7 +3,7 @@ # format: # # where: exp_order may be one of: -1, 0, 1 -# +# # and where: exp_nlabels and exp_nbits are not tested if < 0 # c.d. a.b.c.d. 1 diff --git a/bin/tests/names/t_names.c b/bin/tests/names/t_names.c index 833f7b4417..a876556c85 100644 --- a/bin/tests/names/t_names.c +++ b/bin/tests/names/t_names.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1998-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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: t_names.c,v 1.27 2000/07/27 09:38:53 tale Exp $ */ +/* $Id: t_names.c,v 1.28 2000/08/01 01:14:06 tale Exp $ */ #include @@ -113,7 +113,7 @@ chkdata(unsigned char *buf, size_t buflen, char *exp_data, t_info("malloc failed unexpectedly\n"); return (-1); } - + /* * First convert exp_data from hex format. */ @@ -934,7 +934,7 @@ test_dns_name_fullcompare(char *name1, char *name2, if (dns_result == ISC_R_SUCCESS) { dns_reln = dns_name_fullcompare(&dns_name1, &dns_name2, &order, &nlabels, &nbits); - + if (dns_reln != exp_dns_reln) { ++nfails; t_info("expected relationship of %s, got %s\n", @@ -1277,7 +1277,7 @@ test_dns_name_issubdomain(char *name1, char *name2, isc_boolean_t exp_rval) { dns_result = dname_from_tname(name2, &dns_name2); if (dns_result == ISC_R_SUCCESS) { rval = dns_name_issubdomain(&dns_name1, &dns_name2); - + if (rval != exp_rval) { t_info("expected return value of %s, got %s\n", exp_rval == ISC_TRUE ? "true" : "false", @@ -1364,7 +1364,7 @@ test_dns_name_countlabels(char *test_name, unsigned int exp_nlabels) { dns_result = dname_from_tname(test_name, &dns_name); if (dns_result == ISC_R_SUCCESS) { nlabels = dns_name_countlabels(&dns_name); - + if (nlabels != exp_nlabels) { t_info("expected %d, got %d\n", exp_nlabels, nlabels); result = T_FAIL; @@ -2076,7 +2076,7 @@ static const char *a42 = "converts the possibly compressed DNS name 'name' in wire " "format to canonicalized form at target, performing upper to " "lower case conversion if downcase is true, and returns " - "ISC_R_SUCCESS"; + "ISC_R_SUCCESS"; #if 0 /* @@ -2163,7 +2163,7 @@ test_dns_name_fromwire(char *datafile_name, int testname_offset, int downcase, &nbits); if (dns_namereln != dns_namereln_equal) { t_info("dns_name_fullcompare returned %s\n", - dns_namereln_to_text(dns_namereln)); + dns_namereln_to_text(dns_namereln)); result = T_FAIL; } else { result = T_PASS; diff --git a/bin/tests/nconf_test.c b/bin/tests/nconf_test.c index dcf339f18d..632960d724 100644 --- a/bin/tests/nconf_test.c +++ b/bin/tests/nconf_test.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: nconf_test.c,v 1.18 2000/07/27 09:38:13 tale Exp $ */ +/* $Id: nconf_test.c,v 1.19 2000/08/01 01:13:04 tale Exp $ */ #include @@ -36,7 +36,7 @@ zonecbk(dns_c_ctx_t *ctx, dns_c_zone_t *zone, dns_c_view_t *view, void *uap) { UNUSED(ctx); UNUSED(uap); - + dns_c_zone_getname(zone, &zname); #if 0 @@ -48,7 +48,7 @@ zonecbk(dns_c_ctx_t *ctx, dns_c_zone_t *zone, dns_c_view_t *view, void *uap) { #else UNUSED(view); vname = "foo"; -#endif +#endif fprintf(stderr, "handling zone %s, view %s\n", zname, vname); @@ -59,7 +59,7 @@ 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); } @@ -76,7 +76,7 @@ main (int argc, char **argv) { dns_c_cbks_t callbacks; isc_log_t *log = NULL; isc_logconfig_t *logcfg = NULL; - + callbacks.zonecbk = zonecbk; callbacks.optscbk = optscbk; callbacks.zonecbkuap = NULL; @@ -86,14 +86,14 @@ main (int argc, char **argv) { 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]; @@ -106,12 +106,12 @@ main (int argc, char **argv) { 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"); @@ -132,7 +132,7 @@ main (int argc, char **argv) { outfp = stderr; } } - + dns_c_ctx_print(outfp, 0, configctx); #if 0 @@ -146,7 +146,7 @@ main (int argc, char **argv) { dns_ipmatch_list_print(outfp, 0, list); } #endif - + if (outfp != stderr) { fclose(outfp); } @@ -155,7 +155,7 @@ main (int argc, char **argv) { dns_lctx = NULL; isc_log_destroy(&log); - + isc_mem_destroy(&mem); return (0); diff --git a/bin/tests/ndc.conf b/bin/tests/ndc.conf index 7a9368cdd8..17574ef3a4 100644 --- a/bin/tests/ndc.conf +++ b/bin/tests/ndc.conf @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: ndc.conf,v 1.4 2000/07/27 09:38:14 tale Exp $ */ +/* $Id: ndc.conf,v 1.5 2000/08/01 01:13:05 tale Exp $ */ options { default-server "velo.jab.fr" ; diff --git a/bin/tests/ndcconf_test.c b/bin/tests/ndcconf_test.c index 270d19c798..20c4db0ee0 100644 --- a/bin/tests/ndcconf_test.c +++ b/bin/tests/ndcconf_test.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: ndcconf_test.c,v 1.9 2000/07/27 09:38:15 tale Exp $ */ +/* $Id: ndcconf_test.c,v 1.10 2000/08/01 01:13:06 tale Exp $ */ #include @@ -44,15 +44,15 @@ main(int argc, char **argv) { } else { program++; } - + argc--; argv++; - + if (argc == 0) { fprintf(stderr, "usage: %s file\n", program); exit (1); } - + conffile = argv[0]; RUNTIME_CHECK(isc_mem_create(0, 0, &mem) == ISC_R_SUCCESS); @@ -60,7 +60,7 @@ main(int argc, char **argv) { 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); @@ -72,15 +72,15 @@ main(int argc, char **argv) { } else { dns_c_ndcctx_print(stderr, ndcctx); } - + dns_c_ndcctx_destroy(&ndcctx); dns_lctx = NULL; isc_log_destroy(&log); - + isc_mem_destroy(&mem); return (0); } - + diff --git a/bin/tests/net/Makefile.in b/bin/tests/net/Makefile.in index d44b1f3fe7..19e22f7a87 100644 --- a/bin/tests/net/Makefile.in +++ b/bin/tests/net/Makefile.in @@ -1,9 +1,9 @@ # 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 # 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 @@ -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.5 2000/07/27 09:38:55 tale Exp $ +# $Id: Makefile.in,v 1.6 2000/08/01 01:14:07 tale Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/bin/tests/net/driver.c b/bin/tests/net/driver.c index 6442813137..e0ce8e95e8 100644 --- a/bin/tests/net/driver.c +++ b/bin/tests/net/driver.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: driver.c,v 1.5 2000/07/27 09:38:56 tale Exp $ */ +/* $Id: driver.c,v 1.6 2000/08/01 01:14:08 tale Exp $ */ #include diff --git a/bin/tests/net/driver.h b/bin/tests/net/driver.h index 0e6fa6628a..4328ba5f6a 100644 --- a/bin/tests/net/driver.h +++ b/bin/tests/net/driver.h @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: driver.h,v 1.3 2000/07/27 09:38:57 tale Exp $ */ +/* $Id: driver.h,v 1.4 2000/08/01 01:14:09 tale Exp $ */ /* * PASSED and FAILED mean the particular test passed or failed. diff --git a/bin/tests/net/netaddr_multicast.c b/bin/tests/net/netaddr_multicast.c index 18dc6e7609..9d93d84784 100644 --- a/bin/tests/net/netaddr_multicast.c +++ b/bin/tests/net/netaddr_multicast.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: netaddr_multicast.c,v 1.6 2000/07/27 09:38:58 tale Exp $ */ +/* $Id: netaddr_multicast.c,v 1.7 2000/08/01 01:14:10 tale Exp $ */ #include diff --git a/bin/tests/net/sockaddr_multicast.c b/bin/tests/net/sockaddr_multicast.c index 324556e5eb..5c301af6a1 100644 --- a/bin/tests/net/sockaddr_multicast.c +++ b/bin/tests/net/sockaddr_multicast.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: sockaddr_multicast.c,v 1.3 2000/07/27 09:38:59 tale Exp $ */ +/* $Id: sockaddr_multicast.c,v 1.4 2000/08/01 01:14:12 tale Exp $ */ #include diff --git a/bin/tests/net/testsuite.h b/bin/tests/net/testsuite.h index e6317f3a06..513b49fc54 100644 --- a/bin/tests/net/testsuite.h +++ b/bin/tests/net/testsuite.h @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: testsuite.h,v 1.2 2000/07/27 09:39:00 tale Exp $ */ +/* $Id: testsuite.h,v 1.3 2000/08/01 01:14:13 tale Exp $ */ #define SUITENAME "net" diff --git a/bin/tests/nxtify.c b/bin/tests/nxtify.c index e55a7c9e0c..433be945be 100644 --- a/bin/tests/nxtify.c +++ b/bin/tests/nxtify.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: nxtify.c,v 1.14 2000/07/27 09:38:16 tale Exp $ */ +/* $Id: nxtify.c,v 1.15 2000/08/01 01:13:07 tale Exp $ */ #include diff --git a/bin/tests/omapi_test.c b/bin/tests/omapi_test.c index c55ec84e64..117596fe2d 100644 --- a/bin/tests/omapi_test.c +++ b/bin/tests/omapi_test.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1996-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 * 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 @@ -15,9 +15,9 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: omapi_test.c,v 1.26 2000/07/27 09:38:17 tale Exp $ */ +/* $Id: omapi_test.c,v 1.27 2000/08/01 01:13:09 tale Exp $ */ -/* +/* * Test code for OMAPI. */ #include @@ -598,7 +598,7 @@ do_listen(int port) { master_data.refcnt = 1; master_data.value = 2; master_data.target_reached = ISC_FALSE; - + LOCK(&mutex); /* @@ -667,10 +667,10 @@ main(int argc, char **argv) { else if (ARG_IS("badsig")) error_badsig = ISC_TRUE; - + else if (ARG_IS("unknownsig")) error_unknownsig = ISC_TRUE; - + else if (ARG_IS("denyall")) error_denyall = ISC_TRUE; else { diff --git a/bin/tests/printmsg.c b/bin/tests/printmsg.c index 4f7a4870fa..5ccc68a842 100644 --- a/bin/tests/printmsg.c +++ b/bin/tests/printmsg.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1998-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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: printmsg.c,v 1.22 2000/07/27 09:38:18 tale Exp $ */ +/* $Id: printmsg.c,v 1.23 2000/08/01 01:13:10 tale Exp $ */ #include @@ -79,7 +79,7 @@ printsection(dns_message_t *msg, dns_section_t sectionid, char t[4096]; isc_boolean_t first; isc_boolean_t no_rdata; - + if (sectionid == DNS_SECTION_QUESTION) no_rdata = ISC_TRUE; else @@ -129,7 +129,7 @@ printsection(dns_message_t *msg, dns_section_t sectionid, else if (result != ISC_R_SUCCESS) return (result); } - + return (ISC_R_SUCCESS); } diff --git a/bin/tests/printmsg.h b/bin/tests/printmsg.h index f444384bdd..af3459d984 100644 --- a/bin/tests/printmsg.h +++ b/bin/tests/printmsg.h @@ -1,10 +1,10 @@ /* * Copyright (C) 1998-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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: printmsg.h,v 1.7 2000/07/27 09:38:19 tale Exp $ */ +/* $Id: printmsg.h,v 1.8 2000/08/01 01:13:11 tale Exp $ */ #ifndef TEST_PRINTMSG_H #define TEST_PRINTMSG_H diff --git a/bin/tests/ratelimiter_test.c b/bin/tests/ratelimiter_test.c index d0579462a1..30a64e8f16 100644 --- a/bin/tests/ratelimiter_test.c +++ b/bin/tests/ratelimiter_test.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: ratelimiter_test.c,v 1.13 2000/07/27 09:38:21 tale Exp $ */ +/* $Id: ratelimiter_test.c,v 1.14 2000/08/01 01:13:12 tale Exp $ */ #include @@ -82,7 +82,7 @@ static void shutdown_rl(isc_task_t *task, isc_event_t *event) { UNUSED(task); UNUSED(event); - printf("shutdown ratelimiter\n"); + printf("shutdown ratelimiter\n"); isc_ratelimiter_shutdown(rlim); } @@ -109,7 +109,7 @@ main(int argc, char *argv[]) { isc_app_start(); isc_interval_set(&linterval, 1, 0); - + RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS); RUNTIME_CHECK(isc_taskmgr_create(mctx, 3, 0, &taskmgr) == ISC_R_SUCCESS); @@ -118,7 +118,7 @@ main(int argc, char *argv[]) { RUNTIME_CHECK(isc_task_create(taskmgr, 0, &g_task) == ISC_R_SUCCESS); - RUNTIME_CHECK(isc_ratelimiter_create(mctx, timermgr, g_task, + RUNTIME_CHECK(isc_ratelimiter_create(mctx, timermgr, g_task, &rlim) == ISC_R_SUCCESS); RUNTIME_CHECK(isc_ratelimiter_setinterval(rlim, &linterval) == @@ -142,12 +142,12 @@ main(int argc, char *argv[]) { isc_task_destroy(&g_task); isc_ratelimiter_detach(&rlim); - + isc_timermgr_destroy(&timermgr); isc_taskmgr_destroy(&taskmgr); isc_mem_stats(mctx, stdout); - + isc_app_finish(); return (0); } diff --git a/bin/tests/rbt/Makefile.in b/bin/tests/rbt/Makefile.in index 402fe07537..46a9434a2a 100644 --- a/bin/tests/rbt/Makefile.in +++ b/bin/tests/rbt/Makefile.in @@ -1,9 +1,9 @@ # Copyright (C) 1999, 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 # 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 @@ -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.15 2000/07/27 09:39:01 tale Exp $ +# $Id: Makefile.in,v 1.16 2000/08/01 01:14:14 tale Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/bin/tests/rbt/t_rbt.c b/bin/tests/rbt/t_rbt.c index ea2f4e952a..181f201226 100644 --- a/bin/tests/rbt/t_rbt.c +++ b/bin/tests/rbt/t_rbt.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1998-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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: t_rbt.c,v 1.20 2000/07/27 09:39:02 tale Exp $ */ +/* $Id: t_rbt.c,v 1.21 2000/08/01 01:14:15 tale Exp $ */ #include @@ -130,10 +130,10 @@ create_name(char *s, isc_mem_t *mctx, dns_name_t **dns_name) { if (s && *s) { length = strlen(s); - + isc_buffer_init(&source, s, length); isc_buffer_add(&source, length); - + /* * The buffer for the actual name will immediately follow the * name structure. @@ -143,13 +143,13 @@ create_name(char *s, isc_mem_t *mctx, dns_name_t **dns_name) { t_info("isc_mem_get failed\n"); ++nfails; } - + dns_name_init(*dns_name, NULL); isc_buffer_init(&target, *dns_name + 1, DNSNAMELEN); - + result = dns_name_fromtext(*dns_name, &source, dns_rootname, ISC_FALSE, &target); - + if (result != ISC_R_SUCCESS) { ++nfails; t_info("dns_name_fromtext(%s) failed %s\n", @@ -330,7 +330,7 @@ test_rbt_gen(char *filename, char *command, char *testname, isc_mem_destroy(&mctx); return(result); } - + /* * Now try the database command. */ @@ -894,7 +894,7 @@ t_dns_rbtnodechain_init(char *dbfile, char *findname, result = T_FAIL; else result = T_PASS; - + dns_rbtnodechain_invalidate(&chain); dns_rbt_destroy(&rbt); @@ -1043,7 +1043,7 @@ t_dns_rbtnodechain_first(char *dbfile, char *expected_firstname, t_info("testing for next name of %s, origin of %s\n", expected_nextname, expected_nextorigin); - + if ((dns_result != ISC_R_SUCCESS) && (dns_result != DNS_R_NEWORIGIN)) { t_info("dns_rbtnodechain_next unexpectedly returned %s\n", dns_result_totext(dns_result)); @@ -1059,7 +1059,7 @@ t_dns_rbtnodechain_first(char *dbfile, char *expected_firstname, result = T_FAIL; else result = T_PASS; - + dns_rbtnodechain_invalidate(&chain); dns_rbt_destroy(&rbt); @@ -1226,7 +1226,7 @@ t_dns_rbtnodechain_last(char *dbfile, char *expected_lastname, result = T_FAIL; else result = T_PASS; - + dns_rbtnodechain_invalidate(&chain); dns_rbt_destroy(&rbt); @@ -1408,7 +1408,7 @@ t_dns_rbtnodechain_next(char *dbfile, char *findname, result = T_FAIL; else result = T_PASS; - + dns_rbtnodechain_invalidate(&chain); dns_rbt_destroy(&rbt); @@ -1589,7 +1589,7 @@ t_dns_rbtnodechain_prev(char *dbfile, char *findname, char *prevname, result = T_FAIL; else result = T_PASS; - + dns_rbtnodechain_invalidate(&chain); dns_rbt_destroy(&rbt); diff --git a/bin/tests/rbt_test.c b/bin/tests/rbt_test.c index f326d654f4..284e552988 100644 --- a/bin/tests/rbt_test.c +++ b/bin/tests/rbt_test.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rbt_test.c,v 1.38 2000/07/31 23:27:22 tale Exp $ */ +/* $Id: rbt_test.c,v 1.39 2000/08/01 01:13:14 tale Exp $ */ #include @@ -210,7 +210,7 @@ iterate(dns_rbt_t *rbt, isc_boolean_t forward) { if (forward) { printf("iterating forward\n" ); move = dns_rbtnodechain_next; - + result = dns_rbtnodechain_first(&chain, rbt, &foundname, origin); @@ -447,7 +447,7 @@ main(int argc, char **argv) { } } - + } dns_rbt_destroy(&rbt); diff --git a/bin/tests/rbt_test.txt b/bin/tests/rbt_test.txt index 401e771d1f..b007f014e5 100644 --- a/bin/tests/rbt_test.txt +++ b/bin/tests/rbt_test.txt @@ -1,9 +1,9 @@ # Copyright (C) 1999, 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 # 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 @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: rbt_test.txt,v 1.10 2000/07/27 09:38:23 tale Exp $ +# $Id: rbt_test.txt,v 1.11 2000/08/01 01:13:15 tale Exp $ add a.vix.com add b.vix.com diff --git a/bin/tests/rdata_test.c b/bin/tests/rdata_test.c index d56fb86d15..47d8b1d5ec 100644 --- a/bin/tests/rdata_test.c +++ b/bin/tests/rdata_test.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1998-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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rdata_test.c,v 1.30 2000/07/27 09:38:24 tale Exp $ */ +/* $Id: rdata_test.c,v 1.31 2000/08/01 01:13:16 tale Exp $ */ #include @@ -866,7 +866,7 @@ main(int argc, char *argv[]) { } if (token.type == isc_tokentype_eof) break; - + /* * Get type. */ diff --git a/bin/tests/resolv.conf.sample b/bin/tests/resolv.conf.sample index e70bf3a819..fb17a19560 100644 --- a/bin/tests/resolv.conf.sample +++ b/bin/tests/resolv.conf.sample @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: resolv.conf.sample,v 1.5 2000/07/27 09:38:25 tale Exp $ */ +/* $Id: resolv.conf.sample,v 1.6 2000/08/01 01:13:17 tale Exp $ */ domain jab.fr nameserver 194.150.1.2 ; ignore that diff --git a/bin/tests/rwlock_test.c b/bin/tests/rwlock_test.c index f69c484223..5f1fb358a8 100644 --- a/bin/tests/rwlock_test.c +++ b/bin/tests/rwlock_test.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1998-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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rwlock_test.c,v 1.17 2000/07/27 09:38:26 tale Exp $ */ +/* $Id: rwlock_test.c,v 1.18 2000/08/01 01:13:18 tale Exp $ */ #include diff --git a/bin/tests/serial_test.c b/bin/tests/serial_test.c index da1c7b3c87..cc89ff4edd 100644 --- a/bin/tests/serial_test.c +++ b/bin/tests/serial_test.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: serial_test.c,v 1.8 2000/07/27 09:38:27 tale Exp $ */ +/* $Id: serial_test.c,v 1.9 2000/08/01 01:13:19 tale Exp $ */ #include diff --git a/bin/tests/shutdown_test.c b/bin/tests/shutdown_test.c index 402242373f..6ea32e7c5d 100644 --- a/bin/tests/shutdown_test.c +++ b/bin/tests/shutdown_test.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1998-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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: shutdown_test.c,v 1.15 2000/07/27 09:38:28 tale Exp $ */ +/* $Id: shutdown_test.c,v 1.16 2000/08/01 01:13:20 tale Exp $ */ #include @@ -51,7 +51,7 @@ static isc_timermgr_t * timer_manager; static void t1_shutdown(isc_task_t *task, isc_event_t *event) { t_info *info = event->ev_arg; - + printf("task %s (%p) t1_shutdown\n", info->name, task); isc_task_detach(&info->task); isc_event_free(&event); @@ -217,7 +217,7 @@ main(int argc, char *argv[]) { isc_taskmgr_destroy(&task_manager); isc_timermgr_destroy(&timer_manager); - + printf("Statistics for mctx:\n"); isc_mem_stats(mctx, stdout); isc_mem_destroy(&mctx); diff --git a/bin/tests/sock_test.c b/bin/tests/sock_test.c index 00dfb17ba3..8aeb383fc2 100644 --- a/bin/tests/sock_test.c +++ b/bin/tests/sock_test.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1998-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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: sock_test.c,v 1.44 2000/07/27 09:38:30 tale Exp $ */ +/* $Id: sock_test.c,v 1.45 2000/08/01 01:13:21 tale Exp $ */ #include diff --git a/bin/tests/sockaddr/Makefile.in b/bin/tests/sockaddr/Makefile.in index 146dcececd..dbab4a0edf 100644 --- a/bin/tests/sockaddr/Makefile.in +++ b/bin/tests/sockaddr/Makefile.in @@ -1,9 +1,9 @@ # Copyright (C) 1999, 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 # 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 @@ -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.10 2000/07/27 09:39:04 tale Exp $ +# $Id: Makefile.in,v 1.11 2000/08/01 01:14:16 tale Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -32,7 +32,7 @@ TAPIDEPLIBS = ../../../lib/tests/libt_api.@A@ ISCDEPLIBS = ../../../lib/isc/libisc.@A@ TAPILIBS = ../../../lib/tests/libt_api.@A@ -DEPLIBS = ${TAPIDEPLIBS} ${ISCDEPLIBS} +DEPLIBS = ${TAPIDEPLIBS} ${ISCDEPLIBS} LIBS = ${TAPILIBS} ${ISCLIBS} @LIBS@ diff --git a/bin/tests/sockaddr/t_sockaddr.c b/bin/tests/sockaddr/t_sockaddr.c index d8221acc01..f368bff3e2 100644 --- a/bin/tests/sockaddr/t_sockaddr.c +++ b/bin/tests/sockaddr/t_sockaddr.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: t_sockaddr.c,v 1.9 2000/07/27 09:39:05 tale Exp $ */ +/* $Id: t_sockaddr.c,v 1.10 2000/08/01 01:14:17 tale Exp $ */ #include @@ -29,11 +29,11 @@ static int test_isc_sockaddr_eqaddrprefix(void) { struct in_addr ina_a; struct in_addr ina_b; - struct in_addr ina_c; + struct in_addr ina_c; isc_sockaddr_t isa_a; isc_sockaddr_t isa_b; isc_sockaddr_t isa_c; - + if (inet_pton(AF_INET, "194.100.32.87", &ina_a) < 0) return T_FAIL; if (inet_pton(AF_INET, "194.100.32.80", &ina_b) < 0) @@ -76,13 +76,13 @@ test_isc_netaddr_masktoprefixlen(void) { struct in_addr na_a; struct in_addr na_b; struct in_addr na_c; - struct in_addr na_d; + struct in_addr na_d; isc_netaddr_t ina_a; isc_netaddr_t ina_b; isc_netaddr_t ina_c; - isc_netaddr_t ina_d; + isc_netaddr_t ina_d; unsigned int plen; - + if (inet_pton(AF_INET, "0.0.0.0", &na_a) < 0) return T_FAIL; if (inet_pton(AF_INET, "255.255.255.254", &na_b) < 0) @@ -128,7 +128,7 @@ t2(void) { result = test_isc_netaddr_masktoprefixlen(); t_result(result); } - + testspec_t T_testlist[] = { { t1, "isc_sockaddr_eqaddrprefix" }, { t2, "isc_netaddr_masktoprefixlen" }, diff --git a/bin/tests/sym_test.c b/bin/tests/sym_test.c index 1321b29608..37a366ddb7 100644 --- a/bin/tests/sym_test.c +++ b/bin/tests/sym_test.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1998-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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: sym_test.c,v 1.19 2000/07/27 09:38:31 tale Exp $ */ +/* $Id: sym_test.c,v 1.20 2000/08/01 01:13:23 tale Exp $ */ #include @@ -110,7 +110,7 @@ main(int argc, char *argv[]) { key, cp, isc_result_totext(result)); if (result != ISC_R_SUCCESS) - undefine_action(key, 1, + undefine_action(key, 1, value, NULL); } } diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in index bd4cbca1d9..63137a47fc 100644 --- a/bin/tests/system/Makefile.in +++ b/bin/tests/system/Makefile.in @@ -1,9 +1,9 @@ # 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 # 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 @@ -13,11 +13,11 @@ # 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 2000/07/28 01:37:05 gson Exp $ +# $Id: Makefile.in,v 1.20 2000/08/01 01:14:19 tale Exp $ @BIND9_INCLUDES@ SUBDIRS = lwresd -TARGETS = +TARGETS = @BIND9_MAKE_RULES@ diff --git a/bin/tests/system/cleanall.sh b/bin/tests/system/cleanall.sh index 65592ab96f..5e87dc32bc 100644 --- a/bin/tests/system/cleanall.sh +++ b/bin/tests/system/cleanall.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: cleanall.sh,v 1.4 2000/07/27 09:39:07 tale Exp $ +# $Id: cleanall.sh,v 1.5 2000/08/01 01:14:20 tale Exp $ # # Clean up after system tests. diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in index dc2a91b630..98a90da064 100644 --- a/bin/tests/system/conf.sh.in +++ b/bin/tests/system/conf.sh.in @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -15,9 +15,9 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: conf.sh.in,v 1.11 2000/07/27 09:39:08 tale Exp $ +# $Id: conf.sh.in,v 1.12 2000/08/01 01:14:21 tale Exp $ -# +# # Common configuration data for system tests, to be sourced into # other shell scripts. # diff --git a/bin/tests/system/digcomp.pl b/bin/tests/system/digcomp.pl index 63554272f9..2067957921 100644 --- a/bin/tests/system/digcomp.pl +++ b/bin/tests/system/digcomp.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: digcomp.pl,v 1.9 2000/07/27 09:39:10 tale Exp $ +# $Id: digcomp.pl,v 1.10 2000/08/01 01:14:22 tale Exp $ # Compare two files, each with the output from dig, for differences. # Ignore "unimportant" differences, like ordering of NS lines, TTL's, diff --git a/bin/tests/system/dnssec/clean.sh b/bin/tests/system/dnssec/clean.sh index f5fc0148b1..a4b904c9aa 100644 --- a/bin/tests/system/dnssec/clean.sh +++ b/bin/tests/system/dnssec/clean.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -15,10 +15,10 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.7 2000/07/31 15:28:15 bwelling Exp $ +# $Id: clean.sh,v 1.8 2000/08/01 01:14:31 tale Exp $ rm -f */K* */keyset-* */signedkey-* */*.signed */trusted.conf rm -f ns1/root.db ns2/example.db ns3/secure.example.db rm -f ns3/unsecure.example.db ns3/bogus.example.db -rm -f dig.out.* +rm -f dig.out.* diff --git a/bin/tests/system/dnssec/ns1/named.conf b/bin/tests/system/dnssec/ns1/named.conf index 26e0416046..c25fba41ee 100644 --- a/bin/tests/system/dnssec/ns1/named.conf +++ b/bin/tests/system/dnssec/ns1/named.conf @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.10 2000/07/27 09:39:22 tale Exp $ */ +/* $Id: named.conf,v 1.11 2000/08/01 01:14:35 tale Exp $ */ // NS1 diff --git a/bin/tests/system/dnssec/ns1/root.db.in b/bin/tests/system/dnssec/ns1/root.db.in index 4c4d2dbedc..2ff50fb081 100644 --- a/bin/tests/system/dnssec/ns1/root.db.in +++ b/bin/tests/system/dnssec/ns1/root.db.in @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,13 +13,13 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: root.db.in,v 1.4 2000/07/27 09:39:23 tale Exp $ +; $Id: root.db.in,v 1.5 2000/08/01 01:14:36 tale Exp $ $TTL 300 . IN SOA gson.nominum.com. a.root.servers.nil. ( 2000042100 ; serial 600 ; refresh - 600 ; retry + 600 ; retry 1200 ; expire 600 ; minimum ) diff --git a/bin/tests/system/dnssec/ns1/sign.sh b/bin/tests/system/dnssec/ns1/sign.sh index 6de7032df5..ed52a9c4e5 100644 --- a/bin/tests/system/dnssec/ns1/sign.sh +++ b/bin/tests/system/dnssec/ns1/sign.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -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.9 2000/07/31 15:28:16 bwelling Exp $ +# $Id: sign.sh,v 1.10 2000/08/01 01:14:37 tale Exp $ SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/dnssec/ns2/example.db.in b/bin/tests/system/dnssec/ns2/example.db.in index 57fb5eea95..2c34792567 100644 --- a/bin/tests/system/dnssec/ns2/example.db.in +++ b/bin/tests/system/dnssec/ns2/example.db.in @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: example.db.in,v 1.5 2000/07/27 09:39:26 tale Exp $ +; $Id: example.db.in,v 1.6 2000/08/01 01:14:38 tale Exp $ $TTL 300 ; 5 minutes @ IN SOA mname1. . ( diff --git a/bin/tests/system/dnssec/ns2/insecure.secure.example.db b/bin/tests/system/dnssec/ns2/insecure.secure.example.db index 4af9b38b33..bc42ce31c4 100644 --- a/bin/tests/system/dnssec/ns2/insecure.secure.example.db +++ b/bin/tests/system/dnssec/ns2/insecure.secure.example.db @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: insecure.secure.example.db,v 1.4 2000/07/27 09:39:27 tale Exp $ +; $Id: insecure.secure.example.db,v 1.5 2000/08/01 01:14:39 tale Exp $ $TTL 300 ; 5 minutes @ IN SOA mname1. . ( diff --git a/bin/tests/system/dnssec/ns2/named.conf b/bin/tests/system/dnssec/ns2/named.conf index c90c5f7ec4..a610512b64 100644 --- a/bin/tests/system/dnssec/ns2/named.conf +++ b/bin/tests/system/dnssec/ns2/named.conf @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.11 2000/07/27 09:39:28 tale Exp $ */ +/* $Id: named.conf,v 1.12 2000/08/01 01:14:40 tale Exp $ */ // NS2 diff --git a/bin/tests/system/dnssec/ns2/private.secure.example.db.in b/bin/tests/system/dnssec/ns2/private.secure.example.db.in index 75a68d253f..bb2119a7bf 100644 --- a/bin/tests/system/dnssec/ns2/private.secure.example.db.in +++ b/bin/tests/system/dnssec/ns2/private.secure.example.db.in @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: private.secure.example.db.in,v 1.4 2000/07/27 09:39:29 tale Exp $ +; $Id: private.secure.example.db.in,v 1.5 2000/08/01 01:14:41 tale Exp $ $TTL 300 ; 5 minutes @ IN SOA mname1. . ( diff --git a/bin/tests/system/dnssec/ns2/root.hint b/bin/tests/system/dnssec/ns2/root.hint index 18a9bd8fa6..d4d6b3ffbe 100644 --- a/bin/tests/system/dnssec/ns2/root.hint +++ b/bin/tests/system/dnssec/ns2/root.hint @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: root.hint,v 1.4 2000/07/27 09:39:30 tale Exp $ +; $Id: root.hint,v 1.5 2000/08/01 01:14:42 tale Exp $ $TTL 999999 . IN NS a.root-servers.nil. diff --git a/bin/tests/system/dnssec/ns2/sign.sh b/bin/tests/system/dnssec/ns2/sign.sh index 2d219fae0d..8df367a7b5 100644 --- a/bin/tests/system/dnssec/ns2/sign.sh +++ b/bin/tests/system/dnssec/ns2/sign.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -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.12 2000/07/31 15:28:18 bwelling Exp $ +# $Id: sign.sh,v 1.13 2000/08/01 01:14:43 tale Exp $ SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/dnssec/ns3/bogus.example.db.in b/bin/tests/system/dnssec/ns3/bogus.example.db.in index 5546e155c2..ecaffd9a8a 100644 --- a/bin/tests/system/dnssec/ns3/bogus.example.db.in +++ b/bin/tests/system/dnssec/ns3/bogus.example.db.in @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: bogus.example.db.in,v 1.4 2000/07/27 09:39:32 tale Exp $ +; $Id: bogus.example.db.in,v 1.5 2000/08/01 01:14:45 tale Exp $ $TTL 300 ; 5 minutes @ IN SOA mname1. . ( diff --git a/bin/tests/system/dnssec/ns3/insecure.example.db b/bin/tests/system/dnssec/ns3/insecure.example.db index b892ea07be..cebdd2673f 100644 --- a/bin/tests/system/dnssec/ns3/insecure.example.db +++ b/bin/tests/system/dnssec/ns3/insecure.example.db @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: insecure.example.db,v 1.4 2000/07/27 09:39:34 tale Exp $ +; $Id: insecure.example.db,v 1.5 2000/08/01 01:14:46 tale Exp $ $TTL 300 ; 5 minutes @ IN SOA mname1. . ( diff --git a/bin/tests/system/dnssec/ns3/named.conf b/bin/tests/system/dnssec/ns3/named.conf index 7e89f01e95..6ba899a30c 100644 --- a/bin/tests/system/dnssec/ns3/named.conf +++ b/bin/tests/system/dnssec/ns3/named.conf @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.12 2000/07/27 09:39:35 tale Exp $ */ +/* $Id: named.conf,v 1.13 2000/08/01 01:14:47 tale Exp $ */ // NS3 diff --git a/bin/tests/system/dnssec/ns3/root.hint b/bin/tests/system/dnssec/ns3/root.hint index 2b7e0fbdc3..057968ac28 100644 --- a/bin/tests/system/dnssec/ns3/root.hint +++ b/bin/tests/system/dnssec/ns3/root.hint @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: root.hint,v 1.4 2000/07/27 09:39:36 tale Exp $ +; $Id: root.hint,v 1.5 2000/08/01 01:14:48 tale Exp $ $TTL 999999 . IN NS a.root-servers.nil. diff --git a/bin/tests/system/dnssec/ns3/secure.example.db.in b/bin/tests/system/dnssec/ns3/secure.example.db.in index 83d51a7a6b..16884622f9 100644 --- a/bin/tests/system/dnssec/ns3/secure.example.db.in +++ b/bin/tests/system/dnssec/ns3/secure.example.db.in @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: secure.example.db.in,v 1.6 2000/07/27 09:39:37 tale Exp $ +; $Id: secure.example.db.in,v 1.7 2000/08/01 01:14:49 tale Exp $ $TTL 300 ; 5 minutes @ IN SOA mname1. . ( diff --git a/bin/tests/system/dnssec/ns3/sign.sh b/bin/tests/system/dnssec/ns3/sign.sh index 2d9ac72b56..27e1d67cc1 100644 --- a/bin/tests/system/dnssec/ns3/sign.sh +++ b/bin/tests/system/dnssec/ns3/sign.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -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.9 2000/07/27 09:39:38 tale Exp $ +# $Id: sign.sh,v 1.10 2000/08/01 01:14:50 tale Exp $ RANDFILE=../random.data diff --git a/bin/tests/system/dnssec/ns4/named.conf b/bin/tests/system/dnssec/ns4/named.conf index de2484a0e8..f2e848ca24 100644 --- a/bin/tests/system/dnssec/ns4/named.conf +++ b/bin/tests/system/dnssec/ns4/named.conf @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.11 2000/07/27 09:39:39 tale Exp $ */ +/* $Id: named.conf,v 1.12 2000/08/01 01:14:51 tale Exp $ */ // NS4 diff --git a/bin/tests/system/dnssec/ns4/root.hint b/bin/tests/system/dnssec/ns4/root.hint index 57a953c2bf..ac351dc5f4 100644 --- a/bin/tests/system/dnssec/ns4/root.hint +++ b/bin/tests/system/dnssec/ns4/root.hint @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: root.hint,v 1.4 2000/07/27 09:39:40 tale Exp $ +; $Id: root.hint,v 1.5 2000/08/01 01:14:53 tale Exp $ $TTL 999999 . IN NS a.root-servers.nil. diff --git a/bin/tests/system/dnssec/ns5/named.conf b/bin/tests/system/dnssec/ns5/named.conf index c5d31c9ff9..d281f60a72 100644 --- a/bin/tests/system/dnssec/ns5/named.conf +++ b/bin/tests/system/dnssec/ns5/named.conf @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.9 2000/07/27 09:39:42 tale Exp $ */ +/* $Id: named.conf,v 1.10 2000/08/01 01:14:54 tale Exp $ */ // NS5 diff --git a/bin/tests/system/dnssec/ns5/root.hint b/bin/tests/system/dnssec/ns5/root.hint index 52e3b9bf37..31829a022a 100644 --- a/bin/tests/system/dnssec/ns5/root.hint +++ b/bin/tests/system/dnssec/ns5/root.hint @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: root.hint,v 1.4 2000/07/27 09:39:43 tale Exp $ +; $Id: root.hint,v 1.5 2000/08/01 01:14:55 tale Exp $ $TTL 999999 . IN NS a.root-servers.nil. diff --git a/bin/tests/system/dnssec/ns5/trusted.conf.bad b/bin/tests/system/dnssec/ns5/trusted.conf.bad index d1cfe72a76..863f698783 100644 --- a/bin/tests/system/dnssec/ns5/trusted.conf.bad +++ b/bin/tests/system/dnssec/ns5/trusted.conf.bad @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: trusted.conf.bad,v 1.4 2000/07/27 09:39:44 tale Exp $ */ +/* $Id: trusted.conf.bad,v 1.5 2000/08/01 01:14:56 tale Exp $ */ trusted-keys { "." 256 3 1 "AQO6Cl+slAf+iuieDim9L3kujFHQD7s/IOj03ClMOpKYcTXtK4mRpuULVfvWxDi9Ew/gj0xLnnX7z9OJHIxLI+DSrAHd8Dm0XfBEAtVtJSn70GaPZgnLMw1rk5ap2DsEoWk="; diff --git a/bin/tests/system/dnssec/setup.sh b/bin/tests/system/dnssec/setup.sh index 52e655c496..3a527ff14d 100644 --- a/bin/tests/system/dnssec/setup.sh +++ b/bin/tests/system/dnssec/setup.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.7 2000/07/27 09:39:20 tale Exp $ +# $Id: setup.sh,v 1.8 2000/08/01 01:14:32 tale Exp $ cd ns1 && sh sign.sh diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh index 5c5bd417f5..50c5ceb45e 100644 --- a/bin/tests/system/dnssec/tests.sh +++ b/bin/tests/system/dnssec/tests.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.24 2000/07/27 23:22:35 bwelling Exp $ +# $Id: tests.sh,v 1.25 2000/08/01 01:14:33 tale Exp $ # # Perform tests diff --git a/bin/tests/system/glue/clean.sh b/bin/tests/system/glue/clean.sh index a540e1b80c..a7ef9b146d 100644 --- a/bin/tests/system/glue/clean.sh +++ b/bin/tests/system/glue/clean.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.2 2000/07/27 09:39:45 tale Exp $ +# $Id: clean.sh,v 1.3 2000/08/01 01:14:57 tale Exp $ # # Clean up after glue tests. diff --git a/bin/tests/system/glue/ns1/cache b/bin/tests/system/glue/ns1/cache index 2bcf3681cd..53952749a0 100644 --- a/bin/tests/system/glue/ns1/cache +++ b/bin/tests/system/glue/ns1/cache @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: cache,v 1.2 2000/07/27 09:39:48 tale Exp $ +; $Id: cache,v 1.3 2000/08/01 01:15:00 tale Exp $ ; Preloaded cache data for glue test diff --git a/bin/tests/system/glue/ns1/mil.db b/bin/tests/system/glue/ns1/mil.db index 5ca144492d..eab23582af 100644 --- a/bin/tests/system/glue/ns1/mil.db +++ b/bin/tests/system/glue/ns1/mil.db @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,14 +13,14 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: mil.db,v 1.3 2000/07/27 09:39:49 tale Exp $ +; $Id: mil.db,v 1.4 2000/08/01 01:15:01 tale Exp $ $ORIGIN mil. $TTL 300 @ IN SOA gson.nominum.com. a.root.servers.nil. ( 2000042100 ; serial 600 ; refresh - 600 ; retry + 600 ; retry 1200 ; expire 600 ; minimum ) diff --git a/bin/tests/system/glue/ns1/named.conf b/bin/tests/system/glue/ns1/named.conf index 4bf0ce202b..bc6acf5b9d 100644 --- a/bin/tests/system/glue/ns1/named.conf +++ b/bin/tests/system/glue/ns1/named.conf @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.2 2000/07/27 09:39:50 tale Exp $ */ +/* $Id: named.conf,v 1.3 2000/08/01 01:15:02 tale Exp $ */ options { query-source address 10.53.0.1; diff --git a/bin/tests/system/glue/ns1/net.db b/bin/tests/system/glue/ns1/net.db index c089167fa3..c2c04b2417 100644 --- a/bin/tests/system/glue/ns1/net.db +++ b/bin/tests/system/glue/ns1/net.db @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,14 +13,14 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: net.db,v 1.3 2000/07/27 09:39:51 tale Exp $ +; $Id: net.db,v 1.4 2000/08/01 01:15:05 tale Exp $ $ORIGIN net. $TTL 300 @ IN SOA gson.nominum.com. a.root.servers.nil. ( 2000042100 ; serial 600 ; refresh - 600 ; retry + 600 ; retry 1200 ; expire 600 ; minimum ) diff --git a/bin/tests/system/glue/ns1/root-servers.nil.db b/bin/tests/system/glue/ns1/root-servers.nil.db index 9debe2b36b..1d25de1545 100644 --- a/bin/tests/system/glue/ns1/root-servers.nil.db +++ b/bin/tests/system/glue/ns1/root-servers.nil.db @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,15 +13,15 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: root-servers.nil.db,v 1.2 2000/07/27 09:39:52 tale Exp $ +; $Id: root-servers.nil.db,v 1.3 2000/08/01 01:15:06 tale Exp $ $TTL 300 @ IN SOA ns hostmaster ( 1 3600 1800 - 1814400 - 3600 + 1814400 + 3600 ) NS a a A 10.53.0.1 diff --git a/bin/tests/system/glue/ns1/root.db b/bin/tests/system/glue/ns1/root.db index 05942d1cb4..4878732b62 100644 --- a/bin/tests/system/glue/ns1/root.db +++ b/bin/tests/system/glue/ns1/root.db @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,13 +13,13 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: root.db,v 1.2 2000/07/27 09:39:53 tale Exp $ +; $Id: root.db,v 1.3 2000/08/01 01:15:07 tale Exp $ $TTL 300 . IN SOA gson.nominum.com. a.root.servers.nil. ( 2000042100 ; serial 600 ; refresh - 600 ; retry + 600 ; retry 1200 ; expire 600 ; minimum ) diff --git a/bin/tests/system/glue/tests.sh b/bin/tests/system/glue/tests.sh index d03cba8957..f5042eba29 100644 --- a/bin/tests/system/glue/tests.sh +++ b/bin/tests/system/glue/tests.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.3 2000/07/27 09:39:46 tale Exp $ +# $Id: tests.sh,v 1.4 2000/08/01 01:14:58 tale Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/ifconfig.sh b/bin/tests/system/ifconfig.sh index 2ffd54a0ed..61a75d56a4 100644 --- a/bin/tests/system/ifconfig.sh +++ b/bin/tests/system/ifconfig.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: ifconfig.sh,v 1.19 2000/07/27 09:39:11 tale Exp $ +# $Id: ifconfig.sh,v 1.20 2000/08/01 01:14:23 tale Exp $ # # Set up interface aliases for bind9 system tests. @@ -36,7 +36,7 @@ case "$1" in 'start') for ns in 1 2 3 4 5 do - case "$sys" in + case "$sys" in *-sun-solaris2.[6-7]) ifconfig lo0:$ns 10.53.0.$ns up ;; @@ -87,7 +87,7 @@ case "$1" in 'stop') for ns in 5 4 3 2 1 do - case "$sys" in + case "$sys" in *-sun-solaris2.[6-7]) ifconfig lo0:$ns 10.53.0.$ns down ;; @@ -132,7 +132,7 @@ case "$1" in exit 1 esac done - + ;; *) diff --git a/bin/tests/system/limits/clean.sh b/bin/tests/system/limits/clean.sh index 70a4729c02..86bf7a5166 100644 --- a/bin/tests/system/limits/clean.sh +++ b/bin/tests/system/limits/clean.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.4 2000/07/27 09:39:54 tale Exp $ +# $Id: clean.sh,v 1.5 2000/08/01 01:15:11 tale Exp $ # # Clean up after limits tests. diff --git a/bin/tests/system/limits/knowngood.dig.out.1000 b/bin/tests/system/limits/knowngood.dig.out.1000 index 805eff1a79..3b7e01ae85 100644 --- a/bin/tests/system/limits/knowngood.dig.out.1000 +++ b/bin/tests/system/limits/knowngood.dig.out.1000 @@ -1,5 +1,5 @@ -; <<>> DiG 8.2 <<>> 1000.example. @10.53.0.1 a -p +; <<>> DiG 8.2 <<>> 1000.example. @10.53.0.1 a -p ; (1 server found) ;; res options: init recurs defnam dnsrch ;; got answer: diff --git a/bin/tests/system/limits/knowngood.dig.out.2000 b/bin/tests/system/limits/knowngood.dig.out.2000 index 2a2d66a5d4..96c9181b50 100644 --- a/bin/tests/system/limits/knowngood.dig.out.2000 +++ b/bin/tests/system/limits/knowngood.dig.out.2000 @@ -1,5 +1,5 @@ -; <<>> DiG 8.2 <<>> 2000.example. @10.53.0.1 a -p +; <<>> DiG 8.2 <<>> 2000.example. @10.53.0.1 a -p ; (1 server found) ;; res options: init recurs defnam dnsrch ;; got answer: diff --git a/bin/tests/system/limits/knowngood.dig.out.3000 b/bin/tests/system/limits/knowngood.dig.out.3000 index 415c4d6adb..19324758ac 100644 --- a/bin/tests/system/limits/knowngood.dig.out.3000 +++ b/bin/tests/system/limits/knowngood.dig.out.3000 @@ -1,5 +1,5 @@ -; <<>> DiG 8.2 <<>> 3000.example. @10.53.0.1 a -p +; <<>> DiG 8.2 <<>> 3000.example. @10.53.0.1 a -p ; (1 server found) ;; res options: init recurs defnam dnsrch ;; got answer: diff --git a/bin/tests/system/limits/knowngood.dig.out.4000 b/bin/tests/system/limits/knowngood.dig.out.4000 index f49bec316d..8b109c806f 100644 --- a/bin/tests/system/limits/knowngood.dig.out.4000 +++ b/bin/tests/system/limits/knowngood.dig.out.4000 @@ -1,5 +1,5 @@ -; <<>> DiG 8.2 <<>> 4000.example. @10.53.0.1 a -p +; <<>> DiG 8.2 <<>> 4000.example. @10.53.0.1 a -p ; (1 server found) ;; res options: init recurs defnam dnsrch ;; got answer: diff --git a/bin/tests/system/limits/knowngood.dig.out.a-maximum-rrset b/bin/tests/system/limits/knowngood.dig.out.a-maximum-rrset index d7d0b7cc6e..1688e83d15 100644 --- a/bin/tests/system/limits/knowngood.dig.out.a-maximum-rrset +++ b/bin/tests/system/limits/knowngood.dig.out.a-maximum-rrset @@ -1,5 +1,5 @@ -; <<>> DiG 8.2 <<>> a-maximum-rrset.example. @10.53.0.1 a -p +; <<>> DiG 8.2 <<>> a-maximum-rrset.example. @10.53.0.1 a -p ; (1 server found) ;; res options: init recurs defnam dnsrch ;; got answer: diff --git a/bin/tests/system/limits/ns1/example.db b/bin/tests/system/limits/ns1/example.db index 5b38b9883f..5389924b26 100644 --- a/bin/tests/system/limits/ns1/example.db +++ b/bin/tests/system/limits/ns1/example.db @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: example.db,v 1.5 2000/07/27 09:39:57 tale Exp $ +; $Id: example.db,v 1.6 2000/08/01 01:15:30 tale Exp $ $TTL 300 ; 5 minutes @ IN SOA ns1.example. hostmaster.example. ( diff --git a/bin/tests/system/limits/ns1/named.conf b/bin/tests/system/limits/ns1/named.conf index 2461bacce3..d1b57a58ea 100644 --- a/bin/tests/system/limits/ns1/named.conf +++ b/bin/tests/system/limits/ns1/named.conf @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.4 2000/07/27 09:39:58 tale Exp $ */ +/* $Id: named.conf,v 1.5 2000/08/01 01:15:33 tale Exp $ */ options { query-source address 10.53.0.1; diff --git a/bin/tests/system/limits/ns1/root.db b/bin/tests/system/limits/ns1/root.db index eda0dcee9d..a32a3f19b0 100644 --- a/bin/tests/system/limits/ns1/root.db +++ b/bin/tests/system/limits/ns1/root.db @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,13 +13,13 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: root.db,v 1.4 2000/07/27 09:39:59 tale Exp $ +; $Id: root.db,v 1.5 2000/08/01 01:15:34 tale Exp $ $TTL 300 . IN SOA gson.nominum.com. a.root.servers.nil. ( 2000042100 ; serial 600 ; refresh - 600 ; retry + 600 ; retry 1200 ; expire 600 ; minimum ) diff --git a/bin/tests/system/limits/tests.sh b/bin/tests/system/limits/tests.sh index 128080e69c..d34ca3e3a0 100644 --- a/bin/tests/system/limits/tests.sh +++ b/bin/tests/system/limits/tests.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.8 2000/07/27 09:39:55 tale Exp $ +# $Id: tests.sh,v 1.9 2000/08/01 01:15:26 tale Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/lwresd/Makefile.in b/bin/tests/system/lwresd/Makefile.in index 3ede7d75f5..d14d3fc473 100644 --- a/bin/tests/system/lwresd/Makefile.in +++ b/bin/tests/system/lwresd/Makefile.in @@ -1,9 +1,9 @@ # 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 # 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 @@ -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.6 2000/07/27 09:40:00 tale Exp $ +# $Id: Makefile.in,v 1.7 2000/08/01 01:15:35 tale Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/bin/tests/system/lwresd/lwresd1/resolv.conf b/bin/tests/system/lwresd/lwresd1/resolv.conf index dd25a253c4..cd94bff23a 100644 --- a/bin/tests/system/lwresd/lwresd1/resolv.conf +++ b/bin/tests/system/lwresd/lwresd1/resolv.conf @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: resolv.conf,v 1.4 2000/07/27 09:40:05 tale Exp $ */ +/* $Id: resolv.conf,v 1.5 2000/08/01 01:15:41 tale Exp $ */ nameserver 10.53.0.1 search example1. diff --git a/bin/tests/system/lwresd/lwtest.c b/bin/tests/system/lwresd/lwtest.c index 89ca937ffc..b501e04962 100644 --- a/bin/tests/system/lwresd/lwtest.c +++ b/bin/tests/system/lwresd/lwtest.c @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lwtest.c,v 1.12 2000/07/28 03:31:25 tale Exp $ */ +/* $Id: lwtest.c,v 1.13 2000/08/01 01:15:37 tale Exp $ */ #include @@ -237,7 +237,7 @@ test_gethostbyname(const char *name, const char *address) { if (address == NULL && h_errno == HOST_NOT_FOUND) return; else if (h_errno != HOST_NOT_FOUND) { - printf("I:gethostbyname(%s) failed: %s\n", + printf("I:gethostbyname(%s) failed: %s\n", name, hstrerror(h_errno)); fails++; return; @@ -272,7 +272,7 @@ test_gethostbyname2(const char *name, const char *address, int af) { if (address == NULL && h_errno == HOST_NOT_FOUND) return; else if (h_errno != HOST_NOT_FOUND) { - printf("I:gethostbyname(%s) failed: %s\n", + printf("I:gethostbyname(%s) failed: %s\n", name, hstrerror(h_errno)); fails++; return; @@ -328,7 +328,7 @@ test_gethostbyaddr(const char *address, int af, const char *name) { if (name == NULL && h_errno == HOST_NOT_FOUND) return; else if (h_errno != HOST_NOT_FOUND) { - printf("I:gethostbyaddr(%s) failed: %s\n", + printf("I:gethostbyaddr(%s) failed: %s\n", address, hstrerror(h_errno)); fails++; return; @@ -372,7 +372,7 @@ test_getaddrinfo(const char *name, int af, int v4ok, int v6ok, if (address == NULL && ret == EAI_NODATA) return; else if (ret != EAI_NODATA) { - printf("I:getaddrinfo(%s,%d,%d) failed: %s\n", + printf("I:getaddrinfo(%s,%d,%d) failed: %s\n", name, v4ok, v6ok, gai_strerror(ret)); fails++; return; @@ -470,7 +470,7 @@ test_getnameinfo(const char *address, int af, const char *name) { if (name == NULL && ret == ENI_NOHOSTNAME) return; else if (ret != ENI_NOHOSTNAME) { - printf("I:getnameinfo(%s) failed: %d\n", + printf("I:getnameinfo(%s) failed: %d\n", address, ret); fails++; return; diff --git a/bin/tests/system/lwresd/ns1/10.10.10.in-addr.arpa.db b/bin/tests/system/lwresd/ns1/10.10.10.in-addr.arpa.db index 2d0366b943..e5f382096b 100644 --- a/bin/tests/system/lwresd/ns1/10.10.10.in-addr.arpa.db +++ b/bin/tests/system/lwresd/ns1/10.10.10.in-addr.arpa.db @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: 10.10.10.in-addr.arpa.db,v 1.5 2000/07/27 09:40:07 tale Exp $ +; $Id: 10.10.10.in-addr.arpa.db,v 1.6 2000/08/01 01:15:43 tale Exp $ $TTL 300 ; 5 minutes @ IN SOA mname1. . ( diff --git a/bin/tests/system/lwresd/ns1/example1.db b/bin/tests/system/lwresd/ns1/example1.db index 37bddd6053..0f86c5648b 100644 --- a/bin/tests/system/lwresd/ns1/example1.db +++ b/bin/tests/system/lwresd/ns1/example1.db @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: example1.db,v 1.6 2000/07/27 09:40:08 tale Exp $ +; $Id: example1.db,v 1.7 2000/08/01 01:15:45 tale Exp $ $TTL 300 ; 5 minutes @ IN SOA mname1. . ( diff --git a/bin/tests/system/lwresd/ns1/example2.db b/bin/tests/system/lwresd/ns1/example2.db index 03e0f749e2..1cae6393cc 100644 --- a/bin/tests/system/lwresd/ns1/example2.db +++ b/bin/tests/system/lwresd/ns1/example2.db @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: example2.db,v 1.4 2000/07/27 09:40:09 tale Exp $ +; $Id: example2.db,v 1.5 2000/08/01 01:15:46 tale Exp $ $TTL 300 ; 5 minutes @ IN SOA mname1. . ( diff --git a/bin/tests/system/lwresd/ns1/ip6.arpa.db b/bin/tests/system/lwresd/ns1/ip6.arpa.db index f9541c8285..8c60ed7bff 100644 --- a/bin/tests/system/lwresd/ns1/ip6.arpa.db +++ b/bin/tests/system/lwresd/ns1/ip6.arpa.db @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: ip6.arpa.db,v 1.4 2000/07/27 09:40:10 tale Exp $ +; $Id: ip6.arpa.db,v 1.5 2000/08/01 01:15:47 tale Exp $ $TTL 300 ; 5 minutes @ IN SOA mname1. . ( diff --git a/bin/tests/system/lwresd/ns1/ip6.int.db b/bin/tests/system/lwresd/ns1/ip6.int.db index 44aace408f..77d3c0389c 100644 --- a/bin/tests/system/lwresd/ns1/ip6.int.db +++ b/bin/tests/system/lwresd/ns1/ip6.int.db @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: ip6.int.db,v 1.5 2000/07/27 09:40:11 tale Exp $ +; $Id: ip6.int.db,v 1.6 2000/08/01 01:15:48 tale Exp $ $TTL 300 ; 5 minutes @ IN SOA mname1. . ( diff --git a/bin/tests/system/lwresd/ns1/named.conf b/bin/tests/system/lwresd/ns1/named.conf index c68128c5e6..33de7aa81a 100644 --- a/bin/tests/system/lwresd/ns1/named.conf +++ b/bin/tests/system/lwresd/ns1/named.conf @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.5 2000/07/27 09:40:12 tale Exp $ */ +/* $Id: named.conf,v 1.6 2000/08/01 01:15:50 tale Exp $ */ options { query-source address 10.53.0.1; diff --git a/bin/tests/system/lwresd/ns1/root.db b/bin/tests/system/lwresd/ns1/root.db index 357f401683..465494ba79 100644 --- a/bin/tests/system/lwresd/ns1/root.db +++ b/bin/tests/system/lwresd/ns1/root.db @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,13 +13,13 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: root.db,v 1.4 2000/07/27 09:40:13 tale Exp $ +; $Id: root.db,v 1.5 2000/08/01 01:15:51 tale Exp $ $TTL 300 . IN SOA gson.nominum.com. a.root.servers.nil. ( 2000042100 ; serial 600 ; refresh - 600 ; retry + 600 ; retry 1200 ; expire 600 ; minimum ) diff --git a/bin/tests/system/lwresd/resolv.conf b/bin/tests/system/lwresd/resolv.conf index 1d589edb45..d0e4fde9ad 100644 --- a/bin/tests/system/lwresd/resolv.conf +++ b/bin/tests/system/lwresd/resolv.conf @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: resolv.conf,v 1.4 2000/07/27 09:40:03 tale Exp $ */ +/* $Id: resolv.conf,v 1.5 2000/08/01 01:15:38 tale Exp $ */ nameserver 10.53.0.1 search example1. diff --git a/bin/tests/system/lwresd/tests.sh b/bin/tests/system/lwresd/tests.sh index 1d1f2a8df9..12688c69ca 100644 --- a/bin/tests/system/lwresd/tests.sh +++ b/bin/tests/system/lwresd/tests.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.6 2000/07/27 09:40:04 tale Exp $ +# $Id: tests.sh,v 1.7 2000/08/01 01:15:40 tale Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/notify/clean.sh b/bin/tests/system/notify/clean.sh index 2615d9794a..e7f72f9855 100644 --- a/bin/tests/system/notify/clean.sh +++ b/bin/tests/system/notify/clean.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.5 2000/07/27 09:40:14 tale Exp $ +# $Id: clean.sh,v 1.6 2000/08/01 01:15:53 tale Exp $ # # Clean up after zone transfer tests. diff --git a/bin/tests/system/notify/ns1/named.conf b/bin/tests/system/notify/ns1/named.conf index f61ac9393d..16bac3b9f3 100644 --- a/bin/tests/system/notify/ns1/named.conf +++ b/bin/tests/system/notify/ns1/named.conf @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.8 2000/07/27 09:40:18 tale Exp $ */ +/* $Id: named.conf,v 1.9 2000/08/01 01:15:58 tale Exp $ */ options { query-source address 10.53.0.1; diff --git a/bin/tests/system/notify/ns1/root.db b/bin/tests/system/notify/ns1/root.db index ad34657984..21a3283554 100644 --- a/bin/tests/system/notify/ns1/root.db +++ b/bin/tests/system/notify/ns1/root.db @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,13 +13,13 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: root.db,v 1.4 2000/07/27 09:40:19 tale Exp $ +; $Id: root.db,v 1.5 2000/08/01 01:15:59 tale Exp $ $TTL 300 . IN SOA gson.nominum.com. a.root.servers.nil. ( 2000042100 ; serial 600 ; refresh - 600 ; retry + 600 ; retry 1200 ; expire 600 ; minimum ) diff --git a/bin/tests/system/notify/ns2/example1.db b/bin/tests/system/notify/ns2/example1.db index 587c3c757e..944bd77b88 100644 --- a/bin/tests/system/notify/ns2/example1.db +++ b/bin/tests/system/notify/ns2/example1.db @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: example1.db,v 1.5 2000/07/27 09:40:20 tale Exp $ +; $Id: example1.db,v 1.6 2000/08/01 01:16:00 tale Exp $ $ORIGIN . $TTL 300 ; 5 minutes diff --git a/bin/tests/system/notify/ns2/example2.db b/bin/tests/system/notify/ns2/example2.db index 75c77e0f1b..4f0b526956 100644 --- a/bin/tests/system/notify/ns2/example2.db +++ b/bin/tests/system/notify/ns2/example2.db @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: example2.db,v 1.5 2000/07/27 09:40:21 tale Exp $ +; $Id: example2.db,v 1.6 2000/08/01 01:16:01 tale Exp $ $ORIGIN . $TTL 300 ; 5 minutes diff --git a/bin/tests/system/notify/ns2/example3.db b/bin/tests/system/notify/ns2/example3.db index 15b64d1b12..c0056bbf28 100644 --- a/bin/tests/system/notify/ns2/example3.db +++ b/bin/tests/system/notify/ns2/example3.db @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: example3.db,v 1.5 2000/07/27 09:40:22 tale Exp $ +; $Id: example3.db,v 1.6 2000/08/01 01:16:02 tale Exp $ $ORIGIN . $TTL 300 ; 5 minutes diff --git a/bin/tests/system/notify/ns2/example4.db b/bin/tests/system/notify/ns2/example4.db index 2ac4205427..0dd6e133c2 100644 --- a/bin/tests/system/notify/ns2/example4.db +++ b/bin/tests/system/notify/ns2/example4.db @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: example4.db,v 1.5 2000/07/27 09:40:23 tale Exp $ +; $Id: example4.db,v 1.6 2000/08/01 01:16:04 tale Exp $ $ORIGIN . $TTL 300 ; 5 minutes diff --git a/bin/tests/system/notify/ns2/named.conf b/bin/tests/system/notify/ns2/named.conf index 8d2cc74bbf..ecb54023ef 100644 --- a/bin/tests/system/notify/ns2/named.conf +++ b/bin/tests/system/notify/ns2/named.conf @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.10 2000/07/27 09:40:24 tale Exp $ */ +/* $Id: named.conf,v 1.11 2000/08/01 01:16:05 tale Exp $ */ options { query-source address 10.53.0.2; diff --git a/bin/tests/system/notify/ns2/root.hint b/bin/tests/system/notify/ns2/root.hint index 90f7a98632..c0acee977c 100644 --- a/bin/tests/system/notify/ns2/root.hint +++ b/bin/tests/system/notify/ns2/root.hint @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: root.hint,v 1.4 2000/07/27 09:40:26 tale Exp $ +; $Id: root.hint,v 1.5 2000/08/01 01:16:06 tale Exp $ $TTL 999999 . IN NS a.root-servers.nil. diff --git a/bin/tests/system/notify/ns3/named.conf b/bin/tests/system/notify/ns3/named.conf index cf0e8dd531..08723e6d10 100644 --- a/bin/tests/system/notify/ns3/named.conf +++ b/bin/tests/system/notify/ns3/named.conf @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.11 2000/07/27 09:40:27 tale Exp $ */ +/* $Id: named.conf,v 1.12 2000/08/01 01:16:07 tale Exp $ */ options { query-source address 10.53.0.3; diff --git a/bin/tests/system/notify/ns3/root.hint b/bin/tests/system/notify/ns3/root.hint index b0fb6ac4fb..3a5d223675 100644 --- a/bin/tests/system/notify/ns3/root.hint +++ b/bin/tests/system/notify/ns3/root.hint @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: root.hint,v 1.4 2000/07/27 09:40:28 tale Exp $ +; $Id: root.hint,v 1.5 2000/08/01 01:16:09 tale Exp $ $TTL 999999 . IN NS a.root-servers.nil. diff --git a/bin/tests/system/notify/setup.sh b/bin/tests/system/notify/setup.sh index 26d6d8d65d..7b66bf54e2 100644 --- a/bin/tests/system/notify/setup.sh +++ b/bin/tests/system/notify/setup.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -15,6 +15,6 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.4 2000/07/27 09:40:15 tale Exp $ +# $Id: setup.sh,v 1.5 2000/08/01 01:15:54 tale Exp $ cp ns2/example1.db ns2/example.db diff --git a/bin/tests/system/notify/tests.sh b/bin/tests/system/notify/tests.sh index 12cc7a35f9..dacf729a1e 100644 --- a/bin/tests/system/notify/tests.sh +++ b/bin/tests/system/notify/tests.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.24 2000/07/27 09:40:16 tale Exp $ +# $Id: tests.sh,v 1.25 2000/08/01 01:15:56 tale Exp $ # # Perform tests diff --git a/bin/tests/system/nsupdate/clean.sh b/bin/tests/system/nsupdate/clean.sh index 98d966add3..2cddd9e5ac 100644 --- a/bin/tests/system/nsupdate/clean.sh +++ b/bin/tests/system/nsupdate/clean.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.4 2000/07/28 00:38:08 bwelling Exp $ +# $Id: clean.sh,v 1.5 2000/08/01 01:16:11 tale Exp $ # # Clean up after zone transfer tests. diff --git a/bin/tests/system/nsupdate/ns1/example.orig b/bin/tests/system/nsupdate/ns1/example.orig index bbe8786fa3..2a83b24fec 100644 --- a/bin/tests/system/nsupdate/ns1/example.orig +++ b/bin/tests/system/nsupdate/ns1/example.orig @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: example.orig,v 1.2 2000/07/27 09:40:34 tale Exp $ +; $Id: example.orig,v 1.3 2000/08/01 01:16:17 tale Exp $ $ORIGIN . $TTL 300 ; 5 minutes diff --git a/bin/tests/system/nsupdate/ns1/named.conf b/bin/tests/system/nsupdate/ns1/named.conf index 5d44f11793..4da390eb81 100644 --- a/bin/tests/system/nsupdate/ns1/named.conf +++ b/bin/tests/system/nsupdate/ns1/named.conf @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.4 2000/07/27 09:40:35 tale Exp $ */ +/* $Id: named.conf,v 1.5 2000/08/01 01:16:18 tale Exp $ */ options { query-source address 10.53.0.1; diff --git a/bin/tests/system/nsupdate/ns1/update.orig b/bin/tests/system/nsupdate/ns1/update.orig index 9d94e49a28..2fe52d84a8 100644 --- a/bin/tests/system/nsupdate/ns1/update.orig +++ b/bin/tests/system/nsupdate/ns1/update.orig @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: update.orig,v 1.2 2000/07/27 09:40:36 tale Exp $ +; $Id: update.orig,v 1.3 2000/08/01 01:16:19 tale Exp $ $ORIGIN . $TTL 300 ; 5 minutes diff --git a/bin/tests/system/nsupdate/ns2/named.conf b/bin/tests/system/nsupdate/ns2/named.conf index 333136d44e..2556f44da7 100644 --- a/bin/tests/system/nsupdate/ns2/named.conf +++ b/bin/tests/system/nsupdate/ns2/named.conf @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.3 2000/07/27 09:40:37 tale Exp $ */ +/* $Id: named.conf,v 1.4 2000/08/01 01:16:20 tale Exp $ */ options { query-source address 10.53.0.2; diff --git a/bin/tests/system/nsupdate/setup.sh b/bin/tests/system/nsupdate/setup.sh index d450b3a4fc..ab81e49c0b 100644 --- a/bin/tests/system/nsupdate/setup.sh +++ b/bin/tests/system/nsupdate/setup.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.3 2000/07/27 09:40:30 tale Exp $ +# $Id: setup.sh,v 1.4 2000/08/01 01:16:12 tale Exp $ # # jnl and database files MUST be removed before we start diff --git a/bin/tests/system/nsupdate/tests.sh b/bin/tests/system/nsupdate/tests.sh index 9fdb70cd09..05bb9fce63 100644 --- a/bin/tests/system/nsupdate/tests.sh +++ b/bin/tests/system/nsupdate/tests.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.10 2000/07/27 09:40:31 tale Exp $ +# $Id: tests.sh,v 1.11 2000/08/01 01:16:13 tale Exp $ # # Perform tests diff --git a/bin/tests/system/nsupdate/update_test.pl b/bin/tests/system/nsupdate/update_test.pl index deab974da8..0b9b3da82d 100644 --- a/bin/tests/system/nsupdate/update_test.pl +++ b/bin/tests/system/nsupdate/update_test.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl # # 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 # 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 @@ -25,8 +25,8 @@ # The server defaults to 127.0.0.1. # The port defaults to 53. # -# The "Special NS rules" tests will only work correctly if the -# has no NS records to begin with, or alternatively has a +# The "Special NS rules" tests will only work correctly if the +# has no NS records to begin with, or alternatively has a # single NS record pointing at the name "ns1" (relative to # the zone name). # @@ -37,7 +37,7 @@ # # perl -MCPAN -e "install Net::DNS" # -# $Id: update_test.pl,v 1.3 2000/07/27 09:40:32 tale Exp $ +# $Id: update_test.pl,v 1.4 2000/08/01 01:16:14 tale Exp $ # use Getopt::Std; @@ -74,11 +74,11 @@ sub test { my ($expected, @records) = @_; my $update = new Net::DNS::Update("$zone"); - + foreach $rec (@records) { $update->push(@$rec); } - + $reply = $res->send($update); # Did it work? @@ -166,7 +166,7 @@ test("NOERROR", ["update", rr_add("e.$zone 300 A 73.80.65.50")]); test("NOERROR", ["update", rr_add("e.$zone 300 A 73.80.65.52"), - rr_add("f.$zone 300 A 73.80.65.52"), + rr_add("f.$zone 300 A 73.80.65.52"), rr_add("e.$zone 300 A 73.80.65.51")]); test("NOERROR", ["update", rr_add("e.$zone 300 TXT 'three'"), diff --git a/bin/tests/system/resolver/ans2/ans.pl b/bin/tests/system/resolver/ans2/ans.pl index edc72828d1..d279a32a42 100644 --- a/bin/tests/system/resolver/ans2/ans.pl +++ b/bin/tests/system/resolver/ans2/ans.pl @@ -8,7 +8,7 @@ use IO::Socket; use Net::DNS; use Net::DNS::Packet; -my $sock = IO::Socket::INET->new(LocalAddr => "10.53.0.2", +my $sock = IO::Socket::INET->new(LocalAddr => "10.53.0.2", LocalPort => 5300, Proto => "udp") or die "$!"; my $pidf = new IO::File "ans.pid", "w" or die "cannot write pid file: $!"; @@ -53,5 +53,5 @@ for (;;) { print "RESPONSE:\n"; $packet->print; - print "\n"; + print "\n"; } diff --git a/bin/tests/system/resolver/ans3/ans.pl b/bin/tests/system/resolver/ans3/ans.pl index ad6ecfce46..ae15aedc7e 100644 --- a/bin/tests/system/resolver/ans3/ans.pl +++ b/bin/tests/system/resolver/ans3/ans.pl @@ -8,7 +8,7 @@ use IO::Socket; use Net::DNS; use Net::DNS::Packet; -my $sock = IO::Socket::INET->new(LocalAddr => "10.53.0.3", +my $sock = IO::Socket::INET->new(LocalAddr => "10.53.0.3", LocalPort => 5300, Proto => "udp") or die "$!"; my $pidf = new IO::File "ans.pid", "w" or die "cannot write pid file: $!"; @@ -27,16 +27,16 @@ for (;;) { my ($packet, $err) = new Net::DNS::Packet(\$buf, 0); $err and die $err; - print "REQUEST:\n"; + print "REQUEST:\n"; $packet->print; $packet->header->qr(1); $packet->push("answer", new Net::DNS::RR("www.example.com 300 A 1.2.3.4")); - + $sock->send($packet->data); print "RESPONSE:\n"; $packet->print; - print "\n"; + print "\n"; } diff --git a/bin/tests/system/resolver/ns1/named.conf b/bin/tests/system/resolver/ns1/named.conf index 6563afb930..1e2aaa9e7b 100644 --- a/bin/tests/system/resolver/ns1/named.conf +++ b/bin/tests/system/resolver/ns1/named.conf @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.2 2000/07/27 09:40:41 tale Exp $ */ +/* $Id: named.conf,v 1.3 2000/08/01 01:16:27 tale Exp $ */ options { query-source address 10.53.0.1; diff --git a/bin/tests/system/resolver/ns1/root.hint b/bin/tests/system/resolver/ns1/root.hint index 70d230aa06..8422531e57 100644 --- a/bin/tests/system/resolver/ns1/root.hint +++ b/bin/tests/system/resolver/ns1/root.hint @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: root.hint,v 1.2 2000/07/27 09:40:42 tale Exp $ +; $Id: root.hint,v 1.3 2000/08/01 01:16:28 tale Exp $ $TTL 999999 . IN NS a.root-servers.nil. diff --git a/bin/tests/system/resolver/prereq.sh b/bin/tests/system/resolver/prereq.sh index 75a6fbd16d..400c753719 100644 --- a/bin/tests/system/resolver/prereq.sh +++ b/bin/tests/system/resolver/prereq.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -15,12 +15,12 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: prereq.sh,v 1.2 2000/07/27 09:40:39 tale Exp $ +# $Id: prereq.sh,v 1.3 2000/08/01 01:16:22 tale Exp $ if $PERL -e 'use Net::DNS;' 2>/dev/null then : else - echo "I:This test requires the Net::DNS library." >&2 + echo "I:This test requires the Net::DNS library." >&2 exit 1 fi diff --git a/bin/tests/system/resolver/tests.sh b/bin/tests/system/resolver/tests.sh index 055895dfa1..e4c9d9c2e8 100644 --- a/bin/tests/system/resolver/tests.sh +++ b/bin/tests/system/resolver/tests.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.4 2000/07/28 22:42:41 gson Exp $ +# $Id: tests.sh,v 1.5 2000/08/01 01:16:23 tale Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh index 7dd43e042a..21160d81cc 100644 --- a/bin/tests/system/run.sh +++ b/bin/tests/system/run.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: run.sh,v 1.32 2000/07/27 09:39:12 tale Exp $ +# $Id: run.sh,v 1.33 2000/08/01 01:14:24 tale Exp $ # # Run a system test. diff --git a/bin/tests/system/runall.sh b/bin/tests/system/runall.sh index bbbb7614d1..0ea7aace7c 100644 --- a/bin/tests/system/runall.sh +++ b/bin/tests/system/runall.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: runall.sh,v 1.2 2000/07/27 09:39:13 tale Exp $ +# $Id: runall.sh,v 1.3 2000/08/01 01:14:25 tale Exp $ # # Run all the system tests. diff --git a/bin/tests/system/setup.sh b/bin/tests/system/setup.sh index b80834bb15..bd255f32b4 100644 --- a/bin/tests/system/setup.sh +++ b/bin/tests/system/setup.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.6 2000/07/27 09:39:14 tale Exp $ +# $Id: setup.sh,v 1.7 2000/08/01 01:14:26 tale Exp $ # # Run a system test. diff --git a/bin/tests/system/start.sh b/bin/tests/system/start.sh index 08a7a4ff87..610607d03e 100644 --- a/bin/tests/system/start.sh +++ b/bin/tests/system/start.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: start.sh,v 1.28 2000/07/27 09:39:15 tale Exp $ +# $Id: start.sh,v 1.29 2000/08/01 01:14:27 tale Exp $ # # Start name servers for running system tests. @@ -46,7 +46,7 @@ do sh ./stop.sh $1 exit 1 fi - fi + fi done cd $1 diff --git a/bin/tests/system/stop.sh b/bin/tests/system/stop.sh index 820a1c8f77..009b82c42c 100644 --- a/bin/tests/system/stop.sh +++ b/bin/tests/system/stop.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: stop.sh,v 1.15 2000/07/27 09:39:16 tale Exp $ +# $Id: stop.sh,v 1.16 2000/08/01 01:14:29 tale Exp $ # # Stop name servers. diff --git a/bin/tests/system/stub/clean.sh b/bin/tests/system/stub/clean.sh index 82c495c866..633e80b46e 100644 --- a/bin/tests/system/stub/clean.sh +++ b/bin/tests/system/stub/clean.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.4 2000/07/27 09:40:43 tale Exp $ +# $Id: clean.sh,v 1.5 2000/08/01 01:16:30 tale Exp $ # # Clean up after stub tests. diff --git a/bin/tests/system/stub/knowngood.dig.out.norec b/bin/tests/system/stub/knowngood.dig.out.norec index 0aa9c0dbbf..ca0e458e8b 100644 --- a/bin/tests/system/stub/knowngood.dig.out.norec +++ b/bin/tests/system/stub/knowngood.dig.out.norec @@ -1,5 +1,5 @@ -; <<>> DiG 8.2 <<>> -p @10.53.0.3 +norec data.child.example txt +; <<>> DiG 8.2 <<>> -p @10.53.0.3 +norec data.child.example txt ; (1 server found) ;; res options: init defnam dnsrch ;; got answer: diff --git a/bin/tests/system/stub/knowngood.dig.out.rec b/bin/tests/system/stub/knowngood.dig.out.rec index da6c3aa716..9f2e4ee8e8 100644 --- a/bin/tests/system/stub/knowngood.dig.out.rec +++ b/bin/tests/system/stub/knowngood.dig.out.rec @@ -1,5 +1,5 @@ -; <<>> DiG 8.2 <<>> -p @10.53.0.3 data.child.example txt +; <<>> DiG 8.2 <<>> -p @10.53.0.3 data.child.example txt ; (1 server found) ;; res options: init recurs defnam dnsrch ;; got answer: diff --git a/bin/tests/system/stub/ns1/named.conf b/bin/tests/system/stub/ns1/named.conf index 9d8f2859c6..a689a755da 100644 --- a/bin/tests/system/stub/ns1/named.conf +++ b/bin/tests/system/stub/ns1/named.conf @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.4 2000/07/27 09:40:46 tale Exp $ */ +/* $Id: named.conf,v 1.5 2000/08/01 01:16:35 tale Exp $ */ options { query-source address 10.53.0.1; diff --git a/bin/tests/system/stub/ns1/root.db b/bin/tests/system/stub/ns1/root.db index 7acde72a5c..0809f086d2 100644 --- a/bin/tests/system/stub/ns1/root.db +++ b/bin/tests/system/stub/ns1/root.db @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,13 +13,13 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: root.db,v 1.4 2000/07/27 09:40:47 tale Exp $ +; $Id: root.db,v 1.5 2000/08/01 01:16:36 tale Exp $ $TTL 300 . IN SOA gson.nominum.com. a.root.servers.nil. ( 2000042100 ; serial 600 ; refresh - 600 ; retry + 600 ; retry 1200 ; expire 600 ; minimum ) diff --git a/bin/tests/system/stub/ns2/child.example.db b/bin/tests/system/stub/ns2/child.example.db index 06d02cbe22..86bc07c416 100644 --- a/bin/tests/system/stub/ns2/child.example.db +++ b/bin/tests/system/stub/ns2/child.example.db @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: child.example.db,v 1.4 2000/07/27 09:40:48 tale Exp $ +; $Id: child.example.db,v 1.5 2000/08/01 01:16:39 tale Exp $ $TTL 300 ; 5 minutes child.example. IN SOA ns2.child.example. hostmaster.child.example. ( diff --git a/bin/tests/system/stub/ns2/named.conf b/bin/tests/system/stub/ns2/named.conf index adc8efcd73..e38378d555 100644 --- a/bin/tests/system/stub/ns2/named.conf +++ b/bin/tests/system/stub/ns2/named.conf @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.4 2000/07/27 09:40:49 tale Exp $ */ +/* $Id: named.conf,v 1.5 2000/08/01 01:16:40 tale Exp $ */ options { query-source address 10.53.0.2; diff --git a/bin/tests/system/stub/ns2/root.hint b/bin/tests/system/stub/ns2/root.hint index 22ca1de0a2..a80e9339a9 100644 --- a/bin/tests/system/stub/ns2/root.hint +++ b/bin/tests/system/stub/ns2/root.hint @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: root.hint,v 1.4 2000/07/27 09:40:50 tale Exp $ +; $Id: root.hint,v 1.5 2000/08/01 01:16:41 tale Exp $ $TTL 999999 . IN NS a.root-servers.nil. diff --git a/bin/tests/system/stub/ns3/example.db b/bin/tests/system/stub/ns3/example.db index 522fa55e1b..1469eced87 100644 --- a/bin/tests/system/stub/ns3/example.db +++ b/bin/tests/system/stub/ns3/example.db @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: example.db,v 1.4 2000/07/27 09:40:52 tale Exp $ +; $Id: example.db,v 1.5 2000/08/01 01:16:42 tale Exp $ $ORIGIN . $TTL 300 ; 5 minutes diff --git a/bin/tests/system/stub/ns3/named.conf b/bin/tests/system/stub/ns3/named.conf index 633c21fd6c..95896b1c69 100644 --- a/bin/tests/system/stub/ns3/named.conf +++ b/bin/tests/system/stub/ns3/named.conf @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.4 2000/07/27 09:40:53 tale Exp $ */ +/* $Id: named.conf,v 1.5 2000/08/01 01:16:43 tale Exp $ */ options { query-source address 10.53.0.3; diff --git a/bin/tests/system/stub/ns3/root.hint b/bin/tests/system/stub/ns3/root.hint index 773db4eaa2..f7110cd945 100644 --- a/bin/tests/system/stub/ns3/root.hint +++ b/bin/tests/system/stub/ns3/root.hint @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: root.hint,v 1.4 2000/07/27 09:40:54 tale Exp $ +; $Id: root.hint,v 1.5 2000/08/01 01:16:44 tale Exp $ $TTL 999999 . IN NS a.root-servers.nil. diff --git a/bin/tests/system/stub/tests.sh b/bin/tests/system/stub/tests.sh index a01ae61a19..f5fd9b19c9 100644 --- a/bin/tests/system/stub/tests.sh +++ b/bin/tests/system/stub/tests.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.8 2000/07/27 09:40:44 tale Exp $ +# $Id: tests.sh,v 1.9 2000/08/01 01:16:34 tale Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/testsock.pl b/bin/tests/system/testsock.pl index 200a4f8419..b060ff4b62 100644 --- a/bin/tests/system/testsock.pl +++ b/bin/tests/system/testsock.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: testsock.pl,v 1.8 2000/07/27 09:39:17 tale Exp $ +# $Id: testsock.pl,v 1.9 2000/08/01 01:14:30 tale Exp $ # Test whether the interfaces on 10.53.0.* are up. diff --git a/bin/tests/system/views/clean.sh b/bin/tests/system/views/clean.sh index 7d351c8b6f..ecf3a0a464 100644 --- a/bin/tests/system/views/clean.sh +++ b/bin/tests/system/views/clean.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.5 2000/07/27 09:40:55 tale Exp $ +# $Id: clean.sh,v 1.6 2000/08/01 01:16:45 tale Exp $ # # Clean up after zone transfer tests. diff --git a/bin/tests/system/views/ns1/named.conf b/bin/tests/system/views/ns1/named.conf index e900bf8e5b..4d9728c2f1 100644 --- a/bin/tests/system/views/ns1/named.conf +++ b/bin/tests/system/views/ns1/named.conf @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.7 2000/07/27 09:40:59 tale Exp $ */ +/* $Id: named.conf,v 1.8 2000/08/01 01:16:51 tale Exp $ */ options { query-source address 10.53.0.1; diff --git a/bin/tests/system/views/ns1/root.db b/bin/tests/system/views/ns1/root.db index ce95f5972a..5eba63e058 100644 --- a/bin/tests/system/views/ns1/root.db +++ b/bin/tests/system/views/ns1/root.db @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,13 +13,13 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: root.db,v 1.4 2000/07/27 09:41:01 tale Exp $ +; $Id: root.db,v 1.5 2000/08/01 01:16:52 tale Exp $ $TTL 300 . IN SOA gson.nominum.com. a.root.servers.nil. ( 2000042100 ; serial 600 ; refresh - 600 ; retry + 600 ; retry 1200 ; expire 600 ; minimum ) diff --git a/bin/tests/system/views/ns2/example1.db b/bin/tests/system/views/ns2/example1.db index b07aa69470..3c0844dae0 100644 --- a/bin/tests/system/views/ns2/example1.db +++ b/bin/tests/system/views/ns2/example1.db @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: example1.db,v 1.4 2000/07/27 09:41:02 tale Exp $ +; $Id: example1.db,v 1.5 2000/08/01 01:16:53 tale Exp $ $ORIGIN . $TTL 300 ; 5 minutes diff --git a/bin/tests/system/views/ns2/example2.db b/bin/tests/system/views/ns2/example2.db index c144f106ee..4f4ec199f7 100644 --- a/bin/tests/system/views/ns2/example2.db +++ b/bin/tests/system/views/ns2/example2.db @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: example2.db,v 1.4 2000/07/27 09:41:03 tale Exp $ +; $Id: example2.db,v 1.5 2000/08/01 01:16:55 tale Exp $ $ORIGIN . $TTL 300 ; 5 minutes diff --git a/bin/tests/system/views/ns2/internal.db b/bin/tests/system/views/ns2/internal.db index 1517c49f80..39559f1983 100644 --- a/bin/tests/system/views/ns2/internal.db +++ b/bin/tests/system/views/ns2/internal.db @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: internal.db,v 1.4 2000/07/27 09:41:04 tale Exp $ +; $Id: internal.db,v 1.5 2000/08/01 01:16:56 tale Exp $ $ORIGIN . $TTL 300 ; 5 minutes diff --git a/bin/tests/system/views/ns2/named1.conf b/bin/tests/system/views/ns2/named1.conf index 9ca873bd71..837367fbb7 100644 --- a/bin/tests/system/views/ns2/named1.conf +++ b/bin/tests/system/views/ns2/named1.conf @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named1.conf,v 1.10 2000/07/29 00:26:18 mws Exp $ */ +/* $Id: named1.conf,v 1.11 2000/08/01 01:16:57 tale Exp $ */ options { query-source address 10.53.0.2; diff --git a/bin/tests/system/views/ns2/named2.conf b/bin/tests/system/views/ns2/named2.conf index 878978f07c..96686d0cd1 100644 --- a/bin/tests/system/views/ns2/named2.conf +++ b/bin/tests/system/views/ns2/named2.conf @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,13 +15,13 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named2.conf,v 1.10 2000/07/29 00:26:19 mws Exp $ */ +/* $Id: named2.conf,v 1.11 2000/08/01 01:16:58 tale Exp $ */ options { query-source address 10.53.0.2; port 5300; pid-file "named.pid"; - listen-on { 10.53.0.2; + listen-on { 10.53.0.2; 10.53.0.4; }; listen-on-v6 {none;}; recursion no; @@ -38,7 +38,7 @@ controls { }; view "internal" { - match-clients { 10.53.0.2; + match-clients { 10.53.0.2; 10.53.0.3; }; zone "." { diff --git a/bin/tests/system/views/ns2/root.hint b/bin/tests/system/views/ns2/root.hint index aa66af13a0..daf194182e 100644 --- a/bin/tests/system/views/ns2/root.hint +++ b/bin/tests/system/views/ns2/root.hint @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: root.hint,v 1.4 2000/07/27 09:41:07 tale Exp $ +; $Id: root.hint,v 1.5 2000/08/01 01:16:59 tale Exp $ $TTL 999999 . IN NS a.root-servers.nil. diff --git a/bin/tests/system/views/ns3/internal.db b/bin/tests/system/views/ns3/internal.db index 62683857e7..dee6bdb10f 100644 --- a/bin/tests/system/views/ns3/internal.db +++ b/bin/tests/system/views/ns3/internal.db @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: internal.db,v 1.4 2000/07/27 09:41:09 tale Exp $ +; $Id: internal.db,v 1.5 2000/08/01 01:17:01 tale Exp $ $ORIGIN . $TTL 300 ; 5 minutes diff --git a/bin/tests/system/views/ns3/named1.conf b/bin/tests/system/views/ns3/named1.conf index 731c96a29b..2fef3c0d78 100644 --- a/bin/tests/system/views/ns3/named1.conf +++ b/bin/tests/system/views/ns3/named1.conf @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named1.conf,v 1.11 2000/07/29 00:26:20 mws Exp $ */ +/* $Id: named1.conf,v 1.12 2000/08/01 01:17:02 tale Exp $ */ options { query-source address 10.53.0.3; diff --git a/bin/tests/system/views/ns3/named2.conf b/bin/tests/system/views/ns3/named2.conf index 971e923c46..34c005e675 100644 --- a/bin/tests/system/views/ns3/named2.conf +++ b/bin/tests/system/views/ns3/named2.conf @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named2.conf,v 1.11 2000/07/29 00:26:22 mws Exp $ */ +/* $Id: named2.conf,v 1.12 2000/08/01 01:17:03 tale Exp $ */ options { query-source address 10.53.0.3; diff --git a/bin/tests/system/views/ns3/root.hint b/bin/tests/system/views/ns3/root.hint index 930771a952..c4fdf239a5 100644 --- a/bin/tests/system/views/ns3/root.hint +++ b/bin/tests/system/views/ns3/root.hint @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: root.hint,v 1.4 2000/07/27 09:41:12 tale Exp $ +; $Id: root.hint,v 1.5 2000/08/01 01:17:04 tale Exp $ $TTL 999999 . IN NS a.root-servers.nil. diff --git a/bin/tests/system/views/rndc.conf b/bin/tests/system/views/rndc.conf index 70145f689e..e570dc71d5 100644 --- a/bin/tests/system/views/rndc.conf +++ b/bin/tests/system/views/rndc.conf @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rndc.conf,v 1.2 2000/07/27 09:40:56 tale Exp $ */ +/* $Id: rndc.conf,v 1.3 2000/08/01 01:16:46 tale Exp $ */ options { default-key "rndc_key"; diff --git a/bin/tests/system/views/setup.sh b/bin/tests/system/views/setup.sh index ce80ce59af..7a121e8ade 100644 --- a/bin/tests/system/views/setup.sh +++ b/bin/tests/system/views/setup.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.4 2000/07/27 09:40:57 tale Exp $ +# $Id: setup.sh,v 1.5 2000/08/01 01:16:48 tale Exp $ cp ns2/example1.db ns2/example.db diff --git a/bin/tests/system/views/tests.sh b/bin/tests/system/views/tests.sh index 8e736f5bcd..6724b68bb3 100644 --- a/bin/tests/system/views/tests.sh +++ b/bin/tests/system/views/tests.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.20 2000/07/27 09:40:58 tale Exp $ +# $Id: tests.sh,v 1.21 2000/08/01 01:16:49 tale Exp $ # # Perform tests diff --git a/bin/tests/system/xfer/clean.sh b/bin/tests/system/xfer/clean.sh index dc5b6cce63..0901f3d70f 100644 --- a/bin/tests/system/xfer/clean.sh +++ b/bin/tests/system/xfer/clean.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.7 2000/07/27 09:41:13 tale Exp $ +# $Id: clean.sh,v 1.8 2000/08/01 01:17:06 tale Exp $ # # Clean up after zone transfer tests. diff --git a/bin/tests/system/xfer/ns1/named.conf b/bin/tests/system/xfer/ns1/named.conf index 06daa1d240..10b89508f8 100644 --- a/bin/tests/system/xfer/ns1/named.conf +++ b/bin/tests/system/xfer/ns1/named.conf @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.8 2000/07/27 09:41:16 tale Exp $ */ +/* $Id: named.conf,v 1.9 2000/08/01 01:17:08 tale Exp $ */ options { query-source address 10.53.0.1; diff --git a/bin/tests/system/xfer/ns1/root.db b/bin/tests/system/xfer/ns1/root.db index 459e575f9c..28a3527004 100644 --- a/bin/tests/system/xfer/ns1/root.db +++ b/bin/tests/system/xfer/ns1/root.db @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,13 +13,13 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: root.db,v 1.4 2000/07/27 09:41:17 tale Exp $ +; $Id: root.db,v 1.5 2000/08/01 01:17:09 tale Exp $ $TTL 300 . IN SOA gson.nominum.com. a.root.servers.nil. ( 2000042100 ; serial 600 ; refresh - 600 ; retry + 600 ; retry 1200 ; expire 600 ; minimum ) diff --git a/bin/tests/system/xfer/ns2/example.db b/bin/tests/system/xfer/ns2/example.db index dfdf395f14..221a00af47 100644 --- a/bin/tests/system/xfer/ns2/example.db +++ b/bin/tests/system/xfer/ns2/example.db @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: example.db,v 1.5 2000/07/27 09:41:18 tale Exp $ +; $Id: example.db,v 1.6 2000/08/01 01:17:10 tale Exp $ $ORIGIN . $TTL 300 ; 5 minutes diff --git a/bin/tests/system/xfer/ns2/named.conf b/bin/tests/system/xfer/ns2/named.conf index e93e5c8f48..67d540c6c8 100644 --- a/bin/tests/system/xfer/ns2/named.conf +++ b/bin/tests/system/xfer/ns2/named.conf @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.9 2000/07/27 09:41:19 tale Exp $ */ +/* $Id: named.conf,v 1.10 2000/08/01 01:17:12 tale Exp $ */ options { query-source address 10.53.0.2; @@ -27,7 +27,7 @@ options { notify yes; }; -key tsigzone. { +key tsigzone. { algorithm hmac-md5; secret "1234abcd8765"; }; diff --git a/bin/tests/system/xfer/ns2/root.hint b/bin/tests/system/xfer/ns2/root.hint index 00d1030ba5..22ee5d6a32 100644 --- a/bin/tests/system/xfer/ns2/root.hint +++ b/bin/tests/system/xfer/ns2/root.hint @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: root.hint,v 1.4 2000/07/27 09:41:20 tale Exp $ +; $Id: root.hint,v 1.5 2000/08/01 01:17:13 tale Exp $ $TTL 999999 . IN NS a.root-servers.nil. diff --git a/bin/tests/system/xfer/ns2/tsigzone.db b/bin/tests/system/xfer/ns2/tsigzone.db index 9aaa3febc9..8dd0d9959d 100644 --- a/bin/tests/system/xfer/ns2/tsigzone.db +++ b/bin/tests/system/xfer/ns2/tsigzone.db @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: tsigzone.db,v 1.4 2000/07/27 09:41:21 tale Exp $ +; $Id: tsigzone.db,v 1.5 2000/08/01 01:17:14 tale Exp $ $ORIGIN . $TTL 300 ; 5 minutes diff --git a/bin/tests/system/xfer/ns3/named.conf b/bin/tests/system/xfer/ns3/named.conf index 24a1231bff..3309363dbc 100644 --- a/bin/tests/system/xfer/ns3/named.conf +++ b/bin/tests/system/xfer/ns3/named.conf @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.8 2000/07/27 09:41:23 tale Exp $ */ +/* $Id: named.conf,v 1.9 2000/08/01 01:17:16 tale Exp $ */ options { query-source address 10.53.0.3; @@ -28,7 +28,7 @@ options { notify yes; }; -key tsigzone. { +key tsigzone. { algorithm hmac-md5; secret "1234abcd8765"; }; diff --git a/bin/tests/system/xfer/ns3/root.hint b/bin/tests/system/xfer/ns3/root.hint index 27ca07340e..c5247d51b7 100644 --- a/bin/tests/system/xfer/ns3/root.hint +++ b/bin/tests/system/xfer/ns3/root.hint @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: root.hint,v 1.4 2000/07/27 09:41:24 tale Exp $ +; $Id: root.hint,v 1.5 2000/08/01 01:17:17 tale Exp $ $TTL 999999 . IN NS a.root-servers.nil. diff --git a/bin/tests/system/xfer/tests.sh b/bin/tests/system/xfer/tests.sh index d7ccd0c43d..e0d78eb83a 100644 --- a/bin/tests/system/xfer/tests.sh +++ b/bin/tests/system/xfer/tests.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.20 2000/07/27 09:41:14 tale Exp $ +# $Id: tests.sh,v 1.21 2000/08/01 01:17:07 tale Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/xferquota/clean.sh b/bin/tests/system/xferquota/clean.sh index 990a9325dc..cca281731c 100644 --- a/bin/tests/system/xferquota/clean.sh +++ b/bin/tests/system/xferquota/clean.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.6 2000/07/27 09:41:25 tale Exp $ +# $Id: clean.sh,v 1.7 2000/08/01 01:17:18 tale Exp $ # # Clean up after zone transfer quota tests. diff --git a/bin/tests/system/xferquota/ns1/changing1.db b/bin/tests/system/xferquota/ns1/changing1.db index 29367847f2..3fb69fd831 100644 --- a/bin/tests/system/xferquota/ns1/changing1.db +++ b/bin/tests/system/xferquota/ns1/changing1.db @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: changing1.db,v 1.4 2000/07/27 09:41:29 tale Exp $ +; $Id: changing1.db,v 1.5 2000/08/01 01:17:23 tale Exp $ $TTL 600 diff --git a/bin/tests/system/xferquota/ns1/changing2.db b/bin/tests/system/xferquota/ns1/changing2.db index 31b89f3bbe..7a241b25f9 100644 --- a/bin/tests/system/xferquota/ns1/changing2.db +++ b/bin/tests/system/xferquota/ns1/changing2.db @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: changing2.db,v 1.4 2000/07/27 09:41:30 tale Exp $ +; $Id: changing2.db,v 1.5 2000/08/01 01:17:24 tale Exp $ $TTL 600 diff --git a/bin/tests/system/xferquota/ns1/named.conf b/bin/tests/system/xferquota/ns1/named.conf index dfe4b74c01..60cb4dae38 100644 --- a/bin/tests/system/xferquota/ns1/named.conf +++ b/bin/tests/system/xferquota/ns1/named.conf @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.11 2000/07/27 09:41:32 tale Exp $ */ +/* $Id: named.conf,v 1.12 2000/08/01 01:17:25 tale Exp $ */ options { query-source address 10.53.0.1; diff --git a/bin/tests/system/xferquota/ns1/root.db b/bin/tests/system/xferquota/ns1/root.db index 0604180bce..f56740f4aa 100644 --- a/bin/tests/system/xferquota/ns1/root.db +++ b/bin/tests/system/xferquota/ns1/root.db @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,13 +13,13 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: root.db,v 1.5 2000/07/27 09:41:33 tale Exp $ +; $Id: root.db,v 1.6 2000/08/01 01:17:28 tale Exp $ $TTL 300 . IN SOA gson.nominum.com. a.root.servers.nil. ( 2000042100 ; serial 600 ; refresh - 600 ; retry + 600 ; retry 1200 ; expire 600 ; minimum ) diff --git a/bin/tests/system/xferquota/ns2/example.db b/bin/tests/system/xferquota/ns2/example.db index 297865c47e..51dc5277b0 100644 --- a/bin/tests/system/xferquota/ns2/example.db +++ b/bin/tests/system/xferquota/ns2/example.db @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: example.db,v 1.4 2000/07/27 09:41:34 tale Exp $ +; $Id: example.db,v 1.5 2000/08/01 01:17:29 tale Exp $ $ORIGIN . $TTL 300 ; 5 minutes diff --git a/bin/tests/system/xferquota/ns2/named.conf b/bin/tests/system/xferquota/ns2/named.conf index ef55869a2a..0b3685ada9 100644 --- a/bin/tests/system/xferquota/ns2/named.conf +++ b/bin/tests/system/xferquota/ns2/named.conf @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.9 2000/07/27 09:41:35 tale Exp $ */ +/* $Id: named.conf,v 1.10 2000/08/01 01:17:30 tale Exp $ */ options { query-source address 10.53.0.2; diff --git a/bin/tests/system/xferquota/ns2/root.hint b/bin/tests/system/xferquota/ns2/root.hint index 8dda6c8d4a..34737b43ca 100644 --- a/bin/tests/system/xferquota/ns2/root.hint +++ b/bin/tests/system/xferquota/ns2/root.hint @@ -1,9 +1,9 @@ ; 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 ; 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 @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: root.hint,v 1.4 2000/07/27 09:41:36 tale Exp $ +; $Id: root.hint,v 1.5 2000/08/01 01:17:31 tale Exp $ $TTL 999999 . IN NS a.root-servers.nil. diff --git a/bin/tests/system/xferquota/setup.pl b/bin/tests/system/xferquota/setup.pl index 7c99c85665..4e18ee2822 100644 --- a/bin/tests/system/xferquota/setup.pl +++ b/bin/tests/system/xferquota/setup.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.pl,v 1.8 2000/07/27 09:41:26 tale Exp $ +# $Id: setup.pl,v 1.9 2000/08/01 01:17:19 tale Exp $ # # Set up test data for zone transfer quota tests. diff --git a/bin/tests/system/xferquota/setup.sh b/bin/tests/system/xferquota/setup.sh index 3aca5b82a6..e595ec7158 100644 --- a/bin/tests/system/xferquota/setup.sh +++ b/bin/tests/system/xferquota/setup.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.9 2000/07/27 09:41:27 tale Exp $ +# $Id: setup.sh,v 1.10 2000/08/01 01:17:20 tale Exp $ # # Set up test data for zone transfer quota tests. diff --git a/bin/tests/system/xferquota/tests.sh b/bin/tests/system/xferquota/tests.sh index f925852750..6a667740a9 100644 --- a/bin/tests/system/xferquota/tests.sh +++ b/bin/tests/system/xferquota/tests.sh @@ -1,11 +1,11 @@ #!/bin/sh # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.18 2000/07/27 09:41:28 tale Exp $ +# $Id: tests.sh,v 1.19 2000/08/01 01:17:21 tale Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/t_api.pl b/bin/tests/t_api.pl index 5ce0ea3082..93f9700245 100644 --- a/bin/tests/t_api.pl +++ b/bin/tests/t_api.pl @@ -1,11 +1,11 @@ #!/usr/local/bin/perl # # Copyright (C) 1999, 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: t_api.pl,v 1.5 2000/07/27 09:38:32 tale Exp $ +# $Id: t_api.pl,v 1.6 2000/08/01 01:13:24 tale Exp $ require "getopts.pl"; diff --git a/bin/tests/task_test.c b/bin/tests/task_test.c index 201dfd8ee7..85afe793ca 100644 --- a/bin/tests/task_test.c +++ b/bin/tests/task_test.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1998-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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: task_test.c,v 1.45 2000/07/27 09:38:33 tale Exp $ */ +/* $Id: task_test.c,v 1.46 2000/08/01 01:13:25 tale Exp $ */ #include @@ -183,7 +183,7 @@ main(int argc, char *argv[]) { isc_timermgr_destroy(&timgr); isc_taskmgr_destroy(&manager); printf("destroyed\n"); - + isc_mem_stats(mctx, stdout); isc_mem_destroy(&mctx); diff --git a/bin/tests/tasks/Makefile.in b/bin/tests/tasks/Makefile.in index c06fd8c8c8..c9f4ee7a86 100644 --- a/bin/tests/tasks/Makefile.in +++ b/bin/tests/tasks/Makefile.in @@ -1,9 +1,9 @@ # Copyright (C) 1998-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 # 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 @@ -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 2000/07/27 09:41:37 tale Exp $ +# $Id: Makefile.in,v 1.20 2000/08/01 01:17:32 tale Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -32,7 +32,7 @@ TAPIDEPLIBS = ../../../lib/tests/libt_api.@A@ ISCDEPLIBS = ../../../lib/isc/libisc.@A@ TAPILIBS = ../../../lib/tests/libt_api.@A@ -DEPLIBS = ${TAPIDEPLIBS} ${ISCDEPLIBS} +DEPLIBS = ${TAPIDEPLIBS} ${ISCDEPLIBS} LIBS = ${TAPILIBS} ${ISCLIBS} @LIBS@ diff --git a/bin/tests/tasks/t_tasks.c b/bin/tests/tasks/t_tasks.c index 2f0b208674..214e36b0f4 100644 --- a/bin/tests/tasks/t_tasks.c +++ b/bin/tests/tasks/t_tasks.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1998-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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: t_tasks.c,v 1.17 2000/07/27 09:41:39 tale Exp $ */ +/* $Id: t_tasks.c,v 1.18 2000/08/01 01:17:34 tale Exp $ */ #include @@ -190,7 +190,7 @@ t_tasks1(void) { return(T_UNRESOLVED); } - + sleep(2); /* @@ -348,7 +348,7 @@ t_tasks1(void) { isc_timer_detach(&ti2); isc_timermgr_destroy(&timgr); isc_taskmgr_destroy(&manager); - + isc_mem_destroy(&mctx); return(T_PASS); } @@ -392,7 +392,7 @@ t2_shutdown(isc_task_t *task, isc_event_t *event) { t_info("isc_mutex_lock failed %d\n", isc_result); ++T2_nprobs; } - + T2_done = 1; isc_result = isc_condition_signal(&T2_cv); @@ -400,7 +400,7 @@ t2_shutdown(isc_task_t *task, isc_event_t *event) { t_info("isc_condition_signal failed %d\n", isc_result); ++T2_nprobs; } - + isc_result = isc_mutex_unlock(&T2_mx); if (isc_result != ISC_R_SUCCESS) { t_info("isc_mutex_unlock failed %d\n", isc_result); @@ -438,7 +438,7 @@ t2_callback(isc_task_t *task, isc_event_t *event) { ++T2_nfails; return; } - + isc_result = isc_task_onshutdown(newtask, t2_shutdown, (void *)task); if (isc_result != ISC_R_SUCCESS) { @@ -447,7 +447,7 @@ t2_callback(isc_task_t *task, isc_event_t *event) { ++T2_nfails; return; } - + isc_task_send(newtask, &event); } else { /* @@ -781,7 +781,7 @@ t_tasks3(void) { isc_result_totext(isc_result)); ++T3_nprobs; } - + isc_task_detach(&task); isc_taskmgr_destroy(&tmgr); @@ -1181,7 +1181,7 @@ t_tasks7(void) { isc_mem_destroy(&mctx); return(T_UNRESOLVED); } - + isc_result = isc_condition_waituntil(&T7_cv, &T7_mx, &now); if (isc_result != ISC_R_SUCCESS) { t_info("isc_condition_waituntil returned %s\n", @@ -1325,7 +1325,7 @@ t10_event2(isc_task_t *task, isc_event_t *event) { (T10_purge_tag == event->ev_tag)) { tag_match = 1; } - + if (sender_match && type_match && tag_match) { if (event->ev_attributes & ISC_EVENTATTR_NOPURGE) { t_info("event %p,%d,%d matched but was not purgable\n", @@ -1501,7 +1501,7 @@ t_taskpurge_x(int sender, int type, int tag, int purge_sender, (void *)(sender + sender_cnt), (isc_eventtype_t)(type + type_cnt), t10_event2, NULL, sizeof(*event)); - + eventtab[event_cnt]->ev_tag = (void *)((int)tag + tag_cnt); @@ -1597,7 +1597,7 @@ t_taskpurge_x(int sender, int type, int tag, int purge_sender, ++*nprobs; return; } - + isc_result = isc_condition_waituntil(&T10_cv, &T10_mx, &now); if (isc_result != ISC_R_SUCCESS) { t_info("isc_condition_waituntil returned %s\n", @@ -1925,7 +1925,7 @@ t_tasks11(int purgable) { isc_result_totext(isc_result)); ++T11_nprobs; } - + isc_result = isc_condition_waituntil(&T11_cv, &T11_mx, &now); if (isc_result != ISC_R_SUCCESS) { t_info("isc_condition_waituntil returned %s\n", @@ -1967,7 +1967,7 @@ static const char *a11 = "When the event is marked as purgable, a call to " "isc_task_purgeevent(task, event) purges the event 'event' " "from the task's queue and returns ISC_TRUE."; - + static void t11(void) { int result; @@ -2005,7 +2005,7 @@ static const char *a13 = "sender 'sender' and of type within the range 'first' " "to 'last' inclusive from the task's event queue and " "returns the number of tasks purged."; - + static int t_tasks13(void) { int result; diff --git a/bin/tests/timer_test.c b/bin/tests/timer_test.c index b55224ae0c..8f639c18f6 100644 --- a/bin/tests/timer_test.c +++ b/bin/tests/timer_test.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1998-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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: timer_test.c,v 1.33 2000/07/27 09:38:34 tale Exp $ */ +/* $Id: timer_test.c,v 1.34 2000/08/01 01:13:26 tale Exp $ */ #include @@ -74,7 +74,7 @@ timeout(isc_task_t *task, isc_event_t *event) { char *name = event->ev_arg; const char *type; - INSIST(event->ev_type == ISC_TIMEREVENT_IDLE || + INSIST(event->ev_type == ISC_TIMEREVENT_IDLE || event->ev_type == ISC_TIMEREVENT_LIFE); if (event->ev_type == ISC_TIMEREVENT_IDLE) @@ -140,7 +140,7 @@ main(int argc, char *argv[]) { RUNTIME_CHECK(isc_timer_create(timgr, isc_timertype_ticker, NULL, &interval, t1, tick, "1", &ti1) == ISC_R_SUCCESS); - + isc_interval_set(&interval, 10, 0); RUNTIME_CHECK(isc_time_add(&now, &interval, &expires) == ISC_R_SUCCESS); @@ -162,7 +162,7 @@ main(int argc, char *argv[]) { isc_timermgr_destroy(&timgr); isc_taskmgr_destroy(&manager); printf("destroyed\n"); - + printf("Statistics for mctx1:\n"); isc_mem_stats(mctx1, stdout); isc_mem_destroy(&mctx1); diff --git a/bin/tests/timers/Makefile.in b/bin/tests/timers/Makefile.in index f1d1064820..9a7dd50a4e 100644 --- a/bin/tests/timers/Makefile.in +++ b/bin/tests/timers/Makefile.in @@ -1,9 +1,9 @@ # Copyright (C) 1999, 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 # 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 @@ -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 2000/07/27 09:41:40 tale Exp $ +# $Id: Makefile.in,v 1.18 2000/08/01 01:17:35 tale Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/bin/tests/timers/t_timers.c b/bin/tests/timers/t_timers.c index a417f98e8e..922b231cd9 100644 --- a/bin/tests/timers/t_timers.c +++ b/bin/tests/timers/t_timers.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: t_timers.c,v 1.13 2000/07/27 09:41:41 tale Exp $ */ +/* $Id: t_timers.c,v 1.14 2000/08/01 01:17:37 tale Exp $ */ #include diff --git a/bin/tests/tkey_test.c b/bin/tests/tkey_test.c index aa62aab107..6e4e550582 100644 --- a/bin/tests/tkey_test.c +++ b/bin/tests/tkey_test.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: tkey_test.c,v 1.28 2000/07/27 09:38:35 tale Exp $ */ +/* $Id: tkey_test.c,v 1.29 2000/08/01 01:13:27 tale Exp $ */ /* * Principal Author: Brian Wellington (core copied from res_test.c) @@ -261,7 +261,7 @@ buildquery(void) { isc_buffer_length(nonce), NULL, ISC_ENTROPY_BLOCKING); CHECK("isc_entropy_getdata", result); - + query = NULL; result = dns_message_create(mctx, DNS_MESSAGE_INTENTRENDER, &query); CHECK("dns_message_create", result); diff --git a/bin/tests/update_test.pl b/bin/tests/update_test.pl index f8ca1d7503..a11a998838 100755 --- a/bin/tests/update_test.pl +++ b/bin/tests/update_test.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl # # Copyright (C) 1999, 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 # 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 @@ -25,8 +25,8 @@ # The server defaults to 127.0.0.1. # The port defaults to 53. # -# The "Special NS rules" tests will only work correctly if the -# has no NS records to begin with, or alternatively has a +# The "Special NS rules" tests will only work correctly if the +# has no NS records to begin with, or alternatively has a # single NS record pointing at the name "ns1" (relative to # the zone name). # @@ -37,7 +37,7 @@ # # perl -MCPAN -e "install Net::DNS" # -# $Id: update_test.pl,v 1.5 2000/07/27 09:38:36 tale Exp $ +# $Id: update_test.pl,v 1.6 2000/08/01 01:13:28 tale Exp $ # use Getopt::Std; @@ -76,11 +76,11 @@ sub test { my ($expected, @records) = @_; my $update = new Net::DNS::Update("$zone"); - + foreach $rec (@records) { $update->push(@$rec); } - + $reply = $res->send($update); # Did it work? @@ -168,7 +168,7 @@ test("NOERROR", ["update", rr_add("e.$zone 300 A 73.80.65.50")]); test("NOERROR", ["update", rr_add("e.$zone 300 A 73.80.65.52"), - rr_add("f.$zone 300 A 73.80.65.52"), + rr_add("f.$zone 300 A 73.80.65.52"), rr_add("e.$zone 300 A 73.80.65.51")]); test("NOERROR", ["update", rr_add("e.$zone 300 TXT 'three'"), diff --git a/bin/tests/wire_test.c b/bin/tests/wire_test.c index c5a36c0b2d..9e503df611 100644 --- a/bin/tests/wire_test.c +++ b/bin/tests/wire_test.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: wire_test.c,v 1.51 2000/07/27 09:38:38 tale Exp $ */ +/* $Id: wire_test.c,v 1.52 2000/08/01 01:13:29 tale Exp $ */ #include @@ -70,7 +70,7 @@ main(int argc, char *argv[]) { mctx = NULL; RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS); - + if (argc > 1) { f = fopen(argv[1], "r"); if (f == NULL) { diff --git a/bin/tests/wire_test.data b/bin/tests/wire_test.data index 690447a4bb..cbda58687b 100644 --- a/bin/tests/wire_test.data +++ b/bin/tests/wire_test.data @@ -1,9 +1,9 @@ 000a 8580 0001 0003 0000 0003 # message header 0376697803636f6d00 0002 0001 # question section: vix.com IN NS -c00c 0002 0001 00000e10 # vix.com IN NS 3600 +c00c 0002 0001 00000e10 # vix.com IN NS 3600 000b 056973727631027061c00c # rdlen=0xb isrv1.pa.vix.com c00c 0002 0001 00000e10 0009 066e732d657874c00c c00c 0002 0001 00000e10 000e 036e733104676e616303636f6d00 -c025 0001 0001 00000e10 0004 cc98b886 +c025 0001 0001 00000e10 0004 cc98b886 c03c 0001 0001 00000e10 0004 cc98b840 c051 0001 0001 0002a14a 0004 c697f8f6 diff --git a/bin/tests/zone2_test.c b/bin/tests/zone2_test.c index 5f3eaf62c5..805d09a1f2 100644 --- a/bin/tests/zone2_test.c +++ b/bin/tests/zone2_test.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: zone2_test.c,v 1.19 2000/07/27 09:38:39 tale Exp $ */ +/* $Id: zone2_test.c,v 1.20 2000/08/01 01:13:32 tale Exp $ */ #include @@ -205,7 +205,7 @@ query(dns_view_t *view) { dns_rdataset_init(&sigset); do { - + fprintf(stdout, "zone_test "); fflush(stdout); FD_ZERO(&rfdset); @@ -216,7 +216,7 @@ query(dns_view_t *view) { break; } buf[sizeof(buf) - 1] = '\0'; - + s = strchr(buf, '\n'); if (s != NULL) *s = '\0'; @@ -247,7 +247,7 @@ query(dns_view_t *view) { result = dns_name_fromtext(dns_fixedname_name(&name), &buffer, dns_rootname, ISC_FALSE, NULL); ERRCONT(result, "dns_name_fromtext"); - + if (reload) { dns_zone_t *zone = NULL; result = dns_zt_find(view->zonetable, @@ -274,7 +274,7 @@ query(dns_view_t *view) { dns_result_totext(result)); switch (result) { case ISC_R_SUCCESS: - print_rdataset(dns_fixedname_name(&name), + print_rdataset(dns_fixedname_name(&name), &rdataset); break; default: diff --git a/bin/tests/zone_test.c b/bin/tests/zone_test.c index 04464047ed..602d71d1b0 100644 --- a/bin/tests/zone_test.c +++ b/bin/tests/zone_test.c @@ -1,10 +1,10 @@ /* * Copyright (C) 1999, 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: zone_test.c,v 1.21 2000/07/27 09:38:40 tale Exp $ */ +/* $Id: zone_test.c,v 1.22 2000/08/01 01:13:33 tale Exp $ */ #include @@ -97,7 +97,7 @@ setup(char *zonename, char *filename, char *classname) { &buffer, dns_rootname, ISC_FALSE, NULL); ERRRET(result, "dns_name_fromtext"); origin = dns_fixedname_name(&fixorigin); - + result = dns_zone_setorigin(zone, origin); ERRRET(result, "dns_zone_setorigin"); @@ -109,7 +109,7 @@ setup(char *zonename, char *filename, char *classname) { region.base = classname; region.length = strlen(classname); - result = dns_rdataclass_fromtext(&rdclass, ®ion); + result = dns_rdataclass_fromtext(&rdclass, ®ion); ERRRET(result, "dns_rdataclass_fromtext"); dns_zone_setclass(zone, rdclass); @@ -167,7 +167,7 @@ query(void) { dns_rdataset_init(&sigset); do { - + fprintf(stdout, "zone_test "); fflush(stdout); FD_ZERO(&rfdset); @@ -178,7 +178,7 @@ query(void) { break; } buf[sizeof(buf) - 1] = '\0'; - + s = strchr(buf, '\n'); if (s != NULL) *s = '\0'; @@ -197,7 +197,7 @@ query(void) { result = dns_name_fromtext(dns_fixedname_name(&name), &buffer, dns_rootname, ISC_FALSE, NULL); ERRCONT(result, "dns_name_fromtext"); - + result = dns_db_find(db, dns_fixedname_name(&name), NULL /*vesion*/, dns_rdatatype_a, diff --git a/config.guess b/config.guess index 6cb567b8ae..993d33f90d 100644 --- a/config.guess +++ b/config.guess @@ -226,7 +226,7 @@ EOF exit 0 ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor + # "atarist" or "atariste" at least should have a processor # > m68000). The system name ranges from "MiNT" over "FreeMiNT" # to the lowercase version "mint" (or "freemint"). Finally # the system name "TOS" denotes a system which is actually not @@ -668,7 +668,7 @@ EOF if test "$?" = 0 ; then LIBC="libc1" fi - fi + fi rm -f $dummy.c $dummy echo powerpc-unknown-linux-gnu${LIBC} ; exit 0 ;; esac diff --git a/config.h.in b/config.h.in index b52ef9a54b..0df1714709 100644 --- a/config.h.in +++ b/config.h.in @@ -1,11 +1,11 @@ /* config.h.in. Generated automatically from configure.in by autoheader. */ /* * Copyright (C) 1999, 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 * 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 diff --git a/config.status.win32 b/config.status.win32 index a74b2c18c3..e0aec41427 100755 --- a/config.status.win32 +++ b/config.status.win32 @@ -4,7 +4,7 @@ # This directory was configured as follows, # on host gro.dd.org: # -# ./configure +# ./configure # # Compiler output produced by configure, useful for debugging # configure, is in ./config.log if it exists. @@ -30,7 +30,7 @@ case $# in 0) dstdir=g:/work/bind9-nt ;; -1) +1) dstdir=$1 ;; *) diff --git a/configure b/configure index c8729e0236..67b04e2481 100755 --- a/configure +++ b/configure @@ -1,11 +1,11 @@ #! /bin/sh # Copyright (C) 1996-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 # 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 @@ -15,7 +15,7 @@ # ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS # SOFTWARE. -# From configure.in Revision: 1.169 +# From configure.in Revision: 1.169 ## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*- ## Copyright (C) 1996-1999 Free Software Foundation, Inc. @@ -114,7 +114,7 @@ # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.13 +# Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -841,13 +841,13 @@ else /*) ac_cv_path_AR="$AR" # Let the user override the test with a path. ;; - ?:/*) + ?:/*) ac_cv_path_AR="$AR" # Let the user override the test with a dos path. ;; *) IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" - for ac_dir in $ac_dummy; do + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_path_AR="$ac_dir/$ac_word" @@ -876,7 +876,7 @@ LN=ln case "$AR" in "") - { echo "configure: error: + { echo "configure: error: ar program not found. Please fix your PATH to include the directory in which ar resides, or set AR in the environment with the full path to ar. " 1>&2; exit 1; } @@ -897,13 +897,13 @@ else /*) ac_cv_path_ETAGS="$ETAGS" # Let the user override the test with a path. ;; - ?:/*) + ?:/*) ac_cv_path_ETAGS="$ETAGS" # Let the user override the test with a dos path. ;; *) IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" - for ac_dir in $ac_dummy; do + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_path_ETAGS="$ac_dir/$ac_word" @@ -942,13 +942,13 @@ else /*) ac_cv_path_PERL="$PERL" # Let the user override the test with a path. ;; - ?:/*) + ?:/*) ac_cv_path_PERL="$PERL" # Let the user override the test with a dos path. ;; *) IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" - for ac_dir in $ac_dummy; do + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_path_PERL="$ac_dir/$ac_word" @@ -1021,9 +1021,9 @@ case "$INSTALL" in # # Not all systems have dirname. # - + ac_dir="`echo $INSTALL | sed 's%/[^/]*$%%'`" - + ac_prog="`echo $INSTALL | sed 's%.*/%%'`" test "$ac_dir" = "$ac_prog" && ac_dir=. @@ -1213,7 +1213,7 @@ DNS_OPENSSL_LIBS="" # # NetBSD has multiple pthreads implementations. The recommended -# one to use is "unproven-pthreads". The older "mit-pthreads" +# one to use is "unproven-pthreads". The older "mit-pthreads" # may also work on some NetBSD versions. The PTL2 thread # library does not currently work with bind9, but can be # chosen with the --with-ptl2 option for those who wish to @@ -1740,7 +1740,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then cat >> confdefs.h <&6 fi @@ -1817,7 +1817,7 @@ fi echo "$ac_t""$ac_cv_c_const" 1>&6 if test $ac_cv_c_const = no; then cat >> confdefs.h <<\EOF -#define const +#define const EOF fi @@ -1853,7 +1853,7 @@ echo "$ac_t""$ac_cv_c_inline" 1>&6 case "$ac_cv_c_inline" in inline | yes) ;; no) cat >> confdefs.h <<\EOF -#define inline +#define inline EOF ;; *) cat >> confdefs.h <>./config.log O=o A=a LIBTOOL= - + ;; esac @@ -4145,7 +4145,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then cat >> confdefs.h <&6 fi @@ -4185,7 +4185,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then cat >> confdefs.h <&6 fi @@ -4228,7 +4228,7 @@ case "$hack_shutup_sigwait" in yes) # # Shut up a -Wmissing-prototypes warning for sigwait(). - # + # cat >> confdefs.h <<\EOF #define SHUTUP_SIGWAIT 1 EOF diff --git a/configure.in b/configure.in index 47c91c5995..87c1769fd8 100644 --- a/configure.in +++ b/configure.in @@ -1,9 +1,9 @@ # Copyright (C) 1998-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 # 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 @@ -18,7 +18,7 @@ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl esyscmd([sed "s/^/# /" COPYRIGHT])dnl AC_DIVERT_POP()dnl -AC_REVISION($Revision: 1.170 $) +AC_REVISION($Revision: 1.171 $) AC_INIT(lib/dns/name.c) AC_PREREQ(2.13) @@ -217,7 +217,7 @@ AC_SUBST(DNS_OPENSSL_LIBS) # # NetBSD has multiple pthreads implementations. The recommended -# one to use is "unproven-pthreads". The older "mit-pthreads" +# one to use is "unproven-pthreads". The older "mit-pthreads" # may also work on some NetBSD versions. The PTL2 thread # library does not currently work with bind9, but can be # chosen with the --with-ptl2 option for those who wish to @@ -940,7 +940,7 @@ case "$hack_shutup_sigwait" in yes) # # Shut up a -Wmissing-prototypes warning for sigwait(). - # + # AC_DEFINE(SHUTUP_SIGWAIT) ;; esac diff --git a/conftools/perllib/dnsconf/DNSConf-macros.h b/conftools/perllib/dnsconf/DNSConf-macros.h index 4b10908e42..ae5517fffe 100644 --- a/conftools/perllib/dnsconf/DNSConf-macros.h +++ b/conftools/perllib/dnsconf/DNSConf-macros.h @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: DNSConf-macros.h,v 1.4 2000/07/27 09:41:42 tale Exp $ */ +/* $Id: DNSConf-macros.h,v 1.5 2000/08/01 01:17:38 tale Exp $ */ #define CONCAT(a,b) a ## b #define DNSCONF_SET_STRING(FIELD) \ @@ -34,7 +34,7 @@ void CONCAT(DNSConf_set, FIELD)(DNSConf *cfg, const char *arg) { \ CONCAT(dns_c_ctx_unset, FIELD)(cfg->confctx); \ } else \ CONCAT(dns_c_ctx_set, FIELD)(cfg->confctx, arg); \ -} +} #define DNSCONF_GET_STRING(FIELD) \ char * CONCAT(DNSConf_get, FIELD)(DNSConf *cfg) { \ diff --git a/conftools/perllib/dnsconf/DNSConf.i b/conftools/perllib/dnsconf/DNSConf.i index f33b535b63..2a3c44bdeb 100644 --- a/conftools/perllib/dnsconf/DNSConf.i +++ b/conftools/perllib/dnsconf/DNSConf.i @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: DNSConf.i,v 1.4 2000/07/27 09:41:43 tale Exp $ */ +/* $Id: DNSConf.i,v 1.5 2000/08/01 01:17:40 tale Exp $ */ %module DNSConf @@ -35,7 +35,7 @@ #else #define DBGPRINT ((void) 0) #endif - + static struct { isc_mem_t *mem; isc_log_t *log; @@ -60,7 +60,7 @@ int xprintf(const char *fmt, ...) { int ctx_init(void) { int returnval = 0; - + DBGPRINT("Starting ctx_init()\n"); if (ctx.mem != NULL) { @@ -73,11 +73,11 @@ int ctx_init(void) { if (isc_log_create(ctx.mem, &ctx.log, &ctx.logcfg) != ISC_R_SUCCESS) goto done; - + isc_log_setcontext(ctx.log); dns_log_init(ctx.log); dns_log_setcontext(ctx.log); - + if (isc_log_usechannel(ctx.logcfg, "default_stderr", NULL, NULL) != ISC_R_SUCCESS) goto done; @@ -92,7 +92,7 @@ done: DBGPRINT("Finished ctx_init()\n"); return (returnval); -} +} void *ctx_destroy(void) { DBGPRINT("starting ctx_destroy()\n"); @@ -108,7 +108,7 @@ void *ctx_destroy(void) { } DBGPRINT("destroying ctx\n"); - + dns_lctx = NULL; isc_log_destroy(&ctx.log); isc_mem_destroy(&ctx.mem); @@ -145,15 +145,15 @@ void delete_DNSConf(DNSConf *ctx) { } int DNSConf_parse(DNSConf *conf, const char *filename) { - + DBGPRINT("inside parse\n"); - + if (!ctx_init()) return; clear_DNSConf(conf); - if (dns_c_parse_namedconf(filename, ctx.mem, &conf->confctx, NULL) + if (dns_c_parse_namedconf(filename, ctx.mem, &conf->confctx, NULL) == ISC_R_SUCCESS) { ctx.count++; @@ -166,13 +166,13 @@ int DNSConf_parse(DNSConf *conf, const char *filename) { } int DNSConf_initctx(DNSConf *cfg) { - if (cfg == NULL) + if (cfg == NULL) return 0; - if (cfg->confctx != NULL) + if (cfg->confctx != NULL) return 1; - - if (!ctx_init()) + + if (!ctx_init()) return 0; if (dns_c_ctx_new(ctx.mem, &cfg->confctx) != ISC_R_SUCCESS) @@ -185,12 +185,12 @@ int DNSConf_initctx(DNSConf *cfg) { return 1; } - + void DNSConf_print(DNSConf *ptr, FILE *outfile) { DBGPRINT("inside print\n"); - + if (ptr == NULL || ptr->confctx == NULL) return; @@ -199,12 +199,12 @@ void DNSConf_print(DNSConf *ptr, FILE *outfile) { #if 0 - + void DNSConf_setdirectory(DNSConf *cfg, const char *directory) { DBGPRINT("inside DNSConf_setdirectory\n"); - if (!DNSConf_initctx(cfg)) + if (!DNSConf_initctx(cfg)) return; if (directory == NULL) { @@ -213,9 +213,9 @@ void DNSConf_setdirectory(DNSConf *cfg, const char *directory) { } else if (*directory == '\0') { DBGPRINT("empty string\n"); dns_c_ctx_unsetdirectory(cfg->confctx); - } else + } else dns_c_ctx_setdirectory(cfg->confctx, directory); -} +} char *DNSConf_getdirectory(DNSConf *cfg) { char *dir = NULL; @@ -225,7 +225,7 @@ char *DNSConf_getdirectory(DNSConf *cfg) { return NULL; tmpres = dns_c_ctx_getdirectory(cfg->confctx, &dir); - if (tmpres == ISC_R_NOTFOUND) + if (tmpres == ISC_R_NOTFOUND) return NULL; return dir; @@ -247,15 +247,15 @@ void DNSConf_settransfersin(DNSConf *cfg, unsigned int *transfersin) { DBGPRINT("inside DNSConf_settransfersin %p\n", transfersin); - if (!DNSConf_initctx(cfg)) + if (!DNSConf_initctx(cfg)) return; if (transfersin == NULL) { DBGPRINT("null pointer\n"); dns_c_ctx_unsettransfersin(cfg->confctx); - } else + } else dns_c_ctx_settransfersin(cfg->confctx, transfersin); -} +} unsigned int DNSConf_gettransfersin(DNSConf *cfg) { unsigned int result; @@ -265,7 +265,7 @@ unsigned int DNSConf_gettransfersin(DNSConf *cfg) { return NULL; tmpres = dns_c_ctx_gettransfersin(cfg->confctx, &result); - if (tmpres == ISC_R_NOTFOUND) + if (tmpres == ISC_R_NOTFOUND) return NULL; return result; @@ -300,8 +300,8 @@ INT_FIELD_DEFS(maxncachettl) INT_FIELD_DEFS(maxcachettl) -#endif - +#endif + %} @@ -347,4 +347,4 @@ struct DNSConf { }; - + diff --git a/conftools/perllib/dnsconf/Makefile.PL b/conftools/perllib/dnsconf/Makefile.PL index 38dbe24ba1..85d889affa 100644 --- a/conftools/perllib/dnsconf/Makefile.PL +++ b/conftools/perllib/dnsconf/Makefile.PL @@ -1,9 +1,9 @@ # 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 # 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 @@ -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.PL,v 1.4 2000/07/27 09:41:45 tale Exp $ +# $Id: Makefile.PL,v 1.5 2000/08/01 01:17:41 tale Exp $ use ExtUtils::MakeMaker; diff --git a/conftools/perllib/dnsconf/named1.conf b/conftools/perllib/dnsconf/named1.conf index c1d61c7f50..e2b140804f 100644 --- a/conftools/perllib/dnsconf/named1.conf +++ b/conftools/perllib/dnsconf/named1.conf @@ -1,10 +1,10 @@ /* * 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 * 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 @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named1.conf,v 1.4 2000/07/27 09:41:46 tale Exp $ */ +/* $Id: named1.conf,v 1.5 2000/08/01 01:17:42 tale Exp $ */ options { # port 8888; @@ -40,7 +40,7 @@ zone "." { }; #view "default-view" IN { -# +# # zone "." { # type hint; # file "/etc/namedb/root.cache"; diff --git a/conftools/perllib/dnsconf/test.pl b/conftools/perllib/dnsconf/test.pl index a01335e06f..73591687f8 100644 --- a/conftools/perllib/dnsconf/test.pl +++ b/conftools/perllib/dnsconf/test.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: test.pl,v 1.4 2000/07/27 09:41:47 tale Exp $ +# $Id: test.pl,v 1.5 2000/08/01 01:17:44 tale Exp $ push(@ARGV, "/etc/named.conf") if ! @ARGV; diff --git a/contrib/named-bootconf/named-bootconf.sh b/contrib/named-bootconf/named-bootconf.sh index e0e45209f9..4b4b48626a 100644 --- a/contrib/named-bootconf/named-bootconf.sh +++ b/contrib/named-bootconf/named-bootconf.sh @@ -1,11 +1,11 @@ #!/bin/sh # # Portions Copyright (C) 1999, 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: named-bootconf.sh,v 1.5 2000/07/27 09:41:48 tale Exp $ +# $Id: named-bootconf.sh,v 1.6 2000/08/01 01:17:45 tale Exp $ # $NetBSD: named-bootconf.sh,v 1.5 1998/12/15 01:00:53 tron Exp $ # @@ -97,7 +97,7 @@ while read CMD ARGS; do DIRECTORY=$1 export DIRECTORY fi - ;; + ;; forwarders ) (cat $COMMENTFILE echo " forwarders {" diff --git a/contrib/nanny/nanny.pl b/contrib/nanny/nanny.pl index 7341303804..650dc396f3 100644 --- a/contrib/nanny/nanny.pl +++ b/contrib/nanny/nanny.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl # # 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 # 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 @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: nanny.pl,v 1.6 2000/07/27 09:41:49 tale Exp $ +# $Id: nanny.pl,v 1.7 2000/08/01 01:17:47 tale Exp $ # A simple nanny to make sure named stays running. @@ -32,7 +32,7 @@ for (;;) { $pid = ; close(FILE); chomp($pid); - + $res = kill 0, $pid; goto restart if ($res == 0); diff --git a/doc/arm/Bv9ARM.1.html b/doc/arm/Bv9ARM.1.html index bd649f5ab0..c5929ee836 100644 --- a/doc/arm/Bv9ARM.1.html +++ b/doc/arm/Bv9ARM.1.html @@ -1,11 +1,11 @@ - + diff --git a/doc/arm/Bv9ARM.2.html b/doc/arm/Bv9ARM.2.html index 9af0fd85bd..df301c6150 100644 --- a/doc/arm/Bv9ARM.2.html +++ b/doc/arm/Bv9ARM.2.html @@ -1,11 +1,11 @@ - + diff --git a/doc/arm/Bv9ARM.3.html b/doc/arm/Bv9ARM.3.html index 4f31f91b79..b33cd78800 100644 --- a/doc/arm/Bv9ARM.3.html +++ b/doc/arm/Bv9ARM.3.html @@ -1,11 +1,11 @@ - + Section 3. Nameserver Configuration

    Section 3. Nameserver Configuration

In this section we provide some suggested configurations along with guidelines for their use. We also address the topic of reasonable option setting.

    3.1 Sample Configurations

    3.1.1 A Caching-only Nameserver

The following sample configuration is appropriate for a caching-only name server for use by clients internal to a corporation. All queries from outside clients are refused.


// Two corporate subnets we wish to allow queries from.
acl "corpnets" { 192.168.4.0/24; 192.168.7.0/24; };
options {
     directory "/etc/namedb";		// Working directory
     pid-file "named.pid";		// Put pid file in working dir
     allow-query { "corpnets "; };
};
// Root server hints
zone "." { type hint; file "root.hint"; };
// Provide a reverse mapping for the loopback address 127.0.0.1
zone "0.0.127.in-addr.arpa" {
     type master;
     file "localhost.rev";
     notify no;

};

    3.1.2 An Authoritative-only Nameserver

This sample configuration is for an authoritative-only server that is the master server for " example.com " and a slave for the subdomain " eng.example.com ".

options {
     directory "/etc/namedb";		// Working directory
     pid-file "named.pid";		// Put pid file in working dir
     allow-query { any; };		// This is the default
     recursion no;			// Do not provide recursive service
};
// Root server hints
zone "." { type hint; file "root.hint"; }; 

// Provide a reverse mapping for the loopback address 127.0.0.1
     zone "0.0.127.in-addr.arpa" {
     type master;
     file "localhost.rev";
     notify no;
};
// We are the master server for example.com
zone "example.com" {
     type master;
     file "example.com.db";
     // IP addresses of slave servers allowed to transfer example.com
     allow-transfer {
          192.168.4.14;
          192.168.5.53;
     };
};

// We are a slave server for eng.example.com
zone "eng.example.com" {
     type slave;
     file "eng.example.com.bk";
     // IP address of eng.example.com master server
     masters { 192.168.4.12; };
};

    3.2 Load Balancing

Primitive load balancing can be achieved in DNS using multiple A records for one name.

For example, if you have three WWW servers with network addresses of 10.0.0.1, 10.0.0.2 and 10.0.0.3, a set of records such as the following means that clients will connect to each machine one third of the time:


 

Name

TTL

CLASS

TYPE

Resource Record (RR) Data

www

600

IN

A

10.0.0.1

 

600

IN

A

10.0.0.2

 

600

IN

A

10.0.0.3

When a resolver queries for these records, BIND will rotate them and respond to the query with the records in a different order. In the example above, clients will randomly receive records in the order 1, 2, 3; 2, 3, 1; and 3, 1, 2. Most clients will use the first record returned and discard the rest.

For more detail on ordering responses, check the rrset-order substatement in the options statement under RRset Ordering. This substatement is not supported in BIND 9, and only the ordering scheme described above is available.

    3.3 Notify

DNS Notify is a mechanism that allows master nameservers to notify their slave servers of changes to a zone's data. In response to a NOTIFY from a master server, the slave will check to see that its version of the zone is the current version and, if not, initiate a transfer.

DNS Notify is fully documented in RFC 1996. See also the description of the zone option also-notify under Zone Transfers . More information about notify can be found under Boolean Options .

    3.4 Nameserver Operations

    3.4.1 Tools for Use With the Nameserver Daemon

There are several indispensable diagnostic, administrative and monitoring tools available to the system administrator for controlling and debugging the nameserver daemon. We describe several in this section

    3.4.1.1 Diagnostic Tools
dig

The domain information groper ( dig ) is a command line tool that can be used to gather information from the Domain Name System servers. Dig has two modes: simple interactive mode for a single query, and batch mode which executes a query for each in a list of several query lines. All query options are accessible from the command line.

Usage

dig [@server] domain [<query-type>] [<query-class>]
     [+<query-option>] [-<dig-option>] [%comment]

The usual simple use of dig will take the form


dig @server domain query-type query-class

For more information and a list of available commands and options, see the dig man page.

host

The host utility provides a simple DNS lookup using a command-line interface for looking up Internet hostnames. By default, the utility converts between host names and Internet addresses, but its functionality can be extended with the use of options.

Usage

host [-aCdlrTwv] [-c class] [-N ndots] [-t type]
     [-W timeout] [-R retries] hostname [server]
For more information and a list of available commands and options, see the host man page.

nslookup

nslookup is a program used to query Internet domain nameservers. nslookup has two modes: interactive and non-interactive. Interactive mode allows the user to query nameservers for information about various hosts and domains or to print a list of hosts in a domain. Non-interactive mode is used to print just the name and requested information for a host or domain.

Usage

nslookup [-option ...] [host-to-find | -[server]]

Interactive mode is entered when no arguments are given (the default nameserver will be used) or when the first argument is a hyphen (`-') and the second argument is the host name or Internet address of a nameserver.

Non-interactive mode is used when the name or Internet address of the host to be looked up is given as the first argument. The optional second argument specifies the host name or address of a nameserver.

The options listed under the "set" command (see the nslookup man page for details) can be specified in the .nslookuprc file in the user's home directory if they are listed one per line. Options can also be specified on the command line if they precede the arguments and are prefixed with a hyphen. For example, to change the default query type to host information, and the initial time-out to 10 seconds, type:


nslookup -query=hinfo -timeout=10

For more information and a list of available commands and options, see the nslookup man page.

Due to its arcane user interface and frequently inconsistent behavior, we do not recommend the use of nslookup , and it is not installed by default when installing BIND 9. Use dig instead.

    3.4.1.2 Administrative Tools

Administrative tools play an integral part in the management of a server.

rndc

The remote name daemon control (rndc) program allows the system administrator to control the operation of a nameserver. If you run (rndc) without any options it will display a usage message as follows:

Usage
rndc [-c config] [-s server] [-p port] [-y key] command [command ...]
command is one of the following for named:
*status Display ps(1) status of named.
*dumpdb Dump database and cache to /var/tmp/named_dump.db.
reload Reload configuration file and zones.
*stats Dump statistics to /var/tmp/named.stats.
*trace Increment debugging level by one.
*notrace Set debugging level to 0.
*querylog Toggle query logging.
*stop Stop the server.
*restart Restart the server.
* == not yet implemented

As noted above, "reload" is the only command available for BIND 9.0.0. The other commands, and more, are planned to be implemented for future releases.

A configuration file is required, since all communication with the server is authenticated with digital signatures that rely on a shared secret, and there is no way to provide that secret other than with a configuration file. The default location for the rndc configuration file is /etc/rndc.conf, but an alternate location can be specified with the "-c" option.

The format of the configuration file is similar to that of named.conf, but limited to only three statements, the options{}, key{} and server{} statements. These statements are what associate the secret keys to the servers with which they are meant to be shared. The order of statements is not significant.

The options{} statement has two clauses: default-server and default-key. default-server takes a host name or address argument and represents the server that will be contacted if no "-s" option is provided on the command line. default-key takes the name of the key as its argument, as defined by a key{} statement. In the future a default-port clause will be added to specify the port to which rndc should connect.

The key{} statement names a key with its string argument. The string is required by the server to be a valid domain name, though it need not actually be hierarchical; thus, a string like "rndc_key" is a valid name. The key{} statement has two clauses: algorithm and secret. While the configuration parser will accept any string as the argument to algorithm, currently only the string "hmac-md5" has any meaning. The secret is a base-64 encoded string, typically generated with either dnssec-keygen or mmencode.

The server{} statement uses the key clause to associate a key{}-defined key with a server. The argument to the server{} statement is a host name or address (addresses must be double quoted). The argument to the key clause is the name of key as defined by the key{} statement. A port clause will be added to a future release to specify the port to which rndc should connect on the given server.

A sample minimal configuration file is as follows:

key rndc_key {
     algorithm "hmac-md5";
     secret "c3Ryb25nIGVub3VnaCBmb3IgYSBtYW4gYnV0IG1hZGUgZm9yIGEgd29tYW4K";
};
options {
     default-server localhost;
     default-key rndc_key;
};

This file, if installed as /etc/rndc.conf, would allow the command:

$ rndc reload

to connect to 127.0.0.1 port 953 and cause the nameserver to reload, if a nameserver on the local machine were running with following controls statements:

controls {
     inet 127.0.0.1 allow { localhost; } keys { rndc_key; };         
};

and it had an identical key statement for rndc_key.

 

3.4.2 Signals

Certain UNIX signals cause the name server to take specific actions, as described in the following table. These signals can be sent using the kill command.

 

SIGHUP

Causes the server to read named.conf and reload the database.

SIGTERM

Causes the server to clean up and exit.

SIGINT

Causes the server to clean up and exit.

Return to BIND 9 Administrator Reference Manual table of contents.

\ No newline at end of file diff --git a/doc/arm/Bv9ARM.4.html b/doc/arm/Bv9ARM.4.html index c449187191..36d013234f 100644 --- a/doc/arm/Bv9ARM.4.html +++ b/doc/arm/Bv9ARM.4.html @@ -1,11 +1,11 @@ - + @@ -340,7 +340,7 @@ External (bastion host) DNS server config: 
 acl internals { 172.16.72.0/24; 192.168.1.0/24; };
-acl externals { 
+acl externals {
 bastion-ips-go-here; };
 options {
   ...
@@ -800,7 +800,7 @@ dnssec-makekeyset
 The following command generates a key set containing the above key and another key similarly generated, with a TTL of 3600 and a signature validity period of 10 days starting from now.

 
 
-dnssec-makekeyset -t 3600 -e +864000 Kchild.example.+003+12345 
+dnssec-makekeyset -t 3600 -e +864000 Kchild.example.+003+12345
 Kchild.example.+003+23456
 

 
@@ -840,7 +840,7 @@ child.example
 The following command signs the child's key set with the zone keys:

 
 
-dnssec-signkey grand.child.example.keyset Kchild.example.+003+12345 
+dnssec-signkey grand.child.example.keyset Kchild.example.+003+12345
 Kchild.example.+003+23456
 

 
diff --git a/doc/arm/Bv9ARM.5.html b/doc/arm/Bv9ARM.5.html
index a1feb0b59a..1c8c4bc4b0 100644
--- a/doc/arm/Bv9ARM.5.html
+++ b/doc/arm/Bv9ARM.5.html
@@ -1,11 +1,11 @@
 
 
 
-
+
 
 
 
diff --git a/doc/arm/Bv9ARM.6.html b/doc/arm/Bv9ARM.6.html
index 88f6ed9a69..9248c123d6 100644
--- a/doc/arm/Bv9ARM.6.html
+++ b/doc/arm/Bv9ARM.6.html
@@ -1,11 +1,11 @@
 
 
 
-
+
 
 
 
@@ -805,8 +805,8 @@ options
 6.2.1	
 acl Statement Grammar
 

-acl acl-name { 
-    address_match_list 
+acl acl-name {
+    address_match_list
 };
 

 
@@ -1361,7 +1361,7 @@ the category Phrase
         file "<stderr>";			// this is illustrative only;
 						// there's currently no way of
 						// specifying an internal file
-						// descriptor in the 
+						// descriptor in the
 						// configuration language.
         severity info;				// only send priority info
 						// and higher
@@ -3432,7 +3432,7 @@ rrset-order
 An 
 order_spec
  is defined as follows:

- 
+
 
 [ class class_name  ][ type type_name ][ name "domain_name"]
      order ordering
@@ -3971,7 +3971,7 @@ view
 Here is an example of a typical split DNS setup implemented using 
 view
  statements.

- 
+
 
 
 view "internal" {
@@ -4013,7 +4013,7 @@ zone
 
 
 

-zone zone name [class] [{ 
+zone zone name [class] [{
     type ( master|slave|hint|stub|forward ) ;
     [ allow-query { address_match_list } ; ]
     [ allow-transfer { address_match_list } ; ]
diff --git a/doc/arm/Bv9ARM.7.html b/doc/arm/Bv9ARM.7.html
index e0e29ba337..ac011524ab 100644
--- a/doc/arm/Bv9ARM.7.html
+++ b/doc/arm/Bv9ARM.7.html
@@ -1,11 +1,11 @@
 
 
 
-
+
 
 
 
@@ -68,17 +68,17 @@ good idea
 Here is an example of how to properly apply ACLs:

 
 
- 
+
 // Set up an ACL named "bogusnets" that will block RFC1918 space,
 // which is commonly used in spoofing attacks.
- 
+
 acl bogusnets { 0.0.0.0/8; 1.0.0.0/8; 2.0.0.0/8; 192.0.2.0/24; 224.0.0.0/3;
 10.0.0.0/8; 172.16.0.0/12; 192.168.0.0/16; };
 
 // Set up an ACL called our-nets. Replace this with the real IP numbers.
- 
+
 acl our-nets { x.x.x.x/24; x.x.x.x/21; };
- 
+
 options {
   ...
   ...
@@ -150,7 +150,7 @@ chroot()
 , and to run 
 named setuid
  to user 202:

- 
+
 
 /usr/local/bin/named -u 202 -t /var/named
 

diff --git a/doc/arm/Bv9ARM.8.html b/doc/arm/Bv9ARM.8.html
index 5454476328..4e2e82c618 100644
--- a/doc/arm/Bv9ARM.8.html
+++ b/doc/arm/Bv9ARM.8.html
@@ -1,11 +1,11 @@
 
 
 
-
+
 
 
 
@@ -85,7 +85,7 @@ The Internet Software Consortium (ISC) offers a wide range of support and servic
 

 
  
-To discuss arrangements for support, contact 
+To discuss arrangements for support, contact
 info@isc.org
 
  
diff --git a/doc/arm/Bv9ARM.9.html b/doc/arm/Bv9ARM.9.html
index 70f293461e..75806f1530 100644
--- a/doc/arm/Bv9ARM.9.html
+++ b/doc/arm/Bv9ARM.9.html
@@ -1,11 +1,11 @@
 
 
 
-
+
 
 
 
@@ -30,7 +30,7 @@
 
  
 

-Appendices 
+Appendices
 

 
 
@@ -574,7 +574,7 @@ Request for Comments (RFCs)
 
 Specification documents for the Internet protocol suite, including the DNS, are published as part of the Request for Comments (RFCs) series of technical notes. The standards themselves are defined by the Internet Engineering Task Force (IETF) and the Internet Engineering Steering Group (IESG). RFCs can be obtained online via FTP at 

 ftp://www.isi.edu/in-notes/RFCxxx.txt
- (where 
+ (where
 xxx
  is the number of the RFC). RFCs are also available via the Web at 
 http://www.ietf.org/rfc/
diff --git a/doc/arm/Bv9ARM.css b/doc/arm/Bv9ARM.css
index 34664143a4..78ea7fab8e 100644
--- a/doc/arm/Bv9ARM.css
+++ b/doc/arm/Bv9ARM.css
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: Bv9ARM.css,v 1.8 2000/07/27 09:42:02 tale Exp $ */
+/* $Id: Bv9ARM.css,v 1.9 2000/08/01 01:18:01 tale Exp $ */
 
 A:link {
 	color: blue;
diff --git a/doc/arm/Bv9ARM.html b/doc/arm/Bv9ARM.html
index d0b8c64218..1a2fa97143 100644
--- a/doc/arm/Bv9ARM.html
+++ b/doc/arm/Bv9ARM.html
@@ -1,11 +1,11 @@
 
 
 
-
+
 
 
 
diff --git a/doc/arm/Bv9ARM.txt b/doc/arm/Bv9ARM.txt
index 8426f2da7e..9f5187d0ae 100644
--- a/doc/arm/Bv9ARM.txt
+++ b/doc/arm/Bv9ARM.txt
@@ -1,7 +1,7 @@
 Copyright (C) 2000  Internet Software Consortium.
 See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
 
-$Id: Bv9ARM.txt,v 1.9 2000/07/27 09:42:05 tale Exp $
+$Id: Bv9ARM.txt,v 1.10 2000/08/01 01:18:04 tale Exp $
 
 BIND 9 Administrator Reference Manual
 July 2000
@@ -99,17 +99,17 @@ Section 6 : BIND 9 Configuration Reference
 6.2.1 acl Statement Grammar
 6.2.2 acl Statement Definition and Usage
 6.2.3 controls Statement Grammar
-6.2.4 controls Statement Definition and Usage 
+6.2.4 controls Statement Definition and Usage
 6.2.5 include Statement Grammar
 6.2.6 include Statement Definition and Usage
 6.2.7 key Statement Grammar
 6.2.8 key Statement Definition and Usage
 6.2.9 logging Statement Grammar
-6.2.10 logging Statement Definition and Usage 
+6.2.10 logging Statement Definition and Usage
 6.2.10.1 The channel Phrase
 6.2.10.2 The category Phrase
 6.2.11 options Statement Grammar
-6.2.12 options Statement Definition and Usage 
+6.2.12 options Statement Definition and Usage
 6.2.12.1 Boolean Options
 6.2.12.2 Forwarding
 6.2.12.3 Name Checking
@@ -2124,7 +2124,7 @@ options {
     [ transfer-source ip4_addr; ]
     [ transfer-source-v6 ip6_addr; ]
     [ also-notify { ip_addr; [ ip_addr; ... ] }; ]
-    [ max-ixfr-log-size number; ]  
+    [ max-ixfr-log-size number; ]
     [ coresize size_spec ; ]
     [ datasize size_spec ; ]
     [ files size_spec ; ]
@@ -2456,7 +2456,7 @@ the amount of load that transfers place on the system. The following options
 apply to zone transfers.
 
 
- 
+
  also-notify           Defines a global list of IP addresses that are also
                        sent NOTIFY messages whenever a fresh copy of the
                        zone is loaded. This helps to ensure that copies of
@@ -2611,7 +2611,7 @@ Resource limits are not yet implemented in BIND 9.
                      the cache every cleaning-interval minutes. The default
                      is 60 minutes. If set to 0, no periodic cleaning will
                      occur.
- 
+
  heartbeat-interval  The server will perform zone maintenance tasks for all
                      zones marked dialup yes whenever this interval
                      expires. The default is 60 minutes. Reasonable values
@@ -3698,7 +3698,7 @@ containing critical data such as the IP addresses of public web and mail
 servers need not allow dynamic update at all.
 
   ------------------------------------------------------------------------
-  
+
      Section 8. Troubleshooting
 
      8.1 Common Problems
diff --git a/doc/design/addressdb b/doc/design/addressdb
index 37b97c72a3..a4fe9cf904 100644
--- a/doc/design/addressdb
+++ b/doc/design/addressdb
@@ -1,7 +1,7 @@
 Copyright (C) 2000  Internet Software Consortium.
 See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
 
-$Id: addressdb,v 1.2 2000/06/21 23:43:28 tale Exp $
+$Id: addressdb,v 1.3 2000/08/01 01:18:06 tale Exp $
 
 You are lost in a maze of twisty little pointers, all alike...
 
@@ -12,7 +12,7 @@ ADB                          |-> 0         |-> handle ---> handle ---> 0
  |			     namehook      namehook
  |                             |  |          |  |
  |                             |  0          0  -> fetch
- |			       |         
+ |			       |
  |                             V
  |-lists of elements -----> element ----> element ----> element ---> 0
  |                            |             |             |
diff --git a/doc/design/compression b/doc/design/compression
index 59865107e9..ca0f1cc95e 100644
--- a/doc/design/compression
+++ b/doc/design/compression
@@ -3,7 +3,7 @@ See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
 
 			Name Compression
 
-	$Id: compression,v 1.5 2000/06/21 23:43:29 tale Exp $
+	$Id: compression,v 1.6 2000/08/01 01:18:07 tale Exp $
 
 Overview.
 
@@ -28,7 +28,7 @@ Overview.
 	   across a message.
 
 	BIND 4.x and BIND 8.x used a table of existing 14 bit compression
-	targets. 
+	targets.
 
 	The implicit assumption is that we will use compression whenever
 	possible and when ever there are multiple alternatives available
@@ -128,7 +128,7 @@ Functions:
 	dns_compress_findlocal(dns_compress_t *cctx, dns_name_t *name,
 			       dns_name_t *prefix, dns_name_t *suffix,
 			       isc_uint16_t *offset, isc_buffer_t *workspace);
-	
+
 	Find the best best match in the global / local RBT.  Returns prefix,
 	suffix and offset of the bestmatch.  Findglobal(), findlocal()
 	requires as workspace as it may be neccessary to spit a bit stream
diff --git a/doc/design/db_rules b/doc/design/db_rules
index a0fa7788cc..5c6217cd41 100644
--- a/doc/design/db_rules
+++ b/doc/design/db_rules
@@ -1,7 +1,7 @@
 Copyright (C) 1999, 2000  Internet Software Consortium.
 See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
 
-$Id: db_rules,v 1.4 2000/06/21 23:43:31 tale Exp $
+$Id: db_rules,v 1.5 2000/08/01 01:18:08 tale Exp $
 
 Here is a more formal statement of the important database design
 rules.  Each rule has a 5 character mnemonic, for use in source code
@@ -70,7 +70,7 @@ Cache Node Lookups						[DBCNL]
 
 	2)	If there is a negative caching entry for the desired node,
 		DNS_R_NONEXISTENT shall be returned.
-	
+
 	3)	If the desired node does not exist, and there is not a
 		negative caching entry, DNS_R_UNKNOWN shall be returned.
 
diff --git a/doc/design/decompression b/doc/design/decompression
index 323a601e7f..08bb91a7ea 100644
--- a/doc/design/decompression
+++ b/doc/design/decompression
@@ -3,10 +3,10 @@ See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
 
 			Name Decompression
 
-	$Id: decompression,v 1.4 2000/06/21 23:43:32 tale Exp $
+	$Id: decompression,v 1.5 2000/08/01 01:18:09 tale Exp $
 
 Overview.
-	
+
 	There are 4 type of compression: global 14 bit, global 16 bit,
 	local 14 bit and local 16 bit.
 
@@ -35,7 +35,7 @@ Overview.
 	   and edn version.
 
 Implementation:
-	
+
 	dns_rdata_fromwire will set the allowed decompression methods allowed
 	by looking at edns, strict and the type values.
 
diff --git a/doc/design/logging b/doc/design/logging
index e0fba90af2..bc005aef78 100644
--- a/doc/design/logging
+++ b/doc/design/logging
@@ -1,7 +1,7 @@
 Copyright (C) 1999, 2000  Internet Software Consortium.
 See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
 
-$Id: logging,v 1.6 2000/06/22 21:53:52 tale Exp $
+$Id: logging,v 1.7 2000/08/01 01:18:11 tale Exp $
 
 OVERVIEW
 
@@ -354,7 +354,7 @@ Providing a NULL argument for the category means "associate the
 channel with the indicated module in all known categories" ---
 including ISC_CATEGORY_DEFAULT.  Providing a NULL argument for the
 module means "associate the channel with all modules that use this
-category."  
+category."
 
 6) If you are sending any messages to syslog, call
 isc_log_opensyslog().  Currently the arguments to this function are
@@ -435,7 +435,7 @@ logging system internally.
   };
   isc_logmodule_t dns_modules[] = {
           { "db", 	0 },
-          { "rbtdb", 	0 }, 
+          { "rbtdb", 	0 },
           { NULL, 	0 }
   };
 
diff --git a/doc/design/ncache b/doc/design/ncache
index d13357d098..6d0f0de9a3 100644
--- a/doc/design/ncache
+++ b/doc/design/ncache
@@ -1,7 +1,7 @@
 Copyright (C) 1999, 2000  Internet Software Consortium.
 See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
 
-$Id: ncache,v 1.3 2000/06/22 21:53:53 tale Exp $
+$Id: ncache,v 1.4 2000/08/01 01:18:12 tale Exp $
 
 Negative Caching
 
@@ -20,7 +20,7 @@ Not sure what to do in this case.  Probably return delegation to force client
 to ask authority.
 
 
-Perhaps we should just create some kind of meta-rdata, the "negative cache 
+Perhaps we should just create some kind of meta-rdata, the "negative cache
 rdata type"?
 
 Or maybe something like:
diff --git a/doc/design/omapi b/doc/design/omapi
index 14698c9115..5f609c9742 100644
--- a/doc/design/omapi
+++ b/doc/design/omapi
@@ -1,7 +1,7 @@
 Copyright (C) 1999, 2000  Internet Software Consortium.
 See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
 
-$Id: omapi,v 1.4 2000/06/22 21:53:55 tale Exp $
+$Id: omapi,v 1.5 2000/08/01 01:18:13 tale Exp $
 
 This file documents the protocol that the ISC DHCP server and ISC
 Object Management clients (clients that use the ISC Object Management
@@ -166,7 +166,7 @@ Message types:
 	invalid handle - the handle does not refer to a known object
 	permisson denied - the handle refers to an object that the
 			   requestor does not have permission to
-			   examine. 
+			   examine.
 
 3: update
 
@@ -253,7 +253,7 @@ dhcpctl_status dhcpctl_connect (dhcpctl_handle *connection,
 	synchronous
 	returns nonzero status code if it didn't connect, zero otherwise
 	stores connection handle through connection, which can be used
-	for subsequent access to the specified server. 
+	for subsequent access to the specified server.
 	server_name is the name of the server, and port is the TCP
 	port on which it is listening.
 	authinfo is the handle to an object containing authentication
@@ -270,7 +270,7 @@ dhcpctl_status dhcpctl_open_object (dhcpctl_handle h,
 	flags include:
 	   DHCPCTL_CREATE - if the object doesn't exist, create it
 	   DHCPCTL_UPDATE - update the object on the server using the
-			    attached parameters 
+			    attached parameters
 	   DHCPCTL_EXCL - error if the object exists and DHCPCTL_CREATE
 			  was also specified
 
@@ -296,7 +296,7 @@ dhcpctl_status dhcpctl_set_callback (dhcpctl_handle h, void *data,
 	status code is returned otherwise.
 	Upon completion of whatever task is in process, the callback
 	will be passed the handle to the object, a status code
-	indicating what happened, and the anonymous pointer passed to 
+	indicating what happened, and the anonymous pointer passed to
 
 dhcpctl_status dhcpctl_wait_for_completion (dhcpctl_handle h,
 					    dhcpctl_status *s)
@@ -315,7 +315,7 @@ dhcpctl_status dhcpctl_get_value (data_string *result,
 				  dhcpctl_handle h, char *value_name)
 	synchronous
 	returns zero if the call succeeded, a nonzero status code if
-	it didn't. 
+	it didn't.
 	result is the address of an empty data string (initialized
 	with bzero or cleared with data_string_forget).   On
 	successful completion, the addressed data string will contain
diff --git a/doc/design/red-black b/doc/design/red-black
index ba5e2c4d96..5e966c8bde 100644
--- a/doc/design/red-black
+++ b/doc/design/red-black
@@ -1,7 +1,7 @@
 Copyright (C) 1999, 2000  Internet Software Consortium.
 See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
 
-$Id: red-black,v 1.5 2000/06/22 21:53:57 tale Exp $
+$Id: red-black,v 1.6 2000/08/01 01:18:14 tale Exp $
 
                  Red-Black Tree Implementation Notes
 
@@ -46,7 +46,7 @@ down pointer from the suffix locating the subtree.
 For example, consider storing the following names:
    a       x.d.e.f     o.w.y.d.e.f
    b       z.d.e.f     p.w.y.d.e.f
-   c       g.h         q.w.y.d.e.f 
+   c       g.h         q.w.y.d.e.f
 
 No matter which order the keys were added, this would result in a tree
 that can be visualized as:
diff --git a/doc/design/search b/doc/design/search
index 9dcf80ebf7..bcd208297d 100644
--- a/doc/design/search
+++ b/doc/design/search
@@ -1,7 +1,7 @@
 Copyright (C) 1999, 2000  Internet Software Consortium.
 See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
 
-$Id: search,v 1.6 2000/06/22 21:53:58 tale Exp $
+$Id: search,v 1.7 2000/08/01 01:18:16 tale Exp $
 
 What follows is pseudocode for the zone and cache lookup algorithms, as they
 will work in the RBT DB.
@@ -39,7 +39,7 @@ rdataset, or a node (including the zone top) with an active DNAME
 rdataset.
 
 
-Zone Search Algorithm			
+Zone Search Algorithm
 
 	Inputs:
 		Search name
@@ -239,7 +239,7 @@ Cache Search Algorithm:
 
 	Go down as far as possible remembering every parent node.
 	Remember the predecessor too.
-	
+
 	If some rdataset for name exists
 
 		Look for desired type or CNAME
@@ -280,7 +280,7 @@ Cache Search Algorithm:
 				Return NO_KNOWN_AUTHORITY
 				(this will cause priming of root servers or,
 				 perhaps, forwarding)
-	
+
 		If we have a zone DKZC and it's better than the one we found
 		in the cache
 			Return it (node and name).
diff --git a/doc/design/windows-nt b/doc/design/windows-nt
index c0758523b7..b23b4052e6 100644
--- a/doc/design/windows-nt
+++ b/doc/design/windows-nt
@@ -1,7 +1,7 @@
 Copyright (C) 1999, 2000  Internet Software Consortium.
 See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
 
-$Id: windows-nt,v 1.4 2000/06/22 21:54:00 tale Exp $
+$Id: windows-nt,v 1.5 2000/08/01 01:18:18 tale Exp $
 
                      Windows NT Portability Notes
 
@@ -37,7 +37,7 @@ directory of the BIND9 sources.  Its usage is:
 where "remotedest" is the path under which the sources will be
 compiled on the NT machine, and "localdest" is where the munged
 source tree will be placed on the local machine in preparation for
-mounting/zipping/whatever to get it to the remote machine.  
+mounting/zipping/whatever to get it to the remote machine.
 
 The default remotedest is g:/proj/bind9-nt, because that suits my
 environment and I'm the one working on this.  Use forward slashes when
diff --git a/doc/design/zone b/doc/design/zone
index e979636896..2641dc7834 100644
--- a/doc/design/zone
+++ b/doc/design/zone
@@ -3,10 +3,10 @@ See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
 
 			Zones
 
-	$Id: zone,v 1.6 2000/06/21 23:43:46 tale Exp $
+	$Id: zone,v 1.7 2000/08/01 01:18:19 tale Exp $
 
 Overview
-	 
+
 	Zones are the unit of delegation in the DNS and may go from holding
 	RR's only at the zone top to holding the complete hierachy (private
 	roots zones).  Zones have an associated database which is the
@@ -35,7 +35,7 @@ Overview
 	* primary master name (required to auto generate our masters)
 	* master file name
 	* database name
-	* database type 
+	* database type
 		* initially only master_file (BIND 4 & 8)
 		* expanded axfr + ixfr
 	* transaction logs
@@ -82,7 +82,7 @@ Overview
 	* updated (UPDATE / IXFR)
 	* copied out in full (AXFR) or as partial deltas (IXFR)
 	* read from
-	* validated 
+	* validated
 	* generate a delta between two given versions.
 	* signed / resigned
 	* maintenance
@@ -161,7 +161,7 @@ Functions:
 
     void
     dns_zone_invalidate(dns_zone_t *zone);
-	
+
     void
     dns_ixfr_init(dns_ixfr_t *ixfr, unsigned long serial, time_t expire);
 
@@ -209,10 +209,10 @@ Functions:
     dns_zone_checkchildren(dns_zone_t *);
 
 	check that the child zones NS lists agree with the NS lists in this
-	zone, check glue records.  Warn if not identical. 
+	zone, check glue records.  Warn if not identical.
 
     dns_zone_checkservers(dns_zone_t *);
-	
+
 	check that all the listed servers for the zone agree on NS list and
 	serial number. NOTE only errors which continue over several refresh
 	periods to be reported.
@@ -229,7 +229,7 @@ Functions:
 
     dns_zone_addmaster(dns_zone_t *zone, isc_sockaddr_t *addr);
 
-	Add addr to the set of masters for the zone. 
+	Add addr to the set of masters for the zone.
 
     dns_zone_clearmasters(dns_zone_t *zone);
 
@@ -246,5 +246,5 @@ Functions:
     dns_zone_load(dns_zone_t *);
 
     dns_zone_consolidate(dns_zone_t *);
-	
+
 	Consolidate on disk copy of zone.
diff --git a/doc/dev/coding.html b/doc/dev/coding.html
index 698f630de8..c765b4c2b0 100644
--- a/doc/dev/coding.html
+++ b/doc/dev/coding.html
@@ -1,10 +1,10 @@
 
 
-
+
 
 
C Language

 
@@ -109,11 +109,11 @@ declare any functions.

 

 /*
  * Copyright (C) 1998  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
@@ -430,7 +430,7 @@ Bad:
 
 
The Ternary Operator

 The ?: operator should mostly be avoided.  It is tolerated when
-deciding what value to pass as a parameter to a function, such as 
+deciding what value to pass as a parameter to a function, such as
 frequently happens with printf, and also when a simple (non-compound)
 value is being used in assignment or as part of a calculation.
 In particular, using the ternary operator to specify a return value is
@@ -539,7 +539,7 @@ unquoted.  E.g., isc_log_write(... "open: %s: %s", filename,
 isc_result_totext(result));

 
 Function names, line numbers, memory addresses, and other references
-to program internals may be used in debugging messages and in 
+to program internals may be used in debugging messages and in
 messages to report programming errors detected at runtime.
 They may not be used in messages that indicate errors in the
 program's inputs or operation.

diff --git a/doc/dev/cvs b/doc/dev/cvs
index e2c0eb5dc3..2517977713 100644
--- a/doc/dev/cvs
+++ b/doc/dev/cvs
@@ -27,7 +27,7 @@ Renaming files by respository copy
 
 
 When you need to rename or move a file that is under CVS control, use
-the "repository copy" method as described in the following text 
+the "repository copy" method as described in the following text
 borrowed from an ancient CVS FAQ:
 
         2C.4   How do I rename a file?
@@ -85,4 +85,4 @@ In a mainline working tree, do something like this:
   cvs tag -b -r v9_0_base v9_0 file
 
 
-$Id: cvs,v 1.3 2000/07/10 16:16:06 gson Exp $
+$Id: cvs,v 1.4 2000/08/01 01:18:22 tale Exp $
diff --git a/doc/dev/cvs-usage b/doc/dev/cvs-usage
index 19849bb5db..9c433da16f 100644
--- a/doc/dev/cvs-usage
+++ b/doc/dev/cvs-usage
@@ -27,7 +27,7 @@ Renaming files by respository copy
 
 
 When you need to rename or move a file that is under CVS control, use
-the "repository copy" method as described in the following text 
+the "repository copy" method as described in the following text
 borrowed from an ancient CVS FAQ:
 
         2C.4   How do I rename a file?
@@ -85,4 +85,4 @@ In a mainline working tree, do something like this:
   cvs tag -b -r v9_0_base v9_0 file
 
 
-$Id: cvs-usage,v 1.3 2000/07/10 16:16:06 gson Exp $
+$Id: cvs-usage,v 1.4 2000/08/01 01:18:22 tale Exp $
diff --git a/doc/dev/rdata.html b/doc/dev/rdata.html
index 4a9284873b..3ee335784b 100644
--- a/doc/dev/rdata.html
+++ b/doc/dev/rdata.html
@@ -1,11 +1,11 @@
 
 
 
-
+
 
 
 
@@ -27,7 +27,7 @@
 The dns rdata routines (dns_rdata_fromtext(),
 dns_rdata_totext(), dns_rdata_fromwire(),
 dns_rdata_towire() dns_rdata_fromstruct(),
-dns_rdata_tostruct() and dns_rdata_compare()) 
+dns_rdata_tostruct() and dns_rdata_compare())
 are designed to provide a single set of routines
 for encoding, decoding and comparing dns data preventing the problems that
 occurred in BIND 8.x and earlier where there were multiple places in the
@@ -245,7 +245,7 @@ decompression methods if there is a domain name in the rdata.
 else
 	dns_decompress_setmethods(dctx, DNS_COMPRESS_GLOBAL14);
 

-	
+
 

 
class

 

@@ -264,7 +264,7 @@ containing a RR record in wire format.
 

 This is the decompression context and is passed to
 dns_name_fromwire(),
-along with downcase, to enable a compressed domain name 
+along with downcase, to enable a compressed domain name
 to be extracted from the source.
 
downcase

 

@@ -279,7 +279,7 @@ RR record is written.
 as it reads external data and should take extreme care to ensure that
 the input data matches its description.
 

-If the active buffer is not empty at completion and 
+If the active buffer is not empty at completion and
 fromwire_typename() was otherwise successful
 dns_rdata_fromwire() will return DNS_R_EXTRADATA.
 
Convert from internal format to wire format

@@ -295,7 +295,7 @@ towire_classname_typename(dns_rdata_t *rdata, dns_compress_t *cctx,
 

 

 towire_classname_typename() is required to set the
-allowed name compression methods based on EDNS version if there is a 
+allowed name compression methods based on EDNS version if there is a
 domain name in the rdata.
 
 if (dns_compress_getedns(cctx) >= #)
diff --git a/doc/dev/release b/doc/dev/release
index d6be7e965b..88bc1271ac 100644
--- a/doc/dev/release
+++ b/doc/dev/release
@@ -1,7 +1,7 @@
 Copyright (C) 2000  Internet Software Consortium.
 See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
 
-$Id: release,v 1.11 2000/07/19 20:34:40 gson Exp $
+$Id: release,v 1.12 2000/08/01 01:18:24 tale Exp $
 
 Preparing a bind9 release
 
@@ -20,7 +20,7 @@ release.
    lib/*/api files as needed.  See the libtool info file
    for information about what the various numbers mean.
 
- - Check that http://status.isc.org/bind9/bind9.html shows 
+ - Check that http://status.isc.org/bind9/bind9.html shows
    a clean build and test status for all supported systems.
 
  - Check that "make all_tests" does not produce compile errors.
@@ -100,7 +100,7 @@ release.
  - If problems are found at this stage, fix them, move the
    release tag up using "rtag -F", and respin the kit.
 
- - Take the resulting distribution files to a secure system 
+ - Take the resulting distribution files to a secure system
    and sign them with the ISC signing PGP key:
    "pgp -sba bind-9.0.0b3.tar.gz -u 0x51BAB2ED"
 
@@ -120,7 +120,7 @@ release.
 
      ssh isrv4.pa.vix.com "mkdir /udir/ftp/isc/bind9/9.0.0b4"
      scp bind-9.0.0b4.tar.gz bind-9.0.0b4.tar.gz.asc \
-	isrv4.pa.vix.com:/udir/ftp/isc/bind9/9.0.0b4   
+	isrv4.pa.vix.com:/udir/ftp/isc/bind9/9.0.0b4
 
  - Download using FTP (or Netscape) and verify the PGP signature again
 
diff --git a/doc/dev/results b/doc/dev/results
index 464802e866..009076615b 100644
--- a/doc/dev/results
+++ b/doc/dev/results
@@ -1,7 +1,7 @@
 Copyright (C) 1999, 2000  Internet Software Consortium.
 See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
 
-$Id: results,v 1.3 2000/06/22 21:54:07 tale Exp $
+$Id: results,v 1.4 2000/08/01 01:18:25 tale Exp $
 
 Result Codes
 
@@ -19,7 +19,7 @@ seems more promising, e.g.
 
 If 's' is shared however this approach doesn't work unless the locking is
 done by the caller, e.g.
-	
+
 	sometype_lock();
 	sometype_dosomething(s, buffer);
 	if (sometype_error(s)) {
diff --git a/doc/dev/tests b/doc/dev/tests
index a9921aed69..aa067cb5a4 100644
--- a/doc/dev/tests
+++ b/doc/dev/tests
@@ -1,7 +1,7 @@
 Copyright (C) 2000  Internet Software Consortium.
 See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
 
-$Id: tests,v 1.6 2000/06/28 19:01:52 gson Exp $
+$Id: tests,v 1.7 2000/08/01 01:18:26 tale Exp $
 
 We do hourly test builds of the bind9 tree.  This is an attempt to
 document how they work.
@@ -11,7 +11,7 @@ document how they work.
 
 The scripts driving the build system are in ~wpk/b9t.  They are not
 under CVS control.  The builds are driven by cron jobs separately
-installed on each build system, running as user wpk. 
+installed on each build system, running as user wpk.
 
 The sources are checked out, and the web reports are generated,
 on bb, as driven by the following cron jobs:
@@ -78,7 +78,7 @@ On some, it's on NFS; in this case the location is defined in
 The output from the make process is in
 ~wpk/b9t/hosts/$PLATFORM/b9t-status, and the output from
 The output from the later stages of the process is under
-/proj/build-reports/bind9/hosts/$PLATFORM.  To make the files 
+/proj/build-reports/bind9/hosts/$PLATFORM.  To make the files
 harder to find (?), they have names starting with a period:
 
   .populate
diff --git a/doc/draft/draft-costanzo-dns-gl-03.txt b/doc/draft/draft-costanzo-dns-gl-03.txt
index c7a526a864..b080a88999 100644
--- a/doc/draft/draft-costanzo-dns-gl-03.txt
+++ b/doc/draft/draft-costanzo-dns-gl-03.txt
@@ -69,10 +69,10 @@ EXPIRES IN SIX MONTHS                                             June 2000
    to local domain administrators.
 
    This document resolves the problem of relating host information within
-   the DNS to geographical locations. This definition has been designed to 
-   be easy for the person who administrates DNS for a domain. The author 
-   hopes that the lack of requiring longitude, latitude and elevation 
-   information and merely being able to enter address information, as you 
+   the DNS to geographical locations. This definition has been designed to
+   be easy for the person who administrates DNS for a domain. The author
+   hopes that the lack of requiring longitude, latitude and elevation
+   information and merely being able to enter address information, as you
    would address a postal letter, will mean broad acceptance and use of the
    GL resource record.
 
@@ -86,7 +86,7 @@ EXPIRES IN SIX MONTHS                                             June 2000
 
    Although several other attempts by various authors have attempted to
    created resource records that would allow location information on host to
-   be stored and distributed, none, to the authors knowledge, have either 
+   be stored and distributed, none, to the authors knowledge, have either
    gained acceptance on a wide scale or made allowance for location information
    that is not within the confines of the planet Earth.
 
@@ -104,7 +104,7 @@ EXPIRES IN SIX MONTHS                                             June 2000
     
 
    The format of the RDATA field is two varying length strings separated by
-   a space character. The first, the hierarchical locator, then an address 
+   a space character. The first, the hierarchical locator, then an address
    string. Each is quoted (like all strings) only when it has spaces in it,
    which will never be true for the first string, and almost always for the
    second.
@@ -128,7 +128,7 @@ by a period "."):
 
   Astronomical Location -                          (Required)
            A coded field defining the heavenly body within
-           the known Universe, where the machine resides.  The most common 
+           the known Universe, where the machine resides.  The most common
            entry, "S3" is the planet Earth and is the only currently
            defined location.
 
@@ -141,10 +141,10 @@ by a period "."):
   Country Code -                                    (Required)
 
           The country code specifies the country the host computer resides
-          in. The code is a two character fixed length string and may only 
+          in. The code is a two character fixed length string and may only
           be included within the Astronimical Location 'S3'.  These codes
           are defined in document ISO 3166-1 and are listed in Appendix A
-          for easy reference. 
+          for easy reference.
 
    Postal Zone -                                    (Optional)
 
@@ -156,8 +156,8 @@ by a period "."):
           This field may be omitted only if the country in which the host
           machine resides does not use a postal coding system.
 
-          When all three Hierarchical Locator components exist for an DNS 
-          entry, the position being defined is considered to be a "precise 
+          When all three Hierarchical Locator components exist for an DNS
+          entry, the position being defined is considered to be a "precise
           position".
 
 
@@ -263,9 +263,9 @@ Parimaribo"
 
    New Astronomical Locations (ALs)  MUST be registered with the Internet
    Assigned Numbers Authority (IANA).  IANA acts as a central registry for
-   these values. IANA may reject or modify the Astronomical Location 
-   registration request if it does not meet the criteria as specified in 
-   section 4.1.1.  
+   these values. IANA may reject or modify the Astronomical Location
+   registration request if it does not meet the criteria as specified in
+   section 4.1.1.
 
    Registration requests should be sent via electronic mail to IANA as
    follows:
@@ -273,7 +273,7 @@ Parimaribo"
              To:  IANA@iana.org
              Subject:  Registration of a new Astronomical Location
 
-   The mail message must specify the proposed AL. Documentation defining 
+   The mail message must specify the proposed AL. Documentation defining
    the AL and its proposed purpose must be included.  The documentation must
    either reference an external non-Internet standards document or an existing
    or soon to be RFC.  If applicable, the documentation should contain a
@@ -281,8 +281,8 @@ Parimaribo"
    RFC according to the normal procedure within a reasonable amount of
    time after the AL registration has been approved.
 
-   IANA will not register a new Astronmical Location until an actual 
-   computer requiring GL data in the DNS resides or will soon reside on a 
+   IANA will not register a new Astronmical Location until an actual
+   computer requiring GL data in the DNS resides or will soon reside on a
    heavenly body other than Earth.
 
 
@@ -305,8 +305,8 @@ EXPIRES IN SIX MONTHS                                              May 2000
 7.1 Defining New Astronimical Locations
 
   The astronomical location 'S3' is intended to be Sol-Three (i.e. the Earth).
-  The Earth is the 3rd large planet in the solar system. The Sun would be S0 
-  (not that we'd have a computer there), but a solar observatory in orbit might 
+  The Earth is the 3rd large planet in the solar system. The Sun would be S0
+  (not that we'd have a computer there), but a solar observatory in orbit might
   be S0-001. Our moon would be S3-1. Other letters and such for catalogued
   objects. Additionally, the ISS and Mir space stations could use S3-001 (Mir),
   S3-002 (ISS) now,   if they get connected on IP.
@@ -318,12 +318,12 @@ EXPIRES IN SIX MONTHS                                              May 2000
 7.2 Other possible uses for GL
 
   The use of postal codes also is exactly what is needed for credit card address
-  authentication. Sites could (quietly) compare GL info provided on entries from 
+  authentication. Sites could (quietly) compare GL info provided on entries from
   ISPs to what someone enters for additional verification purposes.
 
 
 
-  
+
 
 
 
diff --git a/doc/draft/draft-ietf-dhc-dhcp-dns-12.txt b/doc/draft/draft-ietf-dhc-dhcp-dns-12.txt
index c97ba62530..d2424d073e 100644
--- a/doc/draft/draft-ietf-dhc-dhcp-dns-12.txt
+++ b/doc/draft/draft-ietf-dhc-dhcp-dns-12.txt
@@ -128,7 +128,7 @@ Internet-Draft      Interaction between DHCP and DNS          March 2000
    and PTR. The A RR contains mapping from a FQDN to an IP address; the
    PTR RR contains mapping from an IP address to a FQDN.  The Dynamic
    DNS Updates specification (RFC2136[5]) describes a mechanism that
-   enables DNS information to be updated over a network. 
+   enables DNS information to be updated over a network.
 
    DHCP RFC2131[3] provides a mechanism by which a host (a DHCP client)
    can acquire certain configuration information, along with its IP
@@ -180,7 +180,7 @@ Internet-Draft      Interaction between DHCP and DNS          March 2000
    The only difference between these two cases is whether the FQDN to
    IP address mapping is updated by a DHCP client or by a DHCP server.
    The IP address to FQDN mapping is updated by a DHCP server in both
-   cases. 
+   cases.
 
    The reason these two are important, while others are unlikely, has
    to do with authority over the respective DNS domain names. A DHCP
@@ -202,13 +202,13 @@ Internet-Draft      Interaction between DHCP and DNS          March 2000
    to modify its own domain name. Compliant implementations MAY support
    some or all of these possibilities. Furthermore, this specification
    applies only to DHCP client and server processes: it does not apply
-   to other processes which initiate dynamic DNS updates. 
+   to other processes which initiate dynamic DNS updates.
 
    This document describes a new DHCP option which a client can use to
    convey all or part of its domain name to a DHCP server.
    Site-specific policy determines whether DHCP servers use the names
    that clients offer or not, and what DHCP servers may do in cases
-   where clients do not supply domain names. 
+   where clients do not supply domain names.
 
 4. Issues with DDNS in DHCP Environments
 
@@ -245,7 +245,7 @@ Internet-Draft      Interaction between DHCP and DNS          March 2000
    would have its original A RR replaced by the new record. Either of
    these effects may be considered undesirable by some sites. Different
    authority and credential models have different levels of exposure to
-   name collisions. 
+   name collisions.
 
    1.  Client updates A RR, uses Secure DNS Update with credentials
        that are associated with the client's FQDN, and exclusive to the
@@ -356,7 +356,7 @@ Internet-Draft      Interaction between DHCP and DNS          March 2000
    is used when the client's link-layer address is being used to
    identify it, and one that is used when some DHCP option that the
    DHCP client has sent is being used to identify it.
-      
+
 
       DISCUSSION:
       Implementors should note that the actual identifying data is
@@ -444,7 +444,7 @@ Internet-Draft      Interaction between DHCP and DNS          March 2000
    allow the client to convey its FQDN to the server this document
    defines a new DHCP option, called "Client FQDN". The FQDN Option
    also contains Flags and RCode fields which DHCP servers can use to
-   convey information about DNS updates to clients. 
+   convey information about DNS updates to clients.
 
    Clients MAY send the FQDN option, setting appropriate Flags values,
    in both their DISCOVER and REQUEST messages. If a client sends the
@@ -456,7 +456,7 @@ Stapp & Rekhter          Expires September 2000                 [Page 8]
 Internet-Draft      Interaction between DHCP and DNS          March 2000
 
 
-   subsequent REQUEST messages. 
+   subsequent REQUEST messages.
 
    The code for this option is 81. Its minimum length is 4.
 
@@ -481,12 +481,12 @@ Internet-Draft      Interaction between DHCP and DNS          March 2000
    indicate that it will not perform any Dynamic DNS updates, and that
    it expects the DHCP server to perform any FQDN-to-IP (the A RR) DNS
    update on its behalf. If this bit is clear, the client indicates
-   that it intends to maintain its own FQDN-to-IP mapping update. 
+   that it intends to maintain its own FQDN-to-IP mapping update.
 
    If a DHCP server intends to take responsibility for the A RR update
    whether or not the client sending the FQDN option has set the "S"
    bit, it sets both the "O" bit and the "S" bit, and sends the FQDN
-   option in its DHCPOFFER and/or DHCPACK messages. 
+   option in its DHCPOFFER and/or DHCPACK messages.
 
    The data in the Domain Name field may appear in one of two formats:
    ASCII, or DNS-style binary encoding (without compression, of
@@ -497,12 +497,12 @@ Internet-Draft      Interaction between DHCP and DNS          March 2000
    reply, it MUST use the same encoding that the client used. The DNS
    encoding is recommended. The use of ASCII-encoded domain-names is
    fragile, and the use of ASCII encoding in this option should be
-   considered deprecated. 
+   considered deprecated.
 
    The remaining bits in the Flags field are reserved for future
    assignment. DHCP clients and servers which send the FQDN option MUST
    set the MBZ bits to 0, and they MUST ignore values in the part of
-   the field labelled "MBZ". 
+   the field labelled "MBZ".
 
 
 
@@ -670,7 +670,7 @@ Internet-Draft      Interaction between DHCP and DNS          March 2000
    described in Section 8. The server MAY originate the update before
    the server sends the DHCPACK message to the client. In this case the
    RCODE from the update [RFC2136] MUST be carried to the client in the
-   RCODE2 field of the Client FQDN option in the DHCPACK message. 
+   RCODE2 field of the Client FQDN option in the DHCPACK message.
    Alternatively the server MAY send the DHCPACK message to the client
    without waiting for the update to be completed. In this case the
 
@@ -794,7 +794,7 @@ Internet-Draft      Interaction between DHCP and DNS          March 2000
 
    existing A RR and the existing DHCID RR, adding A and DHCID RRs that
    represent the IP address and client-identity of the new client.
-      
+
 
       DISCUSSION:
       The updating entity may be configured to allow the existing DNS
diff --git a/doc/draft/draft-ietf-dnsext-zone-status-02.txt b/doc/draft/draft-ietf-dnsext-zone-status-02.txt
index dc0836b113..6cb4128760 100644
--- a/doc/draft/draft-ietf-dnsext-zone-status-02.txt
+++ b/doc/draft/draft-ietf-dnsext-zone-status-02.txt
@@ -36,10 +36,10 @@ Copyright (C) The Internet Society (1999, 2000).  All rights reserved.
 
 Abstract
 
-The definition of a secured zone is presented, updating RFC 2535. 
+The definition of a secured zone is presented, updating RFC 2535.
 After discussion on the mailing list and other working group
 consideration, removed from earlier editions of this draft are a new
-interpretation of the NXT record and a proposal to obsolete NULL 
+interpretation of the NXT record and a proposal to obsolete NULL
 keys.  Deprecation of "experimentally secure" remains.
 
 1 Introduction
@@ -93,9 +93,9 @@ secured.
 1.2 Islands of Security
 
 The goal of DNSSEC is to have each zone secured, from the root zone
-and the top-level domains down the hierarchy to the leaf zones. 
+and the top-level domains down the hierarchy to the leaf zones.
 Transitioning from an unsecured DNS, as we have now, to a fully
-secured - or "as much as will be secured" - tree will take some time. 
+secured - or "as much as will be secured" - tree will take some time.
 During this time, DNSSEC will be applied in various locations in the
 tree, not necessarily "top down."
 
@@ -313,7 +313,7 @@ migration from an unsecured zone to a secured zone.  This distinction
 is dropped.
 
 The objective of facilitating the migration can be achieved without a
-special designation of an experimentally secure status. 
+special designation of an experimentally secure status.
 Experimentally secured is a special case of privately secured.  A zone
 administrator can achieve this by publishing a zone with signatures
 and configuring a set of test resolvers with the corresponding public
diff --git a/doc/draft/draft-ietf-enum-rqmts-01.txt b/doc/draft/draft-ietf-enum-rqmts-01.txt
index ce6f235830..ad453c4f21 100644
--- a/doc/draft/draft-ietf-enum-rqmts-01.txt
+++ b/doc/draft/draft-ietf-enum-rqmts-01.txt
@@ -2,318 +2,319 @@
 Telephone Number Mapping                                       A. Brown
 Internet Draft                                          Nortel Networks
 Document:                       June 2000
-Category: Informational 
- 
- 
-                           ENUM Requirements 
- 
- 
-Status of this Memo 
-    
-   This document is an Internet-Draft and is in full conformance with 
-   all provisions of Section 10 of RFC2026 [1].  
-    
-   Internet-Drafts are working documents of the Internet Engineering 
-   Task Force (IETF), its areas, and its working groups.  Note that 
+Category: Informational
+
+
+                           ENUM Requirements
+
+
+Status of this Memo
+
+   This document is an Internet-Draft and is in full conformance with
+   all provisions of Section 10 of RFC2026 [1].
+
+   Internet-Drafts are working documents of the Internet Engineering
+   Task Force (IETF), its areas, and its working groups.  Note that
    other groups may also distribute working documents as Internet-
-   Drafts.  Internet-Drafts are draft documents valid for a maximum of 
-   six months and may be updated, replaced, or obsoleted by other 
-   documents at any time.  It is inappropriate to use Internet- Drafts 
-   as reference material or to cite them other than as "work in 
-   progress."  
-    
-   The list of current Internet-Drafts can be accessed at 
-   http://www.ietf.org/ietf/1id-abstracts.txt  
-   The list of Internet-Draft Shadow Directories can be accessed at 
-   http://www.ietf.org/shadow.html. 
-    
-1.      Abstract 
-    
-   This paper defines the requirements for a DNS-based architecture and 
-   protocols for mapping a telephone number to a set of attributes 
-   (e.g., URLs) that can be used to contact a resource associated with 
-   that number.  There are many possible protocols that can be 
-   considered for a telephone number mapping service.  The purpose of 
-   this document is to focus discussion on a DNS-based solution.  The 
-   intention is to enumerate the expectations of such a solution and to 
-   clarify the scope. 
-    
-2.      Conventions used in this document 
-    
-   The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", 
-   "SHOULD", "SHOULD NOT", "RECOMMENDED",  "MAY", and "OPTIONAL" in 
-   this document are to be interpreted as described in RFC-2119 [2]. 
-    
-3.      Requirements 
-    
-3.1     Endpoint Address Lookup 
-    
-   The system SHALL provide a service for the retrieval of service 
-   specific endpoint addresses (e.g., email address, IP address, SIP 
-   address, URL, etc.) or the retrieval of the addresses of servers, if 
-   available, which may contain this endpoint information. 
-    
-  
-                          ENUM Requirements                  June 2000 
- 
- 
-3.2     Capabilities Retrieval/Negotiation 
-    
-   The retrieval or negotiation of capabilities is beyond the scope of 
-   the system.   
-    
-3.3     Retrieval of Additional Information and Capabilities 
-    
-   The retrieval of additional, application-specific information (e.g., 
-   spoken name for verification purposes) is beyond the scope of the 
-   system.  The system MUST provide a service for the retrieval of 
-   protocol and service information if available. 
-    
-   The system SHOULD provide access to capabilities relevant to the 
-   telephone number in question.  The retrieval or negotiation of 
-   capabilities will depend on the outcome of the rescap work or work 
-   done in other groups. 
-    
-3.4     Qualification of the Request 
-    
-   The system is not required to enable the qualification of a request 
-   by a user, for the purposes of filtering for reducing returned 
-   information or for traffic reduction.  
-    
-3.5     Provisioning 
-    
-   The architecture and protocol MAY support at least the existing 
-   administrative model as the current E.164 telephone number 
-   delegation system.  The protocol SHOULD also provide the ability to 
-   support corporate numbering plan or competitive directory service 
-   providers under separate root domains.  It SHOULD NOT require an 
-   additional centralized administrator beyond that required for the 
-   existing telephone number system. 
-    
-   The distribution of telephone numbers is a national affair by ITU 
-   treaty and different telephone number distribution schemes may 
-   require different delegation models.  How nations choose to 
-   administer the ENUM space within their borders is a national issue.  
-   In any case, the subscriber or enterprise is the ultimate authority 
-   for service provisioning. 
-    
-   Further, it must be possible for the authority to which a telephone 
-   number has been delegated to redirect the query to a different 
-   entity that provides service-specific information for that number. 
-    
-3.6     Propagation of Changes 
-    
-   Propagation of Changes If multiple copies of the data are 
-   distributed in different areas, their update should be incorporated 
-   almost simultaneously depending on the application of DNS to 
-   services. 
-    
+   Drafts.  Internet-Drafts are draft documents valid for a maximum of
+   six months and may be updated, replaced, or obsoleted by other
+   documents at any time.  It is inappropriate to use Internet- Drafts
+   as reference material or to cite them other than as "work in
+   progress."
+
+   The list of current Internet-Drafts can be accessed at
+   http://www.ietf.org/ietf/1id-abstracts.txt
+   The list of Internet-Draft Shadow Directories can be accessed at
+   http://www.ietf.org/shadow.html.
+
+1.      Abstract
+
+   This paper defines the requirements for a DNS-based architecture and
+   protocols for mapping a telephone number to a set of attributes
+   (e.g., URLs) that can be used to contact a resource associated with
+   that number.  There are many possible protocols that can be
+   considered for a telephone number mapping service.  The purpose of
+   this document is to focus discussion on a DNS-based solution.  The
+   intention is to enumerate the expectations of such a solution and to
+   clarify the scope.
+
+2.      Conventions used in this document
+
+   The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
+   "SHOULD", "SHOULD NOT", "RECOMMENDED",  "MAY", and "OPTIONAL" in
+   this document are to be interpreted as described in RFC-2119 [2].
+
+3.      Requirements
+
+3.1     Endpoint Address Lookup
+
+   The system SHALL provide a service for the retrieval of service
+   specific endpoint addresses (e.g., email address, IP address, SIP
+   address, URL, etc.) or the retrieval of the addresses of servers, if
+   available, which may contain this endpoint information.
 
 
-  
-                          ENUM Requirements                  June 2000 
- 
- 
-   When a numbering plan change is made in a country or network, the 
-   update of relevant E.164 number data in DNS needs to be coordinated 
-   with the change. 
-    
-3.7     Response Timeout 
-    
-   The system SHALL have a defined timeout mechanism. 
-    
-3.8     Global Number Portability 
-    
-   The system MUST support existing local number portability 
-   mechanisms, where applicable.  It is RECOMMENDED that the system not 
-   be designed in such as way as to impede future global number 
-   portability.  
-    
-3.9     Scalability 
-    
-   The system MUST scale to handle quantities of telephone numbers and 
-   queries comparable to current and expected future PSTN usage.   
-    
-   It must be possible to operate the system based on telephone number 
+                          ENUM Requirements                  June 2000
+
+
+3.2     Capabilities Retrieval/Negotiation
+
+   The retrieval or negotiation of capabilities is beyond the scope of
+   the system.
+
+3.3     Retrieval of Additional Information and Capabilities
+
+   The retrieval of additional, application-specific information (e.g.,
+   spoken name for verification purposes) is beyond the scope of the
+   system.  The system MUST provide a service for the retrieval of
+   protocol and service information if available.
+
+   The system SHOULD provide access to capabilities relevant to the
+   telephone number in question.  The retrieval or negotiation of
+   capabilities will depend on the outcome of the rescap work or work
+   done in other groups.
+
+3.4     Qualification of the Request
+
+   The system is not required to enable the qualification of a request
+   by a user, for the purposes of filtering for reducing returned
+   information or for traffic reduction.
+
+3.5     Provisioning
+
+   The architecture and protocol MAY support at least the existing
+   administrative model as the current E.164 telephone number
+   delegation system.  The protocol SHOULD also provide the ability to
+   support corporate numbering plan or competitive directory service
+   providers under separate root domains.  It SHOULD NOT require an
+   additional centralized administrator beyond that required for the
+   existing telephone number system.
+
+   The distribution of telephone numbers is a national affair by ITU
+   treaty and different telephone number distribution schemes may
+   require different delegation models.  How nations choose to
+   administer the ENUM space within their borders is a national issue.
+   In any case, the subscriber or enterprise is the ultimate authority
+   for service provisioning.
+
+   Further, it must be possible for the authority to which a telephone
+   number has been delegated to redirect the query to a different
+   entity that provides service-specific information for that number.
+
+3.6     Propagation of Changes
+
+   Propagation of Changes If multiple copies of the data are
+   distributed in different areas, their update should be incorporated
+   almost simultaneously depending on the application of DNS to
+   services.
+
+
+
+
+                          ENUM Requirements                  June 2000
+
+
+   When a numbering plan change is made in a country or network, the
+   update of relevant E.164 number data in DNS needs to be coordinated
+   with the change.
+
+3.7     Response Timeout
+
+   The system SHALL have a defined timeout mechanism.
+
+3.8     Global Number Portability
+
+   The system MUST support existing local number portability
+   mechanisms, where applicable.  It is RECOMMENDED that the system not
+   be designed in such as way as to impede future global number
+   portability.
+
+3.9     Scalability
+
+   The system MUST scale to handle quantities of telephone numbers and
+   queries comparable to current and expected future PSTN usage.
+
+   It must be possible to operate the system based on telephone number
    blocks defined at the digit boundaries as well as explicit per-
-   number configuration. 
-    
-3.10    Query Performance 
-    
-   It SHOULD be possible to administer the ENUM service using the 
-   selected protocols and structures such that the current user 
-   expectations for latency in telecommunications services can be met.  
-   In particular, it SHOULD be possible to operate the system in such a 
-   manner that an ENUM query for a service-specific record can be 
-   satisfied within one second 95% of the time and that within two 
-   seconds, the query can be satisfied 99% of the time. 
-    
-3.11    Other PSTN Numbering Services 
-    
-   E.164 numbers, short codes, service codes and prefixes are 
-   categorized in dialing plans.  A prefix is an indicator consisting 
-   of one or more digits that allows the selection of different types 
-   of number formats, networks and/or services.  Prefixes are not part 
-   of the number and are part of a dialing plan.  The uses and the 
-   formats of prefixes are a national matter.  Short codes, e.g. 
-   emergency, or service codes may be used based on the national 
-   numbering plan.  Those codes are not universal and typically valid 
-   only within a numbering domain identified with the same country code 
-   or country code + network identification code. 
-    
-   PSTN type numbering services such as Emergency 911, directory 
-   assistance 411, and other carrier codes for services accessible via 
-   non-E164 (or subset) telephone number service access codes are 
-   outside the scope of ENUM. 
-    
-3.12    Privacy 
-  
-                          ENUM Requirements                  June 2000 
- 
- 
-    
-   The system MUST allow the owner of the telephone number to control 
-   the information which prospective callers may receive. 
-    
-3.13    Competition 
-    
-   The solution MUST permit competing service providers to offer 
-   telecommunications service for a given number.  Competing 
-   telecommunications services MUST be enabled where the ENUM entry is 
-   administered by the single entity to which the number is delegated.  
-   Who that single entity is, is beyond the scope of ENUM. 
-    
-3.14    Authorization of Requests and Responses 
-    
-   The system SHALL enable the authorization of requests and responses. 
-    
-3.15    Privacy and Integrity of Requests and Responses 
-    
-   The system SHALL enable the privacy and integrity of requests and 
-   responses. 
-    
-3.16    Call Routing 
-    
-   The system is not required to provide a service for routing calls or 
-   locating gateways to a specific service. 
-    
-3.17    Service Logic 
-    
-   The system is not responsible for employing service logic for the 
-   intelligent retrieval of information. 
-    
-3.18    E.164 Numbers 
-    
-   The system is not responsible for returning information on private 
-   numbering plans and non-E.164 numbers.  The system is responsible 
-   for returning information on 1-800 and other legitimate E.164 
-   numbers.   
-    
-3.19    Application Specific Use of ENUM 
-    
-   The ENUM service MUST be application agnostic.  It is expected that 
-   various other IETF work groups will develop ENUM specific usage 
-   profiles for their specific application.  ENUM will not mandate the 
-   use of any specific DNS Resource Record for any particular 
-   application.  
- 
-4.      Security Considerations 
- 
-   This document specifies several security requirements including 
-   privacy of information, and authorization, privacy and integrity or 
-   requests and responses.  
-    
+   number configuration.
+
+3.10    Query Performance
+
+   It SHOULD be possible to administer the ENUM service using the
+   selected protocols and structures such that the current user
+   expectations for latency in telecommunications services can be met.
+   In particular, it SHOULD be possible to operate the system in such a
+   manner that an ENUM query for a service-specific record can be
+   satisfied within one second 95% of the time and that within two
+   seconds, the query can be satisfied 99% of the time.
+
+3.11    Other PSTN Numbering Services
+
+   E.164 numbers, short codes, service codes and prefixes are
+   categorized in dialing plans.  A prefix is an indicator consisting
+   of one or more digits that allows the selection of different types
+   of number formats, networks and/or services.  Prefixes are not part
+   of the number and are part of a dialing plan.  The uses and the
+   formats of prefixes are a national matter.  Short codes, e.g.
+   emergency, or service codes may be used based on the national
+   numbering plan.  Those codes are not universal and typically valid
+   only within a numbering domain identified with the same country code
+   or country code + network identification code.
+
+   PSTN type numbering services such as Emergency 911, directory
+   assistance 411, and other carrier codes for services accessible via
+   non-E164 (or subset) telephone number service access codes are
+   outside the scope of ENUM.
+
+3.12    Privacy
+
+                          ENUM Requirements                  June 2000
+
+
+
+   The system MUST allow the owner of the telephone number to control
+   the information which prospective callers may receive.
+
+3.13    Competition
+
+   The solution MUST permit competing service providers to offer
+   telecommunications service for a given number.  Competing
+   telecommunications services MUST be enabled where the ENUM entry is
+   administered by the single entity to which the number is delegated.
+   Who that single entity is, is beyond the scope of ENUM.
+
+3.14    Authorization of Requests and Responses
+
+   The system SHALL enable the authorization of requests and responses.
+
+3.15    Privacy and Integrity of Requests and Responses
+
+   The system SHALL enable the privacy and integrity of requests and
+   responses.
+
+3.16    Call Routing
+
+   The system is not required to provide a service for routing calls or
+   locating gateways to a specific service.
+
+3.17    Service Logic
+
+   The system is not responsible for employing service logic for the
+   intelligent retrieval of information.
+
+3.18    E.164 Numbers
+
+   The system is not responsible for returning information on private
+   numbering plans and non-E.164 numbers.  The system is responsible
+   for returning information on 1-800 and other legitimate E.164
+   numbers.
+
+3.19    Application Specific Use of ENUM
+
+   The ENUM service MUST be application agnostic.  It is expected that
+   various other IETF work groups will develop ENUM specific usage
+   profiles for their specific application.  ENUM will not mandate the
+   use of any specific DNS Resource Record for any particular
+   application.
+
+4.      Security Considerations
+
+   This document specifies several security requirements including
+   privacy of information, and authorization, privacy and integrity or
+   requests and responses.
+
+
+
+                          ENUM Requirements                  June 2000
+
+
+   The system will be designed to retrieve information required to
+   initiate an Internet telephony session.  Each of these session types
+   will have their own security threats, which should be addressed in
+   the groups responsible for those services.
+
+5.      References
+
+
+   1  Bradner, S., "The Internet Standards Process -- Revision 3", BCP
+      9, RFC 2026, October 1996.
+
+   2  Bradner, S., "Key words for use in RFCs to Indicate Requirement
+      Levels", BCP 14, RFC 2119, March 1997
+
+6.      Acknowledgements
+
+   This document is based on discussions from the ENUM working group.
+
+7.      Author's Addresses
+
+   Anne Brown
+   Nortel Networks
+   P.O. Box 3511, Station C
+   K1Y 4H7
+   Phone: +1 613 765 5274
+   Email: arbrown@nortelnetworks.com
+
+8.      Changes From draft-enum-rqmts-00.txt
+
+   Based on WG discussions and input documents from the SG2 workshop,
+   the following changes have been made since the previous version of
+   this draft:
+
+        3.1 Endpoint Address Lookup
+                Major - URLs are not the only response
+        3.3 Retrieval of Additional Information and Capabilities
+                Renamed from "Retrieval of Additional Information"
+                Minor - Added paragraph on capabilities
+        3.5 Provisioning
+                Major - New text involving change of ENUM scope
+        3.6 Propagation of Changes
+                New section
+                Major - New section based on nnar-e164-dns-iw-info.txt
+        3.9 Scalability
+                Renumbered from 3.8
+                Major - New paragraph on handling of both blocks and
+                individual telephone numbers.
+        3.10 Query Performance
+                Renumbered from 3.9
+                Major - Upgraded to support PSTN performance
+                expectations
+        3.11 Other PSTN Numbering Services
+                Renumbered from 3.10
+
+                          ENUM Requirements                  June 2000
+
+
+                Renamed from "Other PSTN Services"
+                Minor - Changes for clarification based on WG
+                discussions and nnar-e164-dns-iw-info.txt
+
+        3.13 Competition
+                Renumbered from 3.12
+                Major - Telephone number MUST be able to be
+                administered by a single entity
+
+        3.19 Application Specific Use of ENUM
+                New Section
+                Major - For clarification
+
+Full Copyright Statement
+
+   "Copyright (C) The Internet Society (date). All Rights Reserved.
+   This document and translations of it may be copied and furnished to
+   others, and derivative works that comment on or otherwise explain it
+   or assist in its implmentation may be prepared, copied, published
+   and distributed, in whole or in part, without restriction of any
+   kind, provided that the above copyright notice and this paragraph
+   are included on all such copies and derivative works. However, this
+   document itself may not be modified in any way, such as by removing
+   the copyright notice or references to the Internet Society or other
+   Internet organizations, except as needed for the purpose of
+   developing Internet standards in which case the procedures for
+   copyrights defined in the Internet Standards process must be
+   followed, or as required to translate it into
+
 
-  
-                          ENUM Requirements                  June 2000 
- 
- 
-   The system will be designed to retrieve information required to 
-   initiate an Internet telephony session.  Each of these session types 
-   will have their own security threats, which should be addressed in 
-   the groups responsible for those services. 
- 
-5.      References 
-    
- 
-   1  Bradner, S., "The Internet Standards Process -- Revision 3", BCP 
-      9, RFC 2026, October 1996. 
-    
-   2  Bradner, S., "Key words for use in RFCs to Indicate Requirement 
-      Levels", BCP 14, RFC 2119, March 1997 
-    
-6.      Acknowledgements         
-    
-   This document is based on discussions from the ENUM working group. 
-    
-7.      Author's Addresses 
-    
-   Anne Brown 
-   Nortel Networks 
-   P.O. Box 3511, Station C 
-   K1Y 4H7 
-   Phone: +1 613 765 5274 
-   Email: arbrown@nortelnetworks.com 
-    
-8.      Changes From draft-enum-rqmts-00.txt 
-    
-   Based on WG discussions and input documents from the SG2 workshop, 
-   the following changes have been made since the previous version of 
-   this draft: 
-    
-        3.1 Endpoint Address Lookup 
-                Major - URLs are not the only response 
-        3.3 Retrieval of Additional Information and Capabilities 
-                Renamed from "Retrieval of Additional Information" 
-                Minor - Added paragraph on capabilities 
-        3.5 Provisioning 
-                Major - New text involving change of ENUM scope 
-        3.6 Propagation of Changes 
-                New section 
-                Major - New section based on nnar-e164-dns-iw-info.txt 
-        3.9 Scalability 
-                Renumbered from 3.8 
-                Major - New paragraph on handling of both blocks and 
-                individual telephone numbers. 
-        3.10 Query Performance 
-                Renumbered from 3.9 
-                Major - Upgraded to support PSTN performance  
-                expectations 
-        3.11 Other PSTN Numbering Services 
-                Renumbered from 3.10 
-  
-                          ENUM Requirements                  June 2000 
- 
- 
-                Renamed from "Other PSTN Services" 
-                Minor - Changes for clarification based on WG  
-                discussions and nnar-e164-dns-iw-info.txt 
-    
-        3.13 Competition 
-                Renumbered from 3.12 
-                Major - Telephone number MUST be able to be  
-                administered by a single entity 
-                 
-        3.19 Application Specific Use of ENUM 
-                New Section 
-                Major - For clarification  
-    
-Full Copyright Statement 
-    
-   "Copyright (C) The Internet Society (date). All Rights Reserved. 
-   This document and translations of it may be copied and furnished to 
-   others, and derivative works that comment on or otherwise explain it 
-   or assist in its implmentation may be prepared, copied, published 
-   and distributed, in whole or in part, without restriction of any 
-   kind, provided that the above copyright notice and this paragraph 
-   are included on all such copies and derivative works. However, this 
-   document itself may not be modified in any way, such as by removing 
-   the copyright notice or references to the Internet Society or other 
-   Internet organizations, except as needed for the purpose of 
-   developing Internet standards in which case the procedures for 
-   copyrights defined in the Internet Standards process must be 
-   followed, or as required to translate it into 
-    
 
 
 
@@ -338,5 +339,4 @@ Full Copyright Statement
 
 
 
-  
 
diff --git a/doc/draft/draft-ietf-ipngwg-default-addr-select-00.txt b/doc/draft/draft-ietf-ipngwg-default-addr-select-00.txt
index f62bd8d558..93d81bc63b 100644
--- a/doc/draft/draft-ietf-ipngwg-default-addr-select-00.txt
+++ b/doc/draft/draft-ietf-ipngwg-default-addr-select-00.txt
@@ -1,561 +1,561 @@
-IPng Working Group                                               R. Draves 
-Internet Draft                                          Microsoft Research 
-Document: draft-ietf-ipngwg-default-addr-select-00.txt    October 22, 1999 
-Category: Standards Track                                               
- 
-                   Default Address Selection for IPv6 
+IPng Working Group                                               R. Draves
+Internet Draft                                          Microsoft Research
+Document: draft-ietf-ipngwg-default-addr-select-00.txt    October 22, 1999
+Category: Standards Track
 
-Status of this Memo 
+                   Default Address Selection for IPv6
 
-   This document is an Internet-Draft and is in full conformance with 
-   all provisions of Section 10 of RFC 2026 [1]. 
+Status of this Memo
 
-   Internet-Drafts are working documents of the Internet Engineering 
-   Task Force (IETF), its areas, and its working groups. Note that 
+   This document is an Internet-Draft and is in full conformance with
+   all provisions of Section 10 of RFC 2026 [1].
+
+   Internet-Drafts are working documents of the Internet Engineering
+   Task Force (IETF), its areas, and its working groups. Note that
    other groups may also distribute working documents as Internet-
-   Drafts. 
+   Drafts.
 
-   Internet-Drafts are draft documents valid for a maximum of six 
-   months and may be updated, replaced, or obsoleted by other documents 
-   at any time. It is inappropriate to use Internet-Drafts as reference 
-   material or to cite them other than as "work in progress." 
+   Internet-Drafts are draft documents valid for a maximum of six
+   months and may be updated, replaced, or obsoleted by other documents
+   at any time. It is inappropriate to use Internet-Drafts as reference
+   material or to cite them other than as "work in progress."
 
-   The list of current Internet-Drafts can be accessed at 
-   http://www.ietf.org/ietf/1id-abstracts.txt. 
+   The list of current Internet-Drafts can be accessed at
+   http://www.ietf.org/ietf/1id-abstracts.txt.
 
-   The list of Internet-Draft Shadow Directories can be accessed at 
-   http://www.ietf.org/shadow.html. 
+   The list of Internet-Draft Shadow Directories can be accessed at
+   http://www.ietf.org/shadow.html.
 
-Abstract 
+Abstract
 
-   This document describes two algorithms, for destination address 
-   ordering and for source address selection. The algorithms specify 
-   default behavior for all IPv6 implementations. They do not override 
-   choices made by applications or upper-layer protocols, nor do they 
-   preclude the development of more advanced mechanisms for address 
-   selection. The two algorithms share a common framework, including an 
-   optional mechanism for allowing administrators to provide policy 
-   that can override the default behavior. 
+   This document describes two algorithms, for destination address
+   ordering and for source address selection. The algorithms specify
+   default behavior for all IPv6 implementations. They do not override
+   choices made by applications or upper-layer protocols, nor do they
+   preclude the development of more advanced mechanisms for address
+   selection. The two algorithms share a common framework, including an
+   optional mechanism for allowing administrators to provide policy
+   that can override the default behavior.
 
-1. Introduction 
+1. Introduction
 
-   The IPv6 addressing architecture [2] allows multiple unicast 
-   addresses to be assigned to interfaces. These addresses may have 
-   different reachability scopes (link-local, site-local, or global). 
-   These addresses may be "preferred" or "deprecated" [3]. In addition, 
-   multi-homing situations will result in more addresses per node. For 
-   example, a node may have multiple interfaces, some of them tunnels 
-   or virtual interfaces, or a site may have multiple ISP attachments. 
+   The IPv6 addressing architecture [2] allows multiple unicast
+   addresses to be assigned to interfaces. These addresses may have
+   different reachability scopes (link-local, site-local, or global).
+   These addresses may be "preferred" or "deprecated" [3]. In addition,
+   multi-homing situations will result in more addresses per node. For
+   example, a node may have multiple interfaces, some of them tunnels
+   or virtual interfaces, or a site may have multiple ISP attachments.
 
-   The end result is that IPv6 implementations will very often be faced 
-   with multiple possible source and destination addresses when 
-   initiating communication. It is desirable to have simple default 
-   algorithms, common across all implementations, for selecting source 
-  
-Draves            Standards Track - Expires May 2000                 1 
+   The end result is that IPv6 implementations will very often be faced
+   with multiple possible source and destination addresses when
+   initiating communication. It is desirable to have simple default
+   algorithms, common across all implementations, for selecting source
+
+Draves            Standards Track - Expires May 2000                 1
 
-Default Address Selection for IPv6                    October 22, 1999 
- 
- 
-   and destination addresses so that developers and administrators can 
-   reason about and predict the behavior of their systems. 
+Default Address Selection for IPv6                    October 22, 1999
 
-   This document specifies source address selection and destination 
-   address selection separately, but using a common framework so that 
-   together the two algorithms yield useful results. The algorithms 
-   attempt to choose source and destination addresses of appropriate 
-   scope and configuration status (preferred or deprecated). 
-   Furthermore, this document suggests a preferred method, longest 
-   matching prefix, for choosing among otherwise equivalent addresses 
-   in the absence of better information. 
 
-   The framework also has policy hooks to allow administrative override 
-   of the default behavior. For example, using these hooks an 
-   administrator can specify a preferred source prefix for use with a 
-   destination prefix, or prefer destination addresses with one prefix 
-   over addresses with another prefix. These hooks give an 
-   administrator flexibility in dealing with some multi-homing and 
-   transition scenarios, but they are certainly not a panacea. 
+   and destination addresses so that developers and administrators can
+   reason about and predict the behavior of their systems.
 
-   The rules specified in this document MUST NOT be construed to 
-   override an application or upper-layer's explicit choice of 
-   destination or source address. 
+   This document specifies source address selection and destination
+   address selection separately, but using a common framework so that
+   together the two algorithms yield useful results. The algorithms
+   attempt to choose source and destination addresses of appropriate
+   scope and configuration status (preferred or deprecated).
+   Furthermore, this document suggests a preferred method, longest
+   matching prefix, for choosing among otherwise equivalent addresses
+   in the absence of better information.
 
-1.1. Conventions used in this document 
+   The framework also has policy hooks to allow administrative override
+   of the default behavior. For example, using these hooks an
+   administrator can specify a preferred source prefix for use with a
+   destination prefix, or prefer destination addresses with one prefix
+   over addresses with another prefix. These hooks give an
+   administrator flexibility in dealing with some multi-homing and
+   transition scenarios, but they are certainly not a panacea.
 
-   The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", 
-   "SHOULD", "SHOULD NOT", "RECOMMENDED",  "MAY", and "OPTIONAL" in 
-   this document are to be interpreted as described in RFC-2119 [4]. 
+   The rules specified in this document MUST NOT be construed to
+   override an application or upper-layer's explicit choice of
+   destination or source address.
 
-2. Framework 
+1.1. Conventions used in this document
 
-   Our framework for address selection derives from the most common 
-   implementation architecture, which separates the choice of 
-   destination address from the choice of source address. Consequently, 
-   the framework specifies two separate algorithms for these tasks. The 
-   algorithms are designed to work well together and they share a 
-   mechanism for administrative policy override. 
+   The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
+   "SHOULD", "SHOULD NOT", "RECOMMENDED",  "MAY", and "OPTIONAL" in
+   this document are to be interpreted as described in RFC-2119 [4].
 
-   In this implementation architecture, applications use APIs [5] like 
-   getipnodebyname() and getaddrinfo() that return a list of addresses 
-   to the application. The application then passes a destination 
-   address to the IPv6 layer with connect() or sendto(). The 
-   application might just use the first address in the list, or it 
-   might loop over the list of addresses to find a working address. In 
-   any case, the IPv6 network layer is never in a position where it 
-   needs to choose a destination address from several alternatives. The 
-   application might also specify a source address with bind(), but 
-   often the source address is left unspecified. Therefore the IPv6 
-   layer does often choose a source address from several alternatives. 
+2. Framework
 
-   As a consequence, we intend that implementations of 
-   getipnodebyname() and getaddrinfo() will use the destination address 
-  
-Draves            Standards Track - Expires May 2000                 2 
+   Our framework for address selection derives from the most common
+   implementation architecture, which separates the choice of
+   destination address from the choice of source address. Consequently,
+   the framework specifies two separate algorithms for these tasks. The
+   algorithms are designed to work well together and they share a
+   mechanism for administrative policy override.
+
+   In this implementation architecture, applications use APIs [5] like
+   getipnodebyname() and getaddrinfo() that return a list of addresses
+   to the application. The application then passes a destination
+   address to the IPv6 layer with connect() or sendto(). The
+   application might just use the first address in the list, or it
+   might loop over the list of addresses to find a working address. In
+   any case, the IPv6 network layer is never in a position where it
+   needs to choose a destination address from several alternatives. The
+   application might also specify a source address with bind(), but
+   often the source address is left unspecified. Therefore the IPv6
+   layer does often choose a source address from several alternatives.
+
+   As a consequence, we intend that implementations of
+   getipnodebyname() and getaddrinfo() will use the destination address
+
+Draves            Standards Track - Expires May 2000                 2
 
-Default Address Selection for IPv6                    October 22, 1999 
- 
- 
-   ordering algorithm specified here to sort the list of addresses that 
-   they return. Separately, the IPv6 network layer will use the source 
-   address selection algorithm when an application or upper-layer has 
-   not specified a source address. 
+Default Address Selection for IPv6                    October 22, 1999
 
-   The algorithms use several criteria in making their decisions. The 
-   combined effect is to prefer destination/source address pairs for 
-   which the two addresses are of equal scope or type, prefer smaller 
+
+   ordering algorithm specified here to sort the list of addresses that
+   they return. Separately, the IPv6 network layer will use the source
+   address selection algorithm when an application or upper-layer has
+   not specified a source address.
+
+   The algorithms use several criteria in making their decisions. The
+   combined effect is to prefer destination/source address pairs for
+   which the two addresses are of equal scope or type, prefer smaller
    scopes over larger scopes for the destination address, prefer non-
-   deprecated source addresses of sufficient scope to reach the 
-   destination, avoid the use of transitional addresses when native 
-   addresses are available, and all else being equal prefer address 
-   pairs having the longest possible common prefix. 
+   deprecated source addresses of sufficient scope to reach the
+   destination, avoid the use of transitional addresses when native
+   addresses are available, and all else being equal prefer address
+   pairs having the longest possible common prefix.
 
-   The framework optionally allows for the possibility of 
-   administrative configuration of policy that can override the default 
-   behavior of the algorithms. The policy override takes the form of a 
-   configurable table that provides precedence values and preferred 
-   source prefixes for destination prefixes. If an implementation is 
-   not configurable, or if an implementation has not been configured, 
-   then the default policy table specified in this document MUST be 
-   used. 
+   The framework optionally allows for the possibility of
+   administrative configuration of policy that can override the default
+   behavior of the algorithms. The policy override takes the form of a
+   configurable table that provides precedence values and preferred
+   source prefixes for destination prefixes. If an implementation is
+   not configurable, or if an implementation has not been configured,
+   then the default policy table specified in this document MUST be
+   used.
 
-2.1. Scope Comparisons 
+2.1. Scope Comparisons
 
-   Multicast destination addresses have a 4-bit scope field that 
-   controls the propagation of the multicast packet. The IPv6 
-   addressing architecture defines scope field values for node-local 
-   (0x1), link-local (0x2), site-local (0x5), organization-local (0x8), 
-   and global (0xE) scopes. 
+   Multicast destination addresses have a 4-bit scope field that
+   controls the propagation of the multicast packet. The IPv6
+   addressing architecture defines scope field values for node-local
+   (0x1), link-local (0x2), site-local (0x5), organization-local (0x8),
+   and global (0xE) scopes.
 
-   Application of the address selection algorithms in the presence of 
-   multicast destination addresses requires the comparison of a unicast 
+   Application of the address selection algorithms in the presence of
+   multicast destination addresses requires the comparison of a unicast
    address scope with a multicast address scope. We map unicast link-
    local to multicast link-local, unicast site-local to multicast site-
-   local, and unicast global scope to multicast global scope. For 
-   example, unicast site-local is equal to multicast site-local, which 
-   is smaller than multicast organization-local, which is smaller than 
-   unicast global, which is equal to multicast global. 
+   local, and unicast global scope to multicast global scope. For
+   example, unicast site-local is equal to multicast site-local, which
+   is smaller than multicast organization-local, which is smaller than
+   unicast global, which is equal to multicast global.
 
-   We write Scope(A) to mean the scope of address A. For example, if A 
-   is a link-local unicast address and B is a site-local multicast 
-   address, then Scope(A) < Scope(B). 
+   We write Scope(A) to mean the scope of address A. For example, if A
+   is a link-local unicast address and B is a site-local multicast
+   address, then Scope(A) < Scope(B).
 
-   This mapping implicitly conflates unicast site boundaries and 
-   multicast site boundaries. 
+   This mapping implicitly conflates unicast site boundaries and
+   multicast site boundaries.
 
-2.2. IPv4-Compatible Addresses and Other Format Prefixes 
+2.2. IPv4-Compatible Addresses and Other Format Prefixes
 
-   For the purposes of this document, IPv4-compatible addresses have 
-   global scope and "preferred" configuration status. 
+   For the purposes of this document, IPv4-compatible addresses have
+   global scope and "preferred" configuration status.
 
 
-  
-Draves            Standards Track - Expires May 2000                 3 
+
+Draves            Standards Track - Expires May 2000                 3
 
-Default Address Selection for IPv6                    October 22, 1999 
- 
- 
+Default Address Selection for IPv6                    October 22, 1999
+
+
    Similarly, NSAP addresses, IPX addresses, or addresses with as-yet-
-   undefined format prefixes should be treated as having global scope 
-   and "preferred" configuration status. Later standards may supercede 
-   this treatment. 
+   undefined format prefixes should be treated as having global scope
+   and "preferred" configuration status. Later standards may supercede
+   this treatment.
 
-   The loopback address should be treated as having link-local scope 
-   and "preferred" configuration status. 
+   The loopback address should be treated as having link-local scope
+   and "preferred" configuration status.
 
-2.3. Policy Table 
+2.3. Policy Table
 
-   The policy table is a longest-matching-prefix lookup table, like a 
-   routing table. Given an address A, a lookup in the policy table 
-   produces three values: a precedence value Precedence(A), a 
-   classification or label Label(A), and a second label 
-   MatchSrcLabel(A). 
+   The policy table is a longest-matching-prefix lookup table, like a
+   routing table. Given an address A, a lookup in the policy table
+   produces three values: a precedence value Precedence(A), a
+   classification or label Label(A), and a second label
+   MatchSrcLabel(A).
 
-   The precedence value Precedence(A) is used for sorting destination 
-   addresses. If Precedence(A) > Precedence(B), we say that address A 
-   has higher precedence than address B, meaning that our algorithm 
-   will prefer to sort destination address A before destination address 
-   B. 
+   The precedence value Precedence(A) is used for sorting destination
+   addresses. If Precedence(A) > Precedence(B), we say that address A
+   has higher precedence than address B, meaning that our algorithm
+   will prefer to sort destination address A before destination address
+   B.
 
-   The labels Label(A) and MatchSrcLabel(A) allow for policies that 
-   prefer a particular source address prefix for use with a destination 
-   address prefix. The algorithms prefer to use a source address S with 
-   a destination address D if Label(S) = MatchSrcLabel(D). 
+   The labels Label(A) and MatchSrcLabel(A) allow for policies that
+   prefer a particular source address prefix for use with a destination
+   address prefix. The algorithms prefer to use a source address S with
+   a destination address D if Label(S) = MatchSrcLabel(D).
 
-   IPv6 implementations SHOULD support configurable address selection 
-   via a mechanism at least as powerful as the policy tables defined 
-   here. If an implementation is not configurable or has not been 
-   configured, then it MUST operate according to the algorithms 
-   specified here in conjunction with the following default policy 
-   table: 
+   IPv6 implementations SHOULD support configurable address selection
+   via a mechanism at least as powerful as the policy tables defined
+   here. If an implementation is not configurable or has not been
+   configured, then it MUST operate according to the algorithms
+   specified here in conjunction with the following default policy
+   table:
 
-                Prefix    Precedence Label MatchSrcLabel 
-                fe80::/10     40       1         1 
-                fec0::/10     30       2         2 
-                ::/0          20       3         3 
-                2002::/16     10       4         4 
-                ::/96         10       5         5 
- 
-   One effect of the default policy table is to prefer using native 
-   source addresses with native destination addresses, 6to4 source 
-   addresses with 6to4 destination addresses, and v4-compatible source 
-   addresses with v4-compatible destination addresses. Another effect 
-   of the default policy table is to prefer communication using native 
-   addresses to communication using either 6to4 or v4-compatible 
-   addresses, but not to express a preference for 6to4 addresses over 
-   v4-compatible addresses or vice-versa. 
+                Prefix    Precedence Label MatchSrcLabel
+                fe80::/10     40       1         1
+                fec0::/10     30       2         2
+                ::/0          20       3         3
+                2002::/16     10       4         4
+                ::/96         10       5         5
+
+   One effect of the default policy table is to prefer using native
+   source addresses with native destination addresses, 6to4 source
+   addresses with 6to4 destination addresses, and v4-compatible source
+   addresses with v4-compatible destination addresses. Another effect
+   of the default policy table is to prefer communication using native
+   addresses to communication using either 6to4 or v4-compatible
+   addresses, but not to express a preference for 6to4 addresses over
+   v4-compatible addresses or vice-versa.
 
 
 
 
-  
-Draves            Standards Track - Expires May 2000                 4 
+
+Draves            Standards Track - Expires May 2000                 4
 
-Default Address Selection for IPv6                    October 22, 1999 
- 
- 
-2.4. Candidate Source Addresses 
+Default Address Selection for IPv6                    October 22, 1999
 
-   Both the destination address ordering algorithm and the source 
-   address selection algorithm use the concept of a "candidate set" of 
-   potential source addresses for a given destination address. 
 
-   We write CandidateSrc(A) to denote the candidate set for the address 
-   A. In some cases the destination address A may be qualified with a 
-   scope-id or other information that will constrain the candidate set. 
+2.4. Candidate Source Addresses
+
+   Both the destination address ordering algorithm and the source
+   address selection algorithm use the concept of a "candidate set" of
+   potential source addresses for a given destination address.
+
+   We write CandidateSrc(A) to denote the candidate set for the address
+   A. In some cases the destination address A may be qualified with a
+   scope-id or other information that will constrain the candidate set.
    We write PreferSrc(A) to denote the subset of preferred (non-
-   deprecated) addresses in CandidateSrc(A)  We write MatchSrc(A) to 
-   denote the subset of addresses S in PreferSrc(A) for which Label(S) 
-   = MatchSrcLabel(A). 
+   deprecated) addresses in CandidateSrc(A)  We write MatchSrc(A) to
+   denote the subset of addresses S in PreferSrc(A) for which Label(S)
+   = MatchSrcLabel(A).
 
-   The destination address ordering algorithm and the source address 
-   selection algorithm specify somewhat different definitions for 
-   CandidateSrc(A). This is because the two algorithms operate in 
-   different environments. The source address selection algorithm 
-   assumes that an outgoing interface for a packet has already been 
-   selected, while the destination address ordering algorithm does not 
-   assume that knowledge. Therefore the destination address ordering 
-   algorithm uses a broader or more-inclusive definition of 
-   CandidateSrc(A). 
+   The destination address ordering algorithm and the source address
+   selection algorithm specify somewhat different definitions for
+   CandidateSrc(A). This is because the two algorithms operate in
+   different environments. The source address selection algorithm
+   assumes that an outgoing interface for a packet has already been
+   selected, while the destination address ordering algorithm does not
+   assume that knowledge. Therefore the destination address ordering
+   algorithm uses a broader or more-inclusive definition of
+   CandidateSrc(A).
 
-   In any case, anycast addresses, multicast addresses, and the 
-   unspecified address MUST NOT be included in a candidate set. 
+   In any case, anycast addresses, multicast addresses, and the
+   unspecified address MUST NOT be included in a candidate set.
 
-2.5. Common Prefix Length 
+2.5. Common Prefix Length
 
-   We define the common prefix length CommonPrefixLen(A, B) of two 
-   addresses A and B as the length of the longest prefix that the two 
-   addresses have in common. It ranges from 0 to 128. 
+   We define the common prefix length CommonPrefixLen(A, B) of two
+   addresses A and B as the length of the longest prefix that the two
+   addresses have in common. It ranges from 0 to 128.
 
-   We define the maximum common prefix length MaxCommonPrefixLen(A, X) 
-   of an address A and a non-empty set of addresses X as the maximum of 
-   CommonPrefixLen(A, B) for addresses B in the set X. 
+   We define the maximum common prefix length MaxCommonPrefixLen(A, X)
+   of an address A and a non-empty set of addresses X as the maximum of
+   CommonPrefixLen(A, B) for addresses B in the set X.
 
-3. Destination Address Ordering 
+3. Destination Address Ordering
 
-   The destination address ordering algorithm takes a list of 
-   destination addresses and sorts the addresses to produce a new list. 
-   It is specified here in terms of the pair-wise comparison of 
-   addresses DA and DB, where DA appears before DB in the original 
-   list. 
+   The destination address ordering algorithm takes a list of
+   destination addresses and sorts the addresses to produce a new list.
+   It is specified here in terms of the pair-wise comparison of
+   addresses DA and DB, where DA appears before DB in the original
+   list.
 
-   The pair-wise comparison consists of four rules, which MUST be 
-   applied in order. If a rule determines a result, then the remaining 
-   rules are not relevant and MUST be ignored. Subsequent rules act as 
-   tie-breakers for earlier rules. 
+   The pair-wise comparison consists of four rules, which MUST be
+   applied in order. If a rule determines a result, then the remaining
+   rules are not relevant and MUST be ignored. Subsequent rules act as
+   tie-breakers for earlier rules.
 
-   Rule 1: If MatchSrc(DA) is non-empty and MatchSrc(DB) is empty, then 
-   sort DA before DB. Similarly, if MatchSrc(DA) is empty and 
-   MatchSrc(DB) is non-empty, then sort DB before DA. 
-  
-Draves            Standards Track - Expires May 2000                 5 
+   Rule 1: If MatchSrc(DA) is non-empty and MatchSrc(DB) is empty, then
+   sort DA before DB. Similarly, if MatchSrc(DA) is empty and
+   MatchSrc(DB) is non-empty, then sort DB before DA.
+
+Draves            Standards Track - Expires May 2000                 5
 
-Default Address Selection for IPv6                    October 22, 1999 
- 
- 
-   Rule 2: If Precedence(A) > Precedence(B), then sort DA before DB. 
-   Similarly, if Precedence(B) > Precedence(A), then sort DB before DA. 
-
-   Rule 3: If MatchSrc(DA) and MatchSrc(DB) are both non-empty. If 
-   MaxCommonPrefixLen(DA, MatchSrc(DA)) > MaxCommonPrefixLen(DB, 
-   MatchSrc(DB)), then sort DA before DB. Similarly, if 
-   MaxCommonPrefixLen(DB, MatchSrc(DB)) > MaxCommonPrefixLen(DA, 
-   MatchSrc(DA)), then sort DB before DA. 
-
-   Rule 4: Sort DA before DB. 
-
-   The third and fourth rules MAY be superceded if the implementation 
-   has other means of sorting destination addresses. For example, if 
-   the implementation somehow knows which destination addresses will 
-   result in the "best" communications performance. 
-
-3.1. Candidate Source Addresses 
-
-   For the purposes of destination address ordering, the candidate set 
-   of source addresses CandidateSrc(D) for a destination address D 
-   SHOULD contain all and only the unicast addresses assigned to 
-   interfaces that might be used to send to the destination D. 
-
-   For example, if the address D is a link-local unicast address that 
-   is qualified with a scope-id value specifying a particular 
-   interface, then CandidateSrc(D) SHOULD contain all and only the 
-   unicast addresses assigned to that interface. 
-
-   For example, if the address D is a global scope unicast address, 
-   then CandidateSrc(D) MAY contain every unicast address assigned to 
-   all interfaces. However if the implementation wishes to consult a 
-   routing table and determine a likely outgoing interface, then 
-   CandidateSrc(D) MAY contain only unicast addresses assigned to that 
-   outgoing interface. 
-
-4. Source Address Selection 
-
-   The source address selection algorithm chooses a source address for 
-   use with a destination address D. It is specified here in terms of 
-   the pair-wise comparison of addresses SA and SB. The pair-wise 
-   comparison can be used to select an address from the set 
-   CandidateSrc(D). 
-
-   The pair-wise comparison consists of six rules, which MUST be 
-   applied in order. If a rule chooses an address, then the remaining 
-   rules are not relevant and MUST be ignored. Subsequent rules act as 
-   tie-breakers for earlier rules. If the six rules fail to choose an 
-   address, some unspecified tie-breaker MUST be used. 
-
-   Rule 1: If SA is in MatchSrc(D) and SB is not, then choose SA. 
-   Similarly, if SB is in MatchSrc(D) and SA is not, then choose SB. 
+Default Address Selection for IPv6                    October 22, 1999
 
 
-  
-Draves            Standards Track - Expires May 2000                 6 
+   Rule 2: If Precedence(A) > Precedence(B), then sort DA before DB.
+   Similarly, if Precedence(B) > Precedence(A), then sort DB before DA.
+
+   Rule 3: If MatchSrc(DA) and MatchSrc(DB) are both non-empty. If
+   MaxCommonPrefixLen(DA, MatchSrc(DA)) > MaxCommonPrefixLen(DB,
+   MatchSrc(DB)), then sort DA before DB. Similarly, if
+   MaxCommonPrefixLen(DB, MatchSrc(DB)) > MaxCommonPrefixLen(DA,
+   MatchSrc(DA)), then sort DB before DA.
+
+   Rule 4: Sort DA before DB.
+
+   The third and fourth rules MAY be superceded if the implementation
+   has other means of sorting destination addresses. For example, if
+   the implementation somehow knows which destination addresses will
+   result in the "best" communications performance.
+
+3.1. Candidate Source Addresses
+
+   For the purposes of destination address ordering, the candidate set
+   of source addresses CandidateSrc(D) for a destination address D
+   SHOULD contain all and only the unicast addresses assigned to
+   interfaces that might be used to send to the destination D.
+
+   For example, if the address D is a link-local unicast address that
+   is qualified with a scope-id value specifying a particular
+   interface, then CandidateSrc(D) SHOULD contain all and only the
+   unicast addresses assigned to that interface.
+
+   For example, if the address D is a global scope unicast address,
+   then CandidateSrc(D) MAY contain every unicast address assigned to
+   all interfaces. However if the implementation wishes to consult a
+   routing table and determine a likely outgoing interface, then
+   CandidateSrc(D) MAY contain only unicast addresses assigned to that
+   outgoing interface.
+
+4. Source Address Selection
+
+   The source address selection algorithm chooses a source address for
+   use with a destination address D. It is specified here in terms of
+   the pair-wise comparison of addresses SA and SB. The pair-wise
+   comparison can be used to select an address from the set
+   CandidateSrc(D).
+
+   The pair-wise comparison consists of six rules, which MUST be
+   applied in order. If a rule chooses an address, then the remaining
+   rules are not relevant and MUST be ignored. Subsequent rules act as
+   tie-breakers for earlier rules. If the six rules fail to choose an
+   address, some unspecified tie-breaker MUST be used.
+
+   Rule 1: If SA is in MatchSrc(D) and SB is not, then choose SA.
+   Similarly, if SB is in MatchSrc(D) and SA is not, then choose SB.
+
+
+
+Draves            Standards Track - Expires May 2000                 6
 
-Default Address Selection for IPv6                    October 22, 1999 
- 
- 
-   Rule 2: If SA is equal to D, then choose SA. Similarly, if SB is 
-   equal to D, then choose SB. 
+Default Address Selection for IPv6                    October 22, 1999
 
-   Rule 3a: If Scope(SA) < Scope(SB). If Scope(SA) < Scope(D), then 
-   choose SB. Otherwise, if one of the source addresses is "preferred" 
-   and one of them is "deprecated", then choose the "preferred" 
-   address. Otherwise, choose SA. 
 
-   Rule 3b: Similarly, if Scope(SB) < Scope(SA). If Scope(SB) < 
-   Scope(D), then choose SA. Otherwise, if one of the source addresses 
-   is "preferred" and one of them is "deprecated", then choose the 
-   "preferred" address. Otherwise, choose SB. 
+   Rule 2: If SA is equal to D, then choose SA. Similarly, if SB is
+   equal to D, then choose SB.
 
-   Rule 4: The addresses SA and SB have the same scope. If one of the 
-   source addresses is "preferred" and one of them is "deprecated", an 
-   implementation MUST choose the one that is preferred. 
+   Rule 3a: If Scope(SA) < Scope(SB). If Scope(SA) < Scope(D), then
+   choose SB. Otherwise, if one of the source addresses is "preferred"
+   and one of them is "deprecated", then choose the "preferred"
+   address. Otherwise, choose SA.
 
-   Rule 5: If Label(SA) = MatchSrcLabel(D) and Label(SB) <> 
-   MatchSrcLabel(D), then choose SA. Similarly, if Label(SA) <> 
-   MatchSrcLabel(D) and Label(SB) = MatchSrcLabel(D), then choose SB. 
-   (Note that this rule will apply only when both SA and SB are 
-   deprecated.) 
+   Rule 3b: Similarly, if Scope(SB) < Scope(SA). If Scope(SB) <
+   Scope(D), then choose SA. Otherwise, if one of the source addresses
+   is "preferred" and one of them is "deprecated", then choose the
+   "preferred" address. Otherwise, choose SB.
 
-   Rule 6: If CommonPrefixLen(SA, D) > CommonPrefixLen(SB, D), then 
-   choose SA. Similarly, if CommonPrefixLen(SB, D) > 
-   CommonPrefixLen(SA, D), then choose SB. 
+   Rule 4: The addresses SA and SB have the same scope. If one of the
+   source addresses is "preferred" and one of them is "deprecated", an
+   implementation MUST choose the one that is preferred.
 
-   The sixth rule MAY be superceded if the implementation has other 
-   means of choosing among source addresses. For example, if the 
-   implementation somehow knows which source address will result in the 
-   "best" communications performance. 
+   Rule 5: If Label(SA) = MatchSrcLabel(D) and Label(SB) <>
+   MatchSrcLabel(D), then choose SA. Similarly, if Label(SA) <>
+   MatchSrcLabel(D) and Label(SB) = MatchSrcLabel(D), then choose SB.
+   (Note that this rule will apply only when both SA and SB are
+   deprecated.)
 
-4.1. Candidate Source Addresses 
+   Rule 6: If CommonPrefixLen(SA, D) > CommonPrefixLen(SB, D), then
+   choose SA. Similarly, if CommonPrefixLen(SB, D) >
+   CommonPrefixLen(SA, D), then choose SB.
 
-   For the purposes of source address selection, the candidate set of 
-   source addresses CandidateSrc(D) for a destination address D MUST 
-   contain all and only the unicast addresses assigned to the interface 
-   that will be used to send to the destination D. 
+   The sixth rule MAY be superceded if the implementation has other
+   means of choosing among source addresses. For example, if the
+   implementation somehow knows which source address will result in the
+   "best" communications performance.
 
-5. Interactions with Routing 
+4.1. Candidate Source Addresses
 
-   All IPv6 nodes, including both hosts and routers, MUST conform to 
-   this specification. 
+   For the purposes of source address selection, the candidate set of
+   source addresses CandidateSrc(D) for a destination address D MUST
+   contain all and only the unicast addresses assigned to the interface
+   that will be used to send to the destination D.
 
-   This specification of source address selection implies that routing 
-   (more precisely, selecting an outgoing interface on a node with 
-   multiple interfaces) is done before source address selection. 
-   However, implementations MAY use source address considerations as a 
-   tiebreaker when choosing among otherwise equivalent routes. 
+5. Interactions with Routing
 
-   For example, suppose a node has interfaces on two different links, 
-   with both links having a working default router. One of the 
-   interfaces has a preferred global address and the other interface 
-  
-Draves            Standards Track - Expires May 2000                 7 
+   All IPv6 nodes, including both hosts and routers, MUST conform to
+   this specification.
+
+   This specification of source address selection implies that routing
+   (more precisely, selecting an outgoing interface on a node with
+   multiple interfaces) is done before source address selection.
+   However, implementations MAY use source address considerations as a
+   tiebreaker when choosing among otherwise equivalent routes.
+
+   For example, suppose a node has interfaces on two different links,
+   with both links having a working default router. One of the
+   interfaces has a preferred global address and the other interface
+
+Draves            Standards Track - Expires May 2000                 7
 
-Default Address Selection for IPv6                    October 22, 1999 
- 
- 
-   only has a deprecated global address. When sending to a global 
-   destination address, if there's no routing reason to prefer one 
-   interface over the other, then an implementation MAY preferentially 
-   choose the outgoing interface that will allow it to use the 
-   preferred global source address. 
+Default Address Selection for IPv6                    October 22, 1999
 
-6. Interactions with Mobility 
 
-   TBD 
+   only has a deprecated global address. When sending to a global
+   destination address, if there's no routing reason to prefer one
+   interface over the other, then an implementation MAY preferentially
+   choose the outgoing interface that will allow it to use the
+   preferred global source address.
 
-7. Implementation Considerations 
+6. Interactions with Mobility
 
-   The destination address ordering algorithm needs information about 
-   potential source addresses. One possible implementation strategy is 
-   for getipnodebyname() and getaddrinfo() to call down to the IPv6 
-   network layer with a list of destination addresses, sort the list in 
-   the network layer with full current knowledge of available source 
-   addresses, and return the sorted list to getipnodebyname() or 
-   getaddrinfo(). This is simple but it introduces overhead. 
+   TBD
 
-   Another implementation strategy is to call down to the network layer 
-   to retrieve source address information and then sort the list of 
-   addresses directly in the context of getipnodebyname() or 
-   getaddrinfo(). To reduce overhead in this approach, the source 
-   address information SHOULD be cached, amortizing the overhead of 
-   retrieving it across multiple calls to getipnodebyname() and 
-   getaddrinfo(). If an implementation uses cached and possibly stale 
-   source address information in its implementation of destination 
-   address ordering, then it MUST ensure that the source address 
-   information is no more than one second out of date. 
+7. Implementation Considerations
 
-8. Security Considerations 
+   The destination address ordering algorithm needs information about
+   potential source addresses. One possible implementation strategy is
+   for getipnodebyname() and getaddrinfo() to call down to the IPv6
+   network layer with a list of destination addresses, sort the list in
+   the network layer with full current knowledge of available source
+   addresses, and return the sorted list to getipnodebyname() or
+   getaddrinfo(). This is simple but it introduces overhead.
 
-   This document has no direct impact on Internet infrastructure 
-   security. 
+   Another implementation strategy is to call down to the network layer
+   to retrieve source address information and then sort the list of
+   addresses directly in the context of getipnodebyname() or
+   getaddrinfo(). To reduce overhead in this approach, the source
+   address information SHOULD be cached, amortizing the overhead of
+   retrieving it across multiple calls to getipnodebyname() and
+   getaddrinfo(). If an implementation uses cached and possibly stale
+   source address information in its implementation of destination
+   address ordering, then it MUST ensure that the source address
+   information is no more than one second out of date.
 
-References 
- 
-   1  S. Bradner, "The Internet Standards Process -- Revision 3", BCP 
-      9, RFC 2026, October 1996. 
+8. Security Considerations
 
-   2  R. Hinden, S. Deering, "IP Version 6 Addressing Architecture", 
-      RFC 2373, July 1998. 
+   This document has no direct impact on Internet infrastructure
+   security.
 
-   3  S. Thompson, T. Narten, "IPv6 Stateless Address 
-      Autoconfiguration", RFC 2462 , December 1998. 
+References
 
-   4  S. Bradner, "Key words for use in RFCs to Indicate Requirement 
-      Levels", BCP 14, RFC 2119, March 1997. 
+   1  S. Bradner, "The Internet Standards Process -- Revision 3", BCP
+      9, RFC 2026, October 1996.
 
-   5  R. Gilligan, S. Thomson, J. Bound, W. Stevens, "Basic Socket 
-      Interface Extensions for IPv6", RFC 2553, March 1999. 
+   2  R. Hinden, S. Deering, "IP Version 6 Addressing Architecture",
+      RFC 2373, July 1998.
 
-  
-Draves            Standards Track - Expires May 2000                 8 
+   3  S. Thompson, T. Narten, "IPv6 Stateless Address
+      Autoconfiguration", RFC 2462 , December 1998.
+
+   4  S. Bradner, "Key words for use in RFCs to Indicate Requirement
+      Levels", BCP 14, RFC 2119, March 1997.
+
+   5  R. Gilligan, S. Thomson, J. Bound, W. Stevens, "Basic Socket
+      Interface Extensions for IPv6", RFC 2553, March 1999.
+
+
+Draves            Standards Track - Expires May 2000                 8
 
 
 
-Acknowledgments 
+Acknowledgments
 
-   The author would like to acknowledge the contributions of the IPng 
-   Working Group. 
+   The author would like to acknowledge the contributions of the IPng
+   Working Group.
 
-Author's Address 
+Author's Address
 
-   Richard Draves 
-   Microsoft Research 
-   One Microsoft Way 
-   Redmond, WA 98052 
-   Email: richdr@microsoft.com 
+   Richard Draves
+   Microsoft Research
+   One Microsoft Way
+   Redmond, WA 98052
+   Email: richdr@microsoft.com
 
-Revision History 
+Revision History
 
-Changes from draft-draves-ipngw-simple-srcaddr-01 
+Changes from draft-draves-ipngw-simple-srcaddr-01
 
-   Added framework discussion. 
+   Added framework discussion.
 
-   Added algorithm for destination address ordering. 
+   Added algorithm for destination address ordering.
 
-   Added mechanism to allow the specification of administrative policy 
-   that can override the default behavior. 
+   Added mechanism to allow the specification of administrative policy
+   that can override the default behavior.
 
-   Added section on routing interactions and TBD section on mobility 
-   interactions. 
+   Added section on routing interactions and TBD section on mobility
+   interactions.
 
-   Changed the candidate set definition for source address selection, 
-   so that only addresses assigned to the outgoing interface are 
-   allowed. 
+   Changed the candidate set definition for source address selection,
+   so that only addresses assigned to the outgoing interface are
+   allowed.
 
-   Changed the loopback address treatment to link-local scope. 
+   Changed the loopback address treatment to link-local scope.
 
-Changes from draft-draves-ipngw-simple-srcaddr-00 
+Changes from draft-draves-ipngw-simple-srcaddr-00
 
-   Minor wording changes because DHCPv6 also supports "preferred" and 
-   "deprecated" addresses. 
+   Minor wording changes because DHCPv6 also supports "preferred" and
+   "deprecated" addresses.
 
-   Specified treatment of other format prefixes; now they are 
-   considered global scope, "preferred" addresses. 
+   Specified treatment of other format prefixes; now they are
+   considered global scope, "preferred" addresses.
 
-   Reiterated that anycast and multicast addresses are not allowed as 
-   source addresses. 
+   Reiterated that anycast and multicast addresses are not allowed as
+   source addresses.
 
-   Recommended that source addresses be taken from the outgoing 
-   interface. Required this for multicast destinations. Added analogous 
-   requirements for link-local and site-local destinations. 
+   Recommended that source addresses be taken from the outgoing
+   interface. Required this for multicast destinations. Added analogous
+   requirements for link-local and site-local destinations.
 
-   Specified treatment of the loopback address. 
+   Specified treatment of the loopback address.
 
-   Changed the second selection rule so that if both candidate source 
-   addresses have scope greater or equal than the destination address 
-   and only of them is preferred, the preferred address is chosen. 
+   Changed the second selection rule so that if both candidate source
+   addresses have scope greater or equal than the destination address
+   and only of them is preferred, the preferred address is chosen.
 
-  
-Draves            Standards Track - Expires May 2000                 9 
+
+Draves            Standards Track - Expires May 2000                 9
 
-Default Address Selection for IPv6                    October 22, 1999 
- 
- 
-   Full Copyright Statement 
+Default Address Selection for IPv6                    October 22, 1999
 
-   Copyright (C) The Internet Society (1999).  All Rights Reserved. 
 
-   This document and translations of it may be copied and furnished to 
-   others, and derivative works that comment on or otherwise explain it 
-   or assist in its implementation may be prepared, copied, published 
-   and distributed, in whole or in part, without restriction of any 
-   kind, provided that the above copyright notice and this paragraph 
-   are included on all such copies and derivative works.  However, this 
-   document itself may not be modified in any way, such as by removing 
-   the copyright notice or references to the Internet Society or other 
-   Internet organizations, except as needed for the purpose of 
-   developing Internet standards in which case the procedures for 
-   copyrights defined in the Internet Standards process must be 
-   followed, or as required to translate it into languages other than 
-   English. 
+   Full Copyright Statement
 
-   The limited permissions granted above are perpetual and will not be 
-   revoked by the Internet Society or its successors or assigns. 
+   Copyright (C) The Internet Society (1999).  All Rights Reserved.
 
-   This document and the information contained herein is provided on an 
-   "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING 
-   TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING 
-   BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION 
-   HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF 
-   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. 
+   This document and translations of it may be copied and furnished to
+   others, and derivative works that comment on or otherwise explain it
+   or assist in its implementation may be prepared, copied, published
+   and distributed, in whole or in part, without restriction of any
+   kind, provided that the above copyright notice and this paragraph
+   are included on all such copies and derivative works.  However, this
+   document itself may not be modified in any way, such as by removing
+   the copyright notice or references to the Internet Society or other
+   Internet organizations, except as needed for the purpose of
+   developing Internet standards in which case the procedures for
+   copyrights defined in the Internet Standards process must be
+   followed, or as required to translate it into languages other than
+   English.
+
+   The limited permissions granted above are perpetual and will not be
+   revoked by the Internet Society or its successors or assigns.
+
+   This document and the information contained herein is provided on an
+   "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING
+   TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
+   BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
+   HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
+   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
 
 
 
@@ -582,6 +582,6 @@ Default Address Selection for IPv6                    October 22, 1999
 
 
 
-  
-Draves            Standards Track - Expires May 2000                10 
+
+Draves            Standards Track - Expires May 2000                10
 
diff --git a/doc/draft/draft-skwan-gss-tsig-05.txt b/doc/draft/draft-skwan-gss-tsig-05.txt
index 8535e96fb8..0dc51507ca 100644
--- a/doc/draft/draft-skwan-gss-tsig-05.txt
+++ b/doc/draft/draft-skwan-gss-tsig-05.txt
@@ -576,7 +576,7 @@ The procedure for sending a signature-protected message is specified
 in [TSIG].  The data to be passed to the signature routine includes
 the whole DNS message with specific TSIG variables appended.  For the
 exact format, see [TSIG].  For this protocol, use the following
-TSIG variable values: 
+TSIG variable values:
 
    TSIG Record
      NAME = key_name that identifies this context
diff --git a/doc/draft/draft-skwan-utf8-dns-03.txt b/doc/draft/draft-skwan-utf8-dns-03.txt
index 3d7cdbc6b8..54378038a2 100644
--- a/doc/draft/draft-skwan-utf8-dns-03.txt
+++ b/doc/draft/draft-skwan-utf8-dns-03.txt
@@ -34,8 +34,8 @@ http://www.ietf.org/shadow.html.
 
 Abstract
 
-The Domain Name System standard specifies that names are represented 
-using the ASCII character encoding.  This document expands that 
+The Domain Name System standard specifies that names are represented
+using the ASCII character encoding.  This document expands that
 specification to allow the use of the UTF-8 character encoding, a
 superset of ASCII and a translation of the UCS-2 character encoding.
 
@@ -152,7 +152,7 @@ containing UTF-8 names to a non-UTF-8-aware DNS server.
 4. Security Considerations
 
 The choice of character encoding for names does not impact the
-security of the DNS protocol. 
+security of the DNS protocol.
 
 
 5. Acknowledgements
@@ -174,7 +174,7 @@ INTERNET-DRAFT                  UTF-8 DNS                February 2000
 [RFC1035]     P.V. Mockapetris, "Domain Names - Implementation and
               Specification," RFC 1035, ISI, Nov 1987.
 
-[RFC2044]     F. Yergeau, "UTF-8, a transformation format of Unicode 
+[RFC2044]     F. Yergeau, "UTF-8, a transformation format of Unicode
               and ISO 10646," RFC 2044, Alis Technologies, Oct 1996.
 
 [RFC1958]     B. Carpenter, "Architectural Principles of the
@@ -183,11 +183,11 @@ INTERNET-DRAFT                  UTF-8 DNS                February 2000
 [RFC1123]     R. Braden, "Requirements for Internet Hosts -
               Application and Support," STD 3, RFC 1123, January 1989.
 
-[RFC2130]     C. Weider et. al., "The Report of the IAB Character 
+[RFC2130]     C. Weider et. al., "The Report of the IAB Character
               Set Workshop held 29 February - 1 March 1996",
               RFC 2130, Apr 1997.
 
-[RFC2181]     R. Elz and R. Bush, "Clarifications to the DNS 
+[RFC2181]     R. Elz and R. Bush, "Clarifications to the DNS
               Specification," RFC 2181, University of Melbourne and
               RGnet Inc, July 1997.
 
diff --git a/doc/draft/draft-whr-dnsext-secure-online-update-00.txt b/doc/draft/draft-whr-dnsext-secure-online-update-00.txt
index 8d941bee47..6833196c3d 100644
--- a/doc/draft/draft-whr-dnsext-secure-online-update-00.txt
+++ b/doc/draft/draft-whr-dnsext-secure-online-update-00.txt
@@ -20,7 +20,7 @@ Status of this Memo
    Drafts.
 
    Internet-Drafts are draft documents valid for a maximum of six
-   months and may be updated, replaced, or obsoleted by other 
+   months and may be updated, replaced, or obsoleted by other
    documents at any time.  It is inappropriate to use Internet-Drafts
    as reference material or to cite them other than as ``work in
    progress.''
@@ -55,8 +55,8 @@ INTERNET-DRAFT    Secure Online DNS Dynamic Update            June 2000
 
    to enable a DNS zone to provide online dynamic update and at the
    same time, maintain the zone's security including role separation
-   and intrusion tolerance against insider and outsider attacks. 
-   Threshold digital signature is used to implement the proposed 
+   and intrusion tolerance against insider and outsider attacks.
+   Threshold digital signature is used to implement the proposed
    architecture.
 
 1 - Introduction
@@ -67,7 +67,7 @@ INTERNET-DRAFT    Secure Online DNS Dynamic Update            June 2000
    distinguishes itself in that it provides high security
    for a zone when allowing it support online dynamic update.
 
-   Familiarity with the DNS system [RFC1034, RFC1035], DNS 
+   Familiarity with the DNS system [RFC1034, RFC1035], DNS
    Security Extension [RFC2535], dynamic update [RFC2136] and
    secure dynamic update [RFC2137] is helpful and is assumed by
    this document.
@@ -110,7 +110,7 @@ INTERNET-DRAFT    Secure Online DNS Dynamic Update            June 2000
       has been pointed out that DNS dynamic updates, which enable
       real-time changes (that is, add, delete, or update) in
       name/address bindings, are useful under many circumstances
-      [Liu99,RFC2136]. (For example, such an update allows a 
+      [Liu99,RFC2136]. (For example, such an update allows a
 
 Wang, Huang & Rine	                                   [Page 2]
 
@@ -124,7 +124,7 @@ INTERNET-DRAFT    					  June 2000
       be computed online. It is worthwhile to note that although
       a DNS dynamic update requestor is communicating with a name
       server, the name server itself has no rights to update the
-      zone data. Instead, it is the zone private key, instead of 
+      zone data. Instead, it is the zone private key, instead of
       the name server's private key, that is needed in the dynamic
       update.
 
@@ -135,7 +135,7 @@ INTERNET-DRAFT    					  June 2000
       private key is not kept online,  zone transfer security is
       not automatically provided for dynamically added RRs, where
       they could be omitted, and authorization is not provided for
-      the server denial of the existence of a dynamically added 
+      the server denial of the existence of a dynamically added
       type [RFC2137]. In this sense, this mode is not a genuine
       DNS dynamic update. In mode B, on the other hand, the zone
       private key is kept online at the zone primary name server;
@@ -156,13 +156,13 @@ INTERNET-DRAFT    					  June 2000
       principle and making it possible for the name server
       administrator to abuse his/her power. (The importance of fending
       off insider attacks has been emphasized by the security
-      community [RFC2196].) 
+      community [RFC2196].)
 
 2 - The Secure On-line DNS Dynamic Update Architecture
 
    2.1 - Background: Threshold Cryptography
 
-      Threshold cryptography is a branch of cryptography that 
+      Threshold cryptography is a branch of cryptography that
       enables a group of n members, 1,2, ..., n, to act as a single
       communication party, using one pair of public and private keys
       [Des87,Des94,Des97]. Similar to the traditional public key
@@ -178,7 +178,7 @@ Wang, Huang & Rine	                                   [Page 3]
 INTERNET-DRAFT    					  June 2000
 
 
-      a corresponding key sharing mechanism must be devised.) To 
+      a corresponding key sharing mechanism must be devised.) To
       perform a cryptographic computation (such as decryption, signing,
       identification, etc.) on message m with key K_private, b,
       b <= n , group members will be required. Each member will compute
@@ -186,7 +186,7 @@ INTERNET-DRAFT    					  June 2000
       to produce the final result. The combiner is not necessarily to
       be trusted. Note that during this whole process the shared
       private key, K_private, is never reconstructed.  Further,
-      threshold cryptography requires that the shared private key 
+      threshold cryptography requires that the shared private key
       cannot be reconstructed from any t < b group members.
 
       Practical threshold cryptography for RSA and DSS have been
@@ -219,19 +219,19 @@ INTERNET-DRAFT    					  June 2000
 		  |   Name Server   |
 		  +-----------------+
 
-      In the above proposed architecture, we assume that there exist 
-      (n-1), n >= 2, machines in a given DNS zone that are under the 
-      control of the zone manager, but not under the control of the 
-      name server administrators. These machines are called the 
+      In the above proposed architecture, we assume that there exist
+      (n-1), n >= 2, machines in a given DNS zone that are under the
+      control of the zone manager, but not under the control of the
+      name server administrators. These machines are called the
       zone-security servers.
 
       Using a threshold cryptography scheme with n > t >= 1, the
       zone private key is shared among the (n-1) zone-security servers
       and the primary name server.  To update zone's data dynamically,
       some of the servers will be needed. Let b > t be the number of
-      zone private key shares needed in the computation of the 
+      zone private key shares needed in the computation of the
       signature of an RR. Since b >= 2, any change to the zone data
-      will need the cooperation of at least one zone-security server; 
+      will need the cooperation of at least one zone-security server;
 
 
 Wang, Huang & Rine	                                   [Page 4]
@@ -239,54 +239,54 @@ Wang, Huang & Rine	                                   [Page 4]
 INTERNET-DRAFT    					  June 2000
 
 
-      the name server administrator will have no way to modify the 
+      the name server administrator will have no way to modify the
       digitally signed zone data. Thus, the role separation principle
       holds. Moreover, the above architecture enhances intrusion
       tolerance of DNS.
 
       A DNS system is said to be k-intrusion-tolerant against an
-      entity, E, if breaking into k servers (including the 
-      zone-security servers and the DNS name servers, if applicable) 
-      that are outside E's control will not help E gain any knowledge 
-      of the zone private key. A DNS system is said to be intrusion 
-      tolerant against an outsider (insider) if it is at least 
-      1-intrusion-tolerant against the outsider (insider). The 
-      architecture proposed in this document can be configured to be 
+      entity, E, if breaking into k servers (including the
+      zone-security servers and the DNS name servers, if applicable)
+      that are outside E's control will not help E gain any knowledge
+      of the zone private key. A DNS system is said to be intrusion
+      tolerant against an outsider (insider) if it is at least
+      1-intrusion-tolerant against the outsider (insider). The
+      architecture proposed in this document can be configured to be
       intrusion tolerant against outside and inside attackers.
 
 	 Intrusion tolerance against outsider attacks. In the
 	    architecture, the zone private key cannot be recovered from
-	    any single location, thus, making the system intrusion 
+	    any single location, thus, making the system intrusion
 	    tolerant against an outside attacker. That is, even when an
 	    outside attacker manages to corrupt l, l <= t, of relevant
 	    servers (including the name servers and the zone-security
-	    servers), secrecy of the zone private key is still 
+	    servers), secrecy of the zone private key is still
 	    maintained.
 
 	 Intrusion tolerance against insider attacks.  The presence of
 	    zone security servers and the necessity of their involvement
-	    in signature computations constitute a defense line 
-	    against insider attacks, in particular, attacks from name 
-	    server administrators. Clearly, a hostile name server 
-	    administrator must break into at least t zone security 
-	    servers (to get access to the respective key shares) in 
+	    in signature computations constitute a defense line
+	    against insider attacks, in particular, attacks from name
+	    server administrators. Clearly, a hostile name server
+	    administrator must break into at least t zone security
+	    servers (to get access to the respective key shares) in
 	    order to perform unauthorized RR signature computations.
 
 3 - Implementation Details
 
    [RFC2535] defines two types of SIG records, the DSA SIG and
-   the RSA/MD5 SIG. The important configuration and implementation 
-   aspects of our proposed architecture with respect to these two types 
+   the RSA/MD5 SIG. The important configuration and implementation
+   aspects of our proposed architecture with respect to these two types
    of SIGs are given next.  In the following statement,
    the primary name server will be referred to as server 0 and the
-   (n-1) zone-security servers will be referred to as servers 
+   (n-1) zone-security servers will be referred to as servers
    1, 2, ... , (n-1).
 
    3.1 - Example Configurations
 
-      The following table gives some representative configurations, in 
-      terms of t and n, to achieve the above security levels in 
-      different application cases. 
+      The following table gives some representative configurations, in
+      terms of t and n, to achieve the above security levels in
+      different application cases.
 
 
 Wang, Huang & Rine	                                   [Page 5]
@@ -296,7 +296,7 @@ INTERNET-DRAFT    					  June 2000
 
       +----------------------------+----------------------------+
       |                            | RSA/MD5 SIG |  DSA SIG     |
-      |   SECURITY LEVEL           +-------------+--------------+ 
+      |   SECURITY LEVEL           +-------------+--------------+
       |                            | 1-2 |  2-4  |  1-3  | 2-5  |
       +----------------------------+-----+-------+-------+------+
       |Intrusion tolerant against  |     |       |       |      |
@@ -310,9 +310,9 @@ INTERNET-DRAFT    					  June 2000
 
       Assume that, in RSA, the zone's private key is d and its
       public key is (e, N). Phi(N) is the Euler function of N, i.e.,
-      phi(N) = (p-1)(q-1) where N = p * q. We use the threshold 
+      phi(N) = (p-1)(q-1) where N = p * q. We use the threshold
       digital signature scheme given in [DDB94] and now give
-      how the zone private key is shared and how to generate a 
+      how the zone private key is shared and how to generate a
       RSA/MD5 SIG RR online.
 
       The 1-2 case. In this case, the zone manager generates a random,
@@ -355,11 +355,11 @@ INTERNET-DRAFT    					  June 2000
 
 
 	 To generate a RSA/MD5 SIG, any 3 of the 4 servers will be
-	 needed. For example, if the primary name server and the 
+	 needed. For example, if the primary name server and the
 	 zone-security servers 1 and 2 are present (the (0,1,2) case in
-	 the above table), the three servers will compute m^d1 mod N, 
+	 the above table), the three servers will compute m^d1 mod N,
 	 m^d2 mod N, and m^d3 mod N respectively. After that any one of
-	 them can combine the partial results to produce 
+	 them can combine the partial results to produce
 	 m^d1 * m^d2 * m^d3 mod N = m^d mod N, the digital signature of
 	 m by the zone private key.  Other possibilities of computing
 	 the signature of m are summarized in the above table.
@@ -375,7 +375,7 @@ INTERNET-DRAFT    					  June 2000
 
 5 - Security considerations
 
-   This document proposes an architecture to allow a DNS zone to 
+   This document proposes an architecture to allow a DNS zone to
    provide secure online DNS dynamic update. It uses threshold
    digital signature to maintain the role separation principle and can
    also provide intrusion tolerance against both outside attackers
@@ -393,18 +393,18 @@ INTERNET-DRAFT    					  June 2000
 
 7 - References
 
-   [DDB94]   Y. Desmedt, G. Di Crescenzo, and M. Burmester. 
+   [DDB94]   Y. Desmedt, G. Di Crescenzo, and M. Burmester.
 	     ``Multiplicative nonabelian sharing schemes and their
-	     application to threshold cryptography''. In J. Pieprzyk 
+	     application to threshold cryptography''. In J. Pieprzyk
 	     and R. SafaviNaini, editors, Advances in Cryptology -
-	     Asiacrypt '94, volume 917 of Lecture Notes in Computer 
-	     Science, pages 21--32, Wollongong, Australia, 
-	     November/December 1994. Springer-Verlag. 
+	     Asiacrypt '94, volume 917 of Lecture Notes in Computer
+	     Science, pages 21--32, Wollongong, Australia,
+	     November/December 1994. Springer-Verlag.
 
-   [Des87]   Y. Desmedt. ``Society and group oriented cryptography: 
+   [Des87]   Y. Desmedt. ``Society and group oriented cryptography:
 	     a new concept''. In C. Pomerance, editor, Advances in
-	     Cryptology, Proc. of Crypto '87, volume 293 of Lecture 
-	     Notes in Computer Science, pages 120--127, Santa Barbara, 
+	     Cryptology, Proc. of Crypto '87, volume 293 of Lecture
+	     Notes in Computer Science, pages 120--127, Santa Barbara,
 	     California, U.S.A., August 16--20, 1988. Springer-Verlag.
 
 
@@ -416,55 +416,55 @@ INTERNET-DRAFT    					  June 2000
    [Des94]   Y. Desmedt. ``Threshold cryptography''. European Trans.
              on Telecommunications, 5(4):449--457, July-August 1994.
 
-   [Des97]   Y. Desmedt. ``Some recent research aspects of threshold 
-	     cryptography''. In E. Okamoto, G. Davida, and M. Mambo, 
-	     editors, Information Security, volume 1396 of Lecture 
-	     Notes in Computer Science, pages 158--173, Tatsunokuchi, 
-	     Ishikawa, Japan, September 1997. Springer-Verlag. 
+   [Des97]   Y. Desmedt. ``Some recent research aspects of threshold
+	     cryptography''. In E. Okamoto, G. Davida, and M. Mambo,
+	     editors, Information Security, volume 1396 of Lecture
+	     Notes in Computer Science, pages 158--173, Tatsunokuchi,
+	     Ishikawa, Japan, September 1997. Springer-Verlag.
 
-   [DSA2]    National Institute for Standards and Technology. 
-             ``Digital signature standard (DSS)'', February 2000. 
+   [DSA2]    National Institute for Standards and Technology.
+             ``Digital signature standard (DSS)'', February 2000.
 
-   [GJKR96b] R. Gennaro, S. Jarecki, H. Krawczyk, and T. Rabin. 
+   [GJKR96b] R. Gennaro, S. Jarecki, H. Krawczyk, and T. Rabin.
              ``Robust threshold DSS signatures''. In U. Maurer,
-             editor, Advances in Cryptology - Eurocrypt '96, 
-             volume 1070 of Lecture Notes in Computer Science, 
-             pages 354-371, Zaragoza, Spain, May 12--16 1996. 
-             Springer-Verlag. 
+             editor, Advances in Cryptology - Eurocrypt '96,
+             volume 1070 of Lecture Notes in Computer Science,
+             pages 354-371, Zaragoza, Spain, May 12--16 1996.
+             Springer-Verlag.
 
-   [GMP]     T. Granlund. ``GNU MP''. Source code available from 
-	     http://www.gnu.org/manual/gmp/index.html. 
+   [GMP]     T. Granlund. ``GNU MP''. Source code available from
+	     http://www.gnu.org/manual/gmp/index.html.
 
-   [Liu99]   C. Liu. ``Securing an Internet name server''. 
-             Presentation, 1999. Available at 
+   [Liu99]   C. Liu. ``Securing an Internet name server''.
+             Presentation, 1999. Available at
 	     http://www.acmebw.com/papers/securing.pdf.
 
-   [RFC1034]  P. Mockapetris, ``Domain Names - Concepts and 
+   [RFC1034]  P. Mockapetris, ``Domain Names - Concepts and
 	      Facilities,'' RFC 1034, ISI, November 1987.
 
    [RFC1035]  P. Mockapetris, ``Domain Names - Implementation and
 	   Specification,'' RFC 1035, ISI, November 1987.
 
    [RFC2136]  P. Vixie (Ed.), S. Thomson, Y. Rekhter, J. Bound ``Dynamic
-	      Updates in the Domain Name System,'' RFC 2136, ISC & 
+	      Updates in the Domain Name System,'' RFC 2136, ISC &
 	      Bellcore & Cisco & DEC, April 1997.
 
-   [RFC2137]  D. Eastlake ``Secure Domain Name System Dynamic Update,'' 
+   [RFC2137]  D. Eastlake ``Secure Domain Name System Dynamic Update,''
 	      RFC 2137, CyberCash, April 1997.
 
    [RFC2196] B. Fraser. ``Site Security Handbook,'' RFC2196, September
 	     1997.
 
-   [RFC2535]  D. Eastlake, ``Domain Name System Security Extensions,'' 
+   [RFC2535]  D. Eastlake, ``Domain Name System Security Extensions,''
 	      RFC 2535, IBM, March 1999.
 
-   [SBM99]   R. Sandhu, V. Bhamidipati, and Q. Munawer. ``The ARBAC97 
-	     model for role-based administration of roles''. ACM 
+   [SBM99]   R. Sandhu, V. Bhamidipati, and Q. Munawer. ``The ARBAC97
+	     model for role-based administration of roles''. ACM
 	     Transactions on Information System Security, 2(1):105-
 	     135, February 1999.
 
-   [Sha79]   A. Shamir. ``How to share a secret''. Commun. ACM, 
-             22:612-613, November 1979. 
+   [Sha79]   A. Shamir. ``How to share a secret''. Commun. ACM,
+             22:612-613, November 1979.
 
 
 Wang, Huang & Rine	                                   [Page 8]
@@ -473,7 +473,7 @@ INTERNET-DRAFT    					  June 2000
 
 
 8 - Author's Address
-   
+
    A postscript of this document is available from
 	http://www.cs.gmu.edu/~xwang4/dnssecureonline.ps
 
@@ -489,7 +489,7 @@ INTERNET-DRAFT    					  June 2000
        Fax:   +1-703-993-1710
        EMail: xwang4@cs.gmu.edu
 
-   Yih Huang 
+   Yih Huang
        Department of Computer Science
        George Mason University
        Fairfax, VA 22030-4444
@@ -499,7 +499,7 @@ INTERNET-DRAFT    					  June 2000
        Fax:   +1-703-993-1710
        EMail: hyangyih@cs.gmu.edu
 
-   David Rine 
+   David Rine
        Department of Computer Science
        George Mason University
        Fairfax, VA 22030-4444
@@ -516,12 +516,12 @@ INTERNET-DRAFT    					  June 2000
 
    This document and translations of it may be copied and furnished to
    others, and derivative works that comment on or otherwise explain
-   it or assist in its implementation may be prepared, copied, 
+   it or assist in its implementation may be prepared, copied,
    published and distributed, in whole or in part, without restriction
    of any kind, provided that the above copyright notice and this
-   paragraph are included on all such copies and derivative works. 
-   However, this document itself may not be modified in any way, 
-   such as by removing the copyright notice or references to the 
+   paragraph are included on all such copies and derivative works.
+   However, this document itself may not be modified in any way,
+   such as by removing the copyright notice or references to the
 
 
 Wang, Huang & Rine	                                   [Page 9]
diff --git a/doc/expired/draft-ietf-dnsind-binary-labels-05.txt b/doc/expired/draft-ietf-dnsind-binary-labels-05.txt
index b95dfb6244..93a8de5b7f 100644
--- a/doc/expired/draft-ietf-dnsind-binary-labels-05.txt
+++ b/doc/expired/draft-ietf-dnsind-binary-labels-05.txt
@@ -26,7 +26,7 @@ Status of this Memo
     The list of Internet-Draft Shadow Directories can be accessed at
     http://www.ietf.org/shadow.html.
 
-   
+
 
 1.  Introduction and Terminology
 
diff --git a/doc/expired/draft-ietf-dnsind-rollover-00.txt b/doc/expired/draft-ietf-dnsind-rollover-00.txt
index 8d8cef1cfc..fb2e231c01 100644
--- a/doc/expired/draft-ietf-dnsind-rollover-00.txt
+++ b/doc/expired/draft-ietf-dnsind-rollover-00.txt
@@ -30,7 +30,7 @@ Status of This Document
    other documents at any time.  It is not appropriate to use Internet-
    Drafts as reference material or to cite them other than as a
    ``working draft'' or ``work in progress.''
-   
+
    The list of current Internet-Drafts can be accessed at
    http://www.ietf.org/ietf/1id-abstracts.txt
 
diff --git a/doc/man/bin/host.1 b/doc/man/bin/host.1
index 487d37ed52..c9f2477575 100644
--- a/doc/man/bin/host.1
+++ b/doc/man/bin/host.1
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: host.1,v 1.2 2000/07/27 09:42:26 tale Exp $
-.\" 
+.\"
+.\" $Id: host.1,v 1.3 2000/08/01 01:18:42 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt HOST 1
 .Os BIND9 9
@@ -42,7 +42,7 @@ prints a short summary of its command line arguments and options.
 .Pp
 .Ar name
 is the domain name that is to be looked up.
-It can also be a dotted-decimal string representing an IPv4 address, 
+It can also be a dotted-decimal string representing an IPv4 address,
 in which case
 .Nm host
 will by default perform a reverse lookup for that address.
@@ -57,7 +57,7 @@ The
 .Fl a
 (all) option is equivalent to setting the
 .Fl v
-option and asking 
+option and asking
 .Nm host
 to make a query of type ANY.
 .Pp
@@ -96,7 +96,7 @@ enabled verbose output.
 List mode is selected by the
 .Fl l
 option.
-This makes 
+This makes
 .Nm host
 perform a zone transfer for zone
 .Ar name .
@@ -115,7 +115,7 @@ the BIND9 implementation does not append domain names from the
 .Dv domain
 or
 .Dv search
-directives in 
+directives in
 .Pa /etc/resolv.conf .
 Therefore
 .Ar name
@@ -166,7 +166,7 @@ The
 option is used to select the query type.
 .Ar type
 can be any recognised query type: CNAME, NS, SOA, SIG, KEY, AXFR, etc.
-When no query type is specified, 
+When no query type is specified,
 .Nm host
 automatically selects an appropriate query type.
 By default it looks for A records unless the
@@ -187,7 +187,7 @@ The
 .Fl W
 option makes
 .Nm host
-wait for 
+wait for
 .Ar wait
 seconds.
 If
diff --git a/doc/man/bin/lwresd.8 b/doc/man/bin/lwresd.8
index 0da2cb857d..c1f69472d5 100644
--- a/doc/man/bin/lwresd.8
+++ b/doc/man/bin/lwresd.8
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: lwresd.8,v 1.5 2000/07/27 09:42:28 tale Exp $
-.\" 
+.\"
+.\" $Id: lwresd.8,v 1.6 2000/08/01 01:18:43 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt LWRESD 8
 .Os BIND9 9
@@ -38,11 +38,11 @@
 is the daemon providing name lookup services to clients that use
 the BIND 9 lightweight resolver library.
 It is essentially a stripped-down, caching-only name server that
-answers queries using the BIND 9 lightweight resolver protocol 
+answers queries using the BIND 9 lightweight resolver protocol
 rather than the DNS protocol.
 .Pp
 .Nm lwresd
-listens for resolver queries on a UDP port on the IPv4 loopback 
+listens for resolver queries on a UDP port on the IPv4 loopback
 interface, 127.0.0.1.
 This means that
 .Nm lwresd
@@ -71,8 +71,8 @@ server.  If no
 .Sy nameserver
 entries are  present, or if forwarding fails,
 .Nm lwresd
-resolves the queries autonomously starting at the 
-root name servers, using a compiled-in list of root 
+resolves the queries autonomously starting at the
+root name servers, using a compiled-in list of root
 servers hints.
 .Pp
 The options to
@@ -104,7 +104,7 @@ write the daemon's process id to
 .Ar pid-file
 instead of the default pathname.
 .It Fl n
-create 
+create
 .Ar #cpus
 worker threads to take advantage of multiple CPUs.
 If no option is given,
diff --git a/doc/man/bin/named.8 b/doc/man/bin/named.8
index 0e42a5f600..de9b387449 100644
--- a/doc/man/bin/named.8
+++ b/doc/man/bin/named.8
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: named.8,v 1.4 2000/07/27 09:42:29 tale Exp $
-.\" 
+.\"
+.\" $Id: named.8,v 1.5 2000/08/01 01:18:44 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt NAMED 8
 .Os BIND9 9
@@ -55,12 +55,12 @@ However when operating as a lightweight resolver server,
 .Nm named
 is functionally and logically distinct from a
 conventional name server.
-More information can be found in 
+More information can be found in
 .Xr lwresd 8 .
 .Pp
 Although some command-line options can be used with
 .Nm named ,
-the name server's behaviour is mainly controlled by its configuration file, 
+the name server's behaviour is mainly controlled by its configuration file,
 .Pa /etc/named.conf .
 Refer to the BIND9 Administrator Reference Manual for further details.
 .Pp
@@ -89,7 +89,7 @@ run
 in the foreground and force all logging to
 .Dv stderr .
 .It Fl n
-create 
+create
 .Ar #cpus
 worker threads to take advantage of multiple CPUs.
 If no option is given,
@@ -122,7 +122,7 @@ as UID
 .Ar user-id .
 .Nm named
 will change its UID after it has
-carried out any privileged operations, such as 
+carried out any privileged operations, such as
 creating sockets that listen on privileged ports.
 .It Fl x
 load data from
diff --git a/doc/man/bin/nsupdate.8 b/doc/man/bin/nsupdate.8
index fc953806b8..5c37905de0 100644
--- a/doc/man/bin/nsupdate.8
+++ b/doc/man/bin/nsupdate.8
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: nsupdate.8,v 1.3 2000/07/27 09:42:30 tale Exp $
-.\" 
+.\"
+.\" $Id: nsupdate.8,v 1.4 2000/08/01 01:18:45 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt NSUPDATE 8
 .Os BIND9 9
@@ -67,7 +67,7 @@ These use the TSIG resource record type described in RFC2845.
 The signatures rely on a shared secret that should only be known to
 .Nm nsupdate
 and the name server.
-Currently, the only supported encryption algorithm for TSIG is 
+Currently, the only supported encryption algorithm for TSIG is
 HMAC-MD5, which is defined in RFC 2104.
 Once other algorithms are defined for TSIG, applications will need to
 ensure they select the appropriate algorithm as well as the key when
@@ -141,7 +141,7 @@ Updates will be rejected if the tests for the prerequisite conditions fail.
 Every update request consists of zero or more prerequisites
 and one or more updates.
 This allows a suitably authenticated update request to proceed if some
-specified resource records are present or missing from the zone. 
+specified resource records are present or missing from the zone.
 A blank input line causes the accumulated commands to be sent as one Dynamic
 DNS update request to the name server.
 .Pp
@@ -259,7 +259,7 @@ could be used to insert and delete resource records from the
 zone.
 Notice that the input in each example contains a trailing blank line so that
 a group of commands are sent as one dynamic update request to the
-master name server for 
+master name server for
 .Dv example.com .
 .Bd -literal -offset indent
 # nsupdate
@@ -272,10 +272,10 @@ Any A records for
 .Dv oldhost.example.com
 are deleted.
 and an A record for
-.Dv newhost.example.com 
+.Dv newhost.example.com
 it IP address 172.16.1.1 is added.
 The newly-added record has a 1 day TTL (86400 seconds)
-.Bd -literal -offset indent 
+.Bd -literal -offset indent
 # nsupdate
 > prereq nxdomain nickname.example.com
 > update add nickname.example.com CNAME somehost.example.com
@@ -312,7 +312,7 @@ name server configuration file
 .It Pa K{name}.+157.+{random}.key
 base-64 encoding of HMAC-MD5 key created by
 .Xr dnssec-keygen 8 .
-.It Pa K{name}.+157.+{random}.private 
+.It Pa K{name}.+157.+{random}.private
 base-64 encoding of HMAC-MD5 key created by
 .Xr dnssec-keygen 8 .
 .El
@@ -325,7 +325,7 @@ base-64 encoding of HMAC-MD5 key created by
 .Xr RFC2535 ,
 .Xr named 8 ,
 .Xr dnssec-keygen 8 .
-.Sh BUGS 
+.Sh BUGS
 The
 .Fl D
 and
@@ -333,4 +333,4 @@ and
 options are not documented apart from this self-referential paragraph.
 They provide additional debugging information which is primarily of interest
 to the BIND9 developers.
-These options might be changed or removed in future releases. 
+These options might be changed or removed in future releases.
diff --git a/doc/man/bin/rndc.8 b/doc/man/bin/rndc.8
index 80b0c771b5..a8c5381505 100644
--- a/doc/man/bin/rndc.8
+++ b/doc/man/bin/rndc.8
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: rndc.8,v 1.7 2000/07/27 23:49:40 tale Exp $
-.\" 
+.\"
+.\" $Id: rndc.8,v 1.8 2000/08/01 01:18:46 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt RDNC 8
 .Os BIND9 9
@@ -31,7 +31,7 @@
 .Op Fl s Ar server
 .Op Fl v
 .Op Fl y Ar key_id
-.Ar command .... 
+.Ar command ....
 .Sh DESCRIPTION
 This command allows the system administrator to control the operation
 of a name server.
@@ -45,16 +45,16 @@ prints a short summary of the supported commands and the available
 options and their arguments.
 .Pp
 .Nm rndc
-communicates with the name server over a TCP connection, 
-sending commands authenticated with digital signatures. 
+communicates with the name server over a TCP connection,
+sending commands authenticated with digital signatures.
 In the current versions of
 .Nm rndc
-and 
+and
 .Xr named 8
 the only supported encryption algorithm is HMAC-MD5, which uses a
 shared secret on each end of the connection.
 This provides TSIG-style authentication for the command request
-and the name server's response. 
+and the name server's response.
 All commands sent over the channel
 must be signed by a key_id known to the server.
 .Pp
@@ -86,7 +86,7 @@ option can be used to make
 .Nm rndc
 send commands to TCP port number
 .Ar port#
-on the system running the name server instead of BIND 9's 
+on the system running the name server instead of BIND 9's
 default control channel port of 953.
 .Pp
 The
@@ -103,7 +103,7 @@ If no
 .Fl y
 option is provided,
 .Nm rndc
-will first look for a 
+will first look for a
 .Dv key
 clause in the
 .Dv server{}
@@ -148,7 +148,7 @@ offers at least as many management capabilities as the old
 .Xr ndc
 utility.
 .Pp
-There is currently no way to provide the shared secret for a key_id 
+There is currently no way to provide the shared secret for a key_id
 without using the configuration file.
 .Pp
 Several error messages could be clearer.
diff --git a/doc/man/bin/rndc.conf.5 b/doc/man/bin/rndc.conf.5
index 93066a59d0..dcf25eae1a 100644
--- a/doc/man/bin/rndc.conf.5
+++ b/doc/man/bin/rndc.conf.5
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: rndc.conf.5,v 1.5 2000/07/27 09:42:31 tale Exp $
-.\" 
+.\"
+.\" $Id: rndc.conf.5,v 1.6 2000/08/01 01:18:48 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt RDNC.CONF 5
 .Os BIND9 9
@@ -24,7 +24,7 @@
 .Nd rdnc configuration file
 .Sh SYNOPSIS
 .Nm rdnc.conf
-.Sh DESCRIPTION 
+.Sh DESCRIPTION
 The BIND9 utility for controlling the name server,
 .Nm rndc ,
 has its own configuration file
@@ -65,13 +65,13 @@ be used when no name server is given as an argument to
 The
 .Dv default-key
 clause
-is followed by the name of a key which is identified by a 
+is followed by the name of a key which is identified by a
 .Dv key{}
 statement.
-If no 
+If no
 .Fl y
 option is provided on the
-.Xr rndc 
+.Xr rndc
 command line, and no
 .Dv key
 clause is found in a a matching
@@ -81,7 +81,7 @@ commands and responses.
 .Pp
 After the keyword
 .Dv server ,
-the 
+the
 .Dv server{}
 statement is followed by a string which is the hostname or address for a
 name server.
@@ -99,7 +99,7 @@ The statement has two clauses.
 identifies the encryption algorithm for
 .Nm rndc
 to use; currently only HMAC-MD5 is supported.
-This is followed by a 
+This is followed by a
 .Dv secret
 clause which contains the base-64 encoding of the
 algorithm's encryption key.
@@ -161,9 +161,9 @@ To generate a random secret with
 $ dnssec-keygen -a hmac-md5 -b 128 -n user rndc
 .Ed
 .Pp
-The base-64 string will appear in two files, 
+The base-64 string will appear in two files,
 .Pa Krndc.+157.+{random}.key
-and 
+and
 .Pa Krndc.+157.+{random}.private .
 After extracting the key to be
 placed in the
diff --git a/doc/man/ctoman b/doc/man/ctoman
index e4fa8fae45..44b24dae33 100755
--- a/doc/man/ctoman
+++ b/doc/man/ctoman
@@ -1,11 +1,11 @@
 #!/usr/bin/gawk -f
 #
 # 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
 # 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
@@ -15,7 +15,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-#	$Id: ctoman,v 1.4 2000/07/27 09:42:25 tale Exp $
+#	$Id: ctoman,v 1.5 2000/08/01 01:18:40 tale Exp $
 #
 #	ctoman - an awk program that makes a passable job of
 #		 converting ISC BIND9 C files into template
@@ -67,7 +67,7 @@ END {
 	print ".Nd XXX"
 	print ".Sh SYNOPSIS"
 	for (i = 1; i < inc; i++)
-		print ".Fd", inclist[i] 
+		print ".Fd", inclist[i]
 	for (i = 1; i < fnc; i++ ) {
 		print ".Ft", functypes[i]
 		print ".Fo", funclist[i]
diff --git a/doc/man/dnssec/dnssec-keygen.8 b/doc/man/dnssec/dnssec-keygen.8
index b151d80b84..d8d8cd52e3 100644
--- a/doc/man/dnssec/dnssec-keygen.8
+++ b/doc/man/dnssec/dnssec-keygen.8
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: dnssec-keygen.8,v 1.6 2000/07/27 09:42:32 tale Exp $
-.\" 
+.\"
+.\" $Id: dnssec-keygen.8,v 1.7 2000/08/01 01:18:49 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt DNSSEC-KEYGEN 8
 .Os BIND9 9
@@ -96,7 +96,7 @@ option specifies how the generated key will be used.
 .Ar nametype
 can be either
 .Dv ZONE ,
-.Dv HOST , 
+.Dv HOST ,
 .Dv ENTITY ,
 or
 .Dv USER
@@ -124,7 +124,7 @@ that is to be used.
 The only supported values value of
 .Ar generator
 are 2 and 5.
-If no Diffie-Hellman generator is supplied, a known prime 
+If no Diffie-Hellman generator is supplied, a known prime
 from RFC2539 will be used if possible; otherwise 2 will be used as the
 generator.
 .Pp
@@ -133,7 +133,7 @@ The
 option sets the protocol value for the generated key to
 .Ar protocol-value .
 The default is 2 (email) for keys of type
-.Dv USER 
+.Dv USER
 and 3 (DNSSEC) for all other key types.
 Other possible values for this argument are listed in RFC2535 and its
 successors.
@@ -149,7 +149,7 @@ will prompt for keyboard input and use the time intervals between
 keystrokes to provide randomness.
 The
 .Fl r
-option overrides this behaviour, making 
+option overrides this behaviour, making
 .Nm dnssec-keygen
 use
 .Ar randomdev
@@ -173,16 +173,16 @@ confidentiality.
 can be one of
 .Dv AUTHCONF ,
 .Dv NOAUTHCONF ,
-.Dv NOAUTH 
+.Dv NOAUTH
 or
 .Dv NOCONF .
 The default is
 .Dv AUTHCONF .
 If type is
-.Dv AUTHCONF 
+.Dv AUTHCONF
 the key can be used for authentication and confidentialty.
 Setting
-.Ar type 
+.Ar type
 to
 .Dv NOAUTHCONF
 indicates that the key cannot be used for authentication or confidentialty.
@@ -195,14 +195,14 @@ Similarly,
 defines that the key cannot be used for confidentiality though it can
 be used for authentication.
 .Pp
-The 
+The
 .Fl v
 option can be used to make
 .Nm dnssec-keygen
 more verbose.
 As the debugging/tracing level
 .Ar level
-increases, 
+increases,
 .Nm dnssec-keygen
 generates increasingly detailed reports about what it is doing.
 The default level is zero.
@@ -245,7 +245,7 @@ key(s) for generating or validating signatures.
 The
 .Ar .key
 file contains a KEY resource record that can be inserted into a zone file
-with a 
+with a
 .Dv $INCLUDE
 statement.
 The private part of the key is in the
@@ -259,7 +259,7 @@ The private part of the key is used by
 .Xr dnssec-signzone 8
 to generate signatures and the public part is used to verify the
 signatures.
-Both 
+Both
 .Ar .key
 and
 .Ar .private
@@ -278,13 +278,13 @@ has printed the key identification string
 .Dv Kexample.com.+003+26160 ,
 indicating a DSA key with identifier 26160.
 It will also have created the files
-.Pa Kexample.com.+003+26160.key 
+.Pa Kexample.com.+003+26160.key
 and
 .Pa Kexample.com.+003+26160.private
 containing respectively the public and private keys for the generated
 DSA key.
 .Sh FILES
-.Pa /dev/random 
+.Pa /dev/random
 .Sh SEE ALSO
 .Xr RFC2535,
 .Xr RFC2845,
@@ -296,7 +296,7 @@ DSA key.
 The naming convention for the public and private key files is a little
 clumsy.
 It won't work for domain names that are longer than 236 characters
-because of the 
+because of the
 .Ar .+aaa+iiiii.private
 suffix results in filenames that are too long for most
 .Ux
diff --git a/doc/man/dnssec/dnssec-makekeyset.8 b/doc/man/dnssec/dnssec-makekeyset.8
index c24de1706f..081e036cee 100644
--- a/doc/man/dnssec/dnssec-makekeyset.8
+++ b/doc/man/dnssec/dnssec-makekeyset.8
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: dnssec-makekeyset.8,v 1.7 2000/07/31 19:39:38 bwelling Exp $
-.\" 
+.\"
+.\" $Id: dnssec-makekeyset.8,v 1.8 2000/08/01 01:18:50 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt DNSSEC-MAKEKEYSET 8
 .Os BIND9 9
@@ -70,7 +70,7 @@ A relative start time is supplied when
 .Ar start-time
 is given as +N: N seconds from the current time.
 If no
-.Fl s 
+.Fl s
 option is supplied, the current date and time is used for the start
 time of the SIG records.
 .Pp
@@ -145,7 +145,7 @@ As the debugging/tracing level
 increases,
 .Nm dnssec-makekeyset
 generates increasingly detailed reports about what it is doing.
-The default level is zero. 
+The default level is zero.
 .Pp
 The
 .Fl h
@@ -177,7 +177,7 @@ The backslash is for typographic reasons and would not be provided on
 the command line when running
 .Nm dnssec-makekeyset .
 .nf
-.Dl # dnssec-makekeyset -t 86400 -s 20000701120000 \e\p 
+.Dl # dnssec-makekeyset -t 86400 -s 20000701120000 \e\p
 .Dl -e +2592000 Kexample.com.+003+26160
 .fi
 .Pp
@@ -198,7 +198,7 @@ to the DNS administrator for
 .Dv .com
 so that they could sign the resource records in the file.
 This assumes that the
-.Dv .com 
+.Dv .com
 zone is DNSSEC-aware and the administrators of the two zones have some
 mechanism for authenticating each other and exchanging the keys and
 signatures securely.
diff --git a/doc/man/dnssec/dnssec-signkey.8 b/doc/man/dnssec/dnssec-signkey.8
index 676b121eea..2723aeae7b 100644
--- a/doc/man/dnssec/dnssec-signkey.8
+++ b/doc/man/dnssec/dnssec-signkey.8
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: dnssec-signkey.8,v 1.8 2000/07/31 19:39:39 bwelling Exp $
-.\" 
+.\"
+.\" $Id: dnssec-signkey.8,v 1.9 2000/08/01 01:18:51 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt DNSSEC-SIGNKEY 8
 .Os BIND9 9
@@ -33,7 +33,7 @@
 .Sh DESCRIPTION
 .Nm dnssec-signkey
 is used to sign a key set for a child zone.
-Typically this would be provided by a 
+Typically this would be provided by a
 .Ar keyset
 file generated by
 .Xr dnssec-makekeyset 8 .
@@ -50,7 +50,7 @@ Each
 argument will be a key identification string as reported by
 .Xr dnssec-keygen 8
 for the parent zone.
-This allows the child's keys to be signed by more than one 
+This allows the child's keys to be signed by more than one
 parent zone key.
 .Pp
 The
diff --git a/doc/man/dnssec/dnssec-signzone.8 b/doc/man/dnssec/dnssec-signzone.8
index e274494af4..6898596462 100644
--- a/doc/man/dnssec/dnssec-signzone.8
+++ b/doc/man/dnssec/dnssec-signzone.8
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: dnssec-signzone.8,v 1.10 2000/07/31 19:39:42 bwelling Exp $
-.\" 
+.\"
+.\" $Id: dnssec-signzone.8,v 1.11 2000/08/01 01:18:52 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt DNSSEC-SIGNZONE 8
 .Os BIND9 9
@@ -77,7 +77,7 @@ If there is a
 .Ar signedkey
 file from the zone's parent, the parent's signatures will be
 incorporated into the generated signed zone file.
-The security status of delegations from the the signed zone 
+The security status of delegations from the the signed zone
 - i.e. whether the child zones are DNSSEC-aware or not - is
 set according to the presence or absence of a
 .Ar signedkey
@@ -112,7 +112,7 @@ A relative start time is supplied when
 .Ar start-time
 is given as +N: N seconds from the current time.
 If no
-.Fl s 
+.Fl s
 option is supplied, the current date and time is used for the start
 time of the SIG records.
 .Pp
@@ -152,9 +152,9 @@ Otherwise, it is considered to be expiring soon, and
 will remove it and generate a new SIG record to replace it.
 .Pp
 The default cycle period is one quarter of the difference between the
-specified signature end and start dates.  So if the 
+specified signature end and start dates.  So if the
 .Fl e
-and 
+and
 .Fl s
 options are not specified,
 .Nm dnssec-signzone
@@ -223,12 +223,12 @@ which is the same as the origin, so there is no need to use the
 .Fl o
 option to set the origin.
 The zone's keys were either appended to the zone file or
-incorporated using a 
-.Dv $INCLUDE 
+incorporated using a
+.Dv $INCLUDE
 statement.
 If there was a
 .Ar signedkey
-file from the parent zone - i.e. 
+file from the parent zone - i.e.
 .Dv signedkey-example.com.
 - it should be present in the current directory.
 This allows the parent zone's signature to be included in the signed
diff --git a/doc/man/isc/isc__errno2result.3 b/doc/man/isc/isc__errno2result.3
index af9cc5af6d..d6c8a943ee 100644
--- a/doc/man/isc/isc__errno2result.3
+++ b/doc/man/isc/isc__errno2result.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc__errno2result.3,v 1.2 2000/07/27 09:42:37 tale Exp $
-.\" 
+.\"
+.\" $Id: isc__errno2result.3,v 1.3 2000/08/01 01:18:54 tale Exp $
+.\"
 .so isc_error.3
diff --git a/doc/man/isc/isc_app.3 b/doc/man/isc/isc_app.3
index b2e056212b..9f7d114d97 100644
--- a/doc/man/isc/isc_app.3
+++ b/doc/man/isc/isc_app.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: isc_app.3,v 1.3 2000/07/27 09:42:38 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_app.3,v 1.4 2000/08/01 01:18:55 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt ISC_APP 3
 .Os BIND9 9
@@ -25,20 +25,20 @@
 .Nm isc_app_run ,
 .Nm isc_app_shutdown ,
 .Nm isc_app_reload ,
-.Nm isc_app_finish 
+.Nm isc_app_finish
 .Nd application management functions
 .Sh SYNOPSIS
 .Fd #include 
- 
+
 .Fd #include 
- 
+
 .Fd #include 
- 
+
 .Fd #include 
 .Fd #include 
 .Fd #include 
 .fd #include 
- 
+
 .Fd #include 
 .Fd #include 
 .Fd #include 
@@ -46,7 +46,7 @@
 .Fd #include 
 .Fd #include 
 .Fd #include 
- 
+
 .Ft isc_result_t
 .Fo isc_app_start
 .Fa void
@@ -82,10 +82,10 @@ Applications which use the BIND9 library should begin by calling
 .Fn isc_app_start .
 It sets up a signal handler to ignore
 .Dv SIGPIPE .
-.Fn isc_app_start 
+.Fn isc_app_start
 blocks signals
 .Dv SIGHUP ,
-.Dv SIGINT 
+.Dv SIGINT
 and
 .Dv SIGTERM
 This ensures that all subsequent threads will have these signals blocked by
@@ -96,15 +96,15 @@ arrange its own signal handlers for them.
 then initialises a queue of runnable tasks for the application.
 Calls to
 .Fn isc_app_start
-should be made before any other BIND9 library call, ideally as 
+should be made before any other BIND9 library call, ideally as
 close to the beginning of the application as possible.
-.Pp 
+.Pp
 .Fn isc_app_onrun
 arranges for delivery of an event to an application when it is executing.
 This function should only be invoked after
 .Fn isc_app_start
 has been called.
-It creates an 
+It creates an
 .Ft isc_event_t
 structure from memory context
 .Fa mctx
@@ -113,7 +113,7 @@ for task
 .Fa arg
 is a pointer to some structure that can be referenced by the event
 handler
-.Fa action 
+.Fa action
 which is invoked when the application takes delivery of a shutdown
 event
 .Dv ISC_APPEVENT_SHUTDOWN .
@@ -143,7 +143,7 @@ It can only be invoked after
 has been called.
 .Fn isc_app_shutdown
 sends a
-.Dv SIGTERM 
+.Dv SIGTERM
 signal to the current process.
 Multiple calls to
 .Fn isc_app_shutdown
@@ -152,7 +152,7 @@ Only one shutdown attempt will be carried out.
 .Pp
 The reload signal
 .Dv SIGHUP
-is sent to the process by 
+is sent to the process by
 .Fn isc_app_reload .
 The function returns
 .Er ISC_R_SUCCESS
@@ -176,7 +176,7 @@ was called earlier in the application.
 .Sh RETURN VALUES
 A successful call to
 .Fn handle_signal
-returns 
+returns
 .Er ISC_R_SUCCESS
 and
 .Er ISC_R_UNEXPECTED
@@ -194,7 +194,7 @@ or not.
 returns
 .Er ISC_R_SUCCESS
 unless it was not possible to create the event structure
-.Ft isc_event_t 
+.Ft isc_event_t
 in which case it returns
 .Er ISC_R_NOMEMORY .
 .Pp
@@ -210,7 +210,7 @@ is returned by
 when attempts to set or reset signal handlers fail.
 .Pp
 .Er ISC_R_UNEXPECTED
-is returned by 
+is returned by
 .Fn isc_app_shutdown
 if the signal was not sent successfully.
 Otherwise
diff --git a/doc/man/isc/isc_app_finish.3 b/doc/man/isc/isc_app_finish.3
index c6d6bf5379..8dfb6fec3c 100644
--- a/doc/man/isc/isc_app_finish.3
+++ b/doc/man/isc/isc_app_finish.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_app_finish.3,v 1.2 2000/07/27 09:42:39 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_app_finish.3,v 1.3 2000/08/01 01:18:56 tale Exp $
+.\"
 .so isc_app.3
diff --git a/doc/man/isc/isc_app_onrun.3 b/doc/man/isc/isc_app_onrun.3
index a9103a995b..2ec0900dbb 100644
--- a/doc/man/isc/isc_app_onrun.3
+++ b/doc/man/isc/isc_app_onrun.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_app_onrun.3,v 1.2 2000/07/27 09:42:40 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_app_onrun.3,v 1.3 2000/08/01 01:18:57 tale Exp $
+.\"
 .so isc_app.3
diff --git a/doc/man/isc/isc_app_reload.3 b/doc/man/isc/isc_app_reload.3
index 2f86cec99b..bf164addda 100644
--- a/doc/man/isc/isc_app_reload.3
+++ b/doc/man/isc/isc_app_reload.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_app_reload.3,v 1.2 2000/07/27 09:42:41 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_app_reload.3,v 1.3 2000/08/01 01:18:58 tale Exp $
+.\"
 .so isc_app.3
diff --git a/doc/man/isc/isc_app_run.3 b/doc/man/isc/isc_app_run.3
index c4efee26d4..649c5ad26d 100644
--- a/doc/man/isc/isc_app_run.3
+++ b/doc/man/isc/isc_app_run.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_app_run.3,v 1.2 2000/07/27 09:42:42 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_app_run.3,v 1.3 2000/08/01 01:18:59 tale Exp $
+.\"
 .so isc_app.3
diff --git a/doc/man/isc/isc_app_shutdown.3 b/doc/man/isc/isc_app_shutdown.3
index d8b9cd99ae..8cdf642492 100644
--- a/doc/man/isc/isc_app_shutdown.3
+++ b/doc/man/isc/isc_app_shutdown.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_app_shutdown.3,v 1.2 2000/07/27 09:42:43 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_app_shutdown.3,v 1.3 2000/08/01 01:19:01 tale Exp $
+.\"
 .so isc_app.3
diff --git a/doc/man/isc/isc_app_start.3 b/doc/man/isc/isc_app_start.3
index 33b5b2534a..a2bdfddbfc 100644
--- a/doc/man/isc/isc_app_start.3
+++ b/doc/man/isc/isc_app_start.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_app_start.3,v 1.2 2000/07/27 09:42:44 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_app_start.3,v 1.3 2000/08/01 01:19:02 tale Exp $
+.\"
 .so isc_app.3
diff --git a/doc/man/isc/isc_dir.3 b/doc/man/isc/isc_dir.3
index efc2066c1e..5f1befc0fc 100644
--- a/doc/man/isc/isc_dir.3
+++ b/doc/man/isc/isc_dir.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,31 +12,31 @@
 .\" 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: isc_dir.3,v 1.2 2000/07/27 09:42:45 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_dir.3,v 1.3 2000/08/01 01:19:03 tale Exp $
+.\"
 .Dd Jun 30, 2000
-.Dt ISC_DIR 3 
+.Dt ISC_DIR 3
 .Os BIND9 9
 .ds vT BIND9 Programmer's Manual
 .Sh NAME
 .Nm isc_dir_init ,
 .Nm isc_dir_open ,
 .Nm isc_dir_read ,
-.Nm isc_dir_close , 
+.Nm isc_dir_close ,
 .Nm isc_dir_reset ,
-.Nm isc_dir_chdir 
+.Nm isc_dir_chdir
 .Nd file system directory operations
 .Sh SYNOPSIS
 .Fd #include 
 .Fd #include 
 .Fd #include 
- 
+
 .Fd #include 
 .Fd #include 
 .Fd #include 
 .Fd #include 
- 
+
 .Fd #include \*qerrno2result.h\*q
 .Ft void
 .Fo isc_dir_init
@@ -65,11 +65,11 @@ directories by the name server.
 They are intended to isolate BIND9 from the semantics of the underlying
 directory access routines provided by the operating system,
 BIND9 uses an internal structure of type
-.Fa isc_dir_t 
+.Fa isc_dir_t
 to reference a directory.
 The contents of this structure are OS-specific.
 .Fn isc_dir_init
-initialises the directory structure pointed at 
+initialises the directory structure pointed at
 .Fa dir .
 All functions taking a
 .Fa dir
@@ -79,11 +79,11 @@ this parameter points at a valid
 structure.
 .Pp
 .Fn isc_dir_open
-opens the directory named by 
+opens the directory named by
 .Fa dirname .
 .Pp
 .Fn isc_dir_read
-retrieves the next entry from the file descriptor associated with directory 
+retrieves the next entry from the file descriptor associated with directory
 .Fa dir .
 The name of that entry and the length of its name are copied to
 .Fa dir .
@@ -101,21 +101,21 @@ closes the file descriptor associated with
 .Fa dir .
 .Pp
 .Fn isc_dir_reset
-repositions 
+repositions
 .Fa dir
 to the start of the directory.
 .Pp
 The name server's current directory is changed to
 .Fa dirname
 by
-.Fn isc_dir_chdir . 
+.Fn isc_dir_chdir .
 .Pp
 .Sh RETURN VALUES
 Successful calls to
 .Fn isc_dir_open ,
 .Fn isc_dir_read ,
 .Fn isc_dir_reset ,
-.Fn isc_dir_read 
+.Fn isc_dir_read
 and
 .Fn isc_dir_chdir
 return
@@ -129,18 +129,18 @@ is returned if the name of the next directory entry is too big
 to fit in the
 .Fa isc_dir_t
 structure.
-If 
+If
 .Fn isc_dir_chdir
-fails, 
+fails,
 .Er ISC_R_INVALIDFILE
 is returned if
 .Fa dirname
-is not a directory, or 
+is not a directory, or
 .Er ISC_R_NOPERM
 if access permission is denied or
 .Er ISC_R_IOERROR
 if an I/O error occurs.
-The WinNT version of 
+The WinNT version of
 .Fn isc_dir_chdir
 returns
 .Er ISC_R_NOTIMPLEMENTED
@@ -156,8 +156,8 @@ can be returned in the WinNT versions of
 and
 .Fn isc_dir_reset .
 .Sh SEE ALSO
-.Xr opendir 3 , 
+.Xr opendir 3 ,
 .Xr readdir 3 ,
-.Xr closedir 3 , 
+.Xr closedir 3 ,
 .Xr rewinddir 3 ,
 .Xr chdir 2
diff --git a/doc/man/isc/isc_dir_chdir.3 b/doc/man/isc/isc_dir_chdir.3
index 5e38718a06..53a9efd349 100644
--- a/doc/man/isc/isc_dir_chdir.3
+++ b/doc/man/isc/isc_dir_chdir.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_dir_chdir.3,v 1.2 2000/07/27 09:42:47 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_dir_chdir.3,v 1.3 2000/08/01 01:19:04 tale Exp $
+.\"
 .so isc_dir.3
diff --git a/doc/man/isc/isc_dir_close.3 b/doc/man/isc/isc_dir_close.3
index fa0a08910d..0c0ddaca4d 100644
--- a/doc/man/isc/isc_dir_close.3
+++ b/doc/man/isc/isc_dir_close.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_dir_close.3,v 1.2 2000/07/27 09:42:48 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_dir_close.3,v 1.3 2000/08/01 01:19:05 tale Exp $
+.\"
 .so isc_dir.3
diff --git a/doc/man/isc/isc_dir_init.3 b/doc/man/isc/isc_dir_init.3
index 743b59d269..c082a457de 100644
--- a/doc/man/isc/isc_dir_init.3
+++ b/doc/man/isc/isc_dir_init.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_dir_init.3,v 1.2 2000/07/27 09:42:49 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_dir_init.3,v 1.3 2000/08/01 01:19:06 tale Exp $
+.\"
 .so isc_dir.3
diff --git a/doc/man/isc/isc_dir_open.3 b/doc/man/isc/isc_dir_open.3
index 730cfa1e9d..c6e941751f 100644
--- a/doc/man/isc/isc_dir_open.3
+++ b/doc/man/isc/isc_dir_open.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_dir_open.3,v 1.2 2000/07/27 09:42:50 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_dir_open.3,v 1.3 2000/08/01 01:19:07 tale Exp $
+.\"
 .so isc_dir.3
diff --git a/doc/man/isc/isc_dir_read.3 b/doc/man/isc/isc_dir_read.3
index e7a95d0482..6351dabde4 100644
--- a/doc/man/isc/isc_dir_read.3
+++ b/doc/man/isc/isc_dir_read.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_dir_read.3,v 1.2 2000/07/27 09:42:51 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_dir_read.3,v 1.3 2000/08/01 01:19:09 tale Exp $
+.\"
 .so isc_dir.3
diff --git a/doc/man/isc/isc_dir_reset.3 b/doc/man/isc/isc_dir_reset.3
index 8a699a8a71..c937e1f6f1 100644
--- a/doc/man/isc/isc_dir_reset.3
+++ b/doc/man/isc/isc_dir_reset.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_dir_reset.3,v 1.2 2000/07/27 09:42:52 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_dir_reset.3,v 1.3 2000/08/01 01:19:10 tale Exp $
+.\"
 .so isc_dir.3
diff --git a/doc/man/isc/isc_error.3 b/doc/man/isc/isc_error.3
index e524847a3b..1d64ad60dd 100644
--- a/doc/man/isc/isc_error.3
+++ b/doc/man/isc/isc_error.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: isc_error.3,v 1.2 2000/07/27 09:42:53 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_error.3,v 1.3 2000/08/01 01:19:11 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt error 3
 .Os BIND9 9
@@ -24,11 +24,11 @@
 .Nd map POSIX error codes to BIND9 error codes
 .Sh SYNOPSIS
 .Fd #include 
- 
+
 .Fd #include 
- 
+
 .Fd #include 
- 
+
 .Fd #include "errno2result.h"
 .Ft isc_result_t
 .Fo isc__errno2result
@@ -45,8 +45,8 @@ The function is documented here to indicate how POSIX error codes
 are mapped to their ISC equivalents.
 .Pp
 .Sh RETURN VALUES
-When 
-.Fa posixerrno 
+When
+.Fa posixerrno
 is set to the POSIX error codes
 .Er ENOTDIR ,
 .Er ELOOP ,
@@ -54,12 +54,12 @@ is set to the POSIX error codes
 .Er ENAMETOOLONG ,
 and
 .Er EBADF ,
-.Fn isc__errno2result 
+.Fn isc__errno2result
 returns
 .Er ISC_R_INVALIDFILE .
 .Er ISC_R_FILENOTFOUND
 is returned when
-.Fa posixerrno 
+.Fa posixerrno
 is set to
 .Er ENOENT .
 A retun value of
@@ -72,19 +72,19 @@ is set to
 .Er EIO
 .Fn isc__errno2result
 returns
-.Er ISC_R_IOERROR 
+.Er ISC_R_IOERROR
 and if the error code is
 .Er ENOMEM ,
-.Er ISC_R_NOMEMORY 
+.Er ISC_R_NOMEMORY
 is returned.
 For all other values of
 .Fa posixerrno ,
 .Fn isc__errno2result
-returns 
+returns
 .Er ISC_R_UNEXPECTED .
 .Sh SEE ALSO
 .Xr errno 2 ,
-.Xr perror 3 
+.Xr perror 3
 .Sh BUGS
 Returning
 .Er ISC_R_UNEXPECTED
diff --git a/doc/man/isc/isc_file.3 b/doc/man/isc/isc_file.3
index 3502abbc1d..6d44723b93 100644
--- a/doc/man/isc/isc_file.3
+++ b/doc/man/isc/isc_file.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: isc_file.3,v 1.3 2000/07/27 09:42:54 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_file.3,v 1.4 2000/08/01 01:19:12 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt ISC_FILE 3
 .Os BIND9 9
@@ -32,15 +32,15 @@
 .Fd #include 
 .Fd #include 
 .Fd #include 
- 
+
 .Fd #include 
 .Fd #include 
- 
+
 .Fd #include 
 .Fd #include 
 .Fd #include 
 .Fd #include 
- 
+
 .Fd #include \*qerrno2result.h\*q
 
 .Ft isc_result_t
@@ -81,23 +81,23 @@ is a pointer to an
 structure which contains the file's modification date.
 .Pp
 .Fn isc_file_settime
-sets the access and modification times of the file named 
+sets the access and modification times of the file named
 .Fa file
 to the value of the timestamp supplied in
 .Fa time .
 .Pp
 Pathnames for temporary files are created with
 .Fn isc_file_mktemplate .
-It copies the pathname in 
+It copies the pathname in
 .Fa path
 up to the last \*q/\*q character, if any, in
 .Fa buf .
 The 14-character string \*qtmp-XXXXXXXXXX\*q is then appended to that
 buffer.
 .Fa buflen
-indicates the size of buffer 
+indicates the size of buffer
 .Fa buf .
-Calls to 
+Calls to
 .Fn isc_file_mktemplate
 fail if the buffer is too small to hold for the newly-created pathname.
 .Pp
@@ -106,27 +106,27 @@ creates a unique file name with access permissions 0600 and opens the
 file for reading and writing.
 The name of the unique file is returned in
 .Fa templet
-and a pointer to a pointer to a 
+and a pointer to a pointer to a
 .Dv stdio stream
 associated with the opened file is returned in
 .Fa fp .
 The file name template
 .Fa templet
-should be generated by calling 
+should be generated by calling
 .Fn isc_file_mktemplate .
 This ensures the last 10 characters of the template are the letter \*qX\*q
-so that these can be overwritten by 
+so that these can be overwritten by
 .Fn mkstemp
 to generate a unique file name.
 .Pp
 Files are deleted with
 .Fn isc_file_remove .
-It unlinks the file named 
+It unlinks the file named
 .Fa filename .
 .Sh RETURN VALUES
 Successful calls to these functions all return
 .Er ISC_R_SUCCESS .
-Apart from the exceptions listed below, failed calls return 
+Apart from the exceptions listed below, failed calls return
 a BIND9 error code by mapping the corresponding POSIX error code using\p
 .Fn isc__errno2result .
 .Fn file_stats ,
diff --git a/doc/man/isc/isc_file_getmodtime.3 b/doc/man/isc/isc_file_getmodtime.3
index a695b8f63e..132660df69 100644
--- a/doc/man/isc/isc_file_getmodtime.3
+++ b/doc/man/isc/isc_file_getmodtime.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_file_getmodtime.3,v 1.2 2000/07/27 09:42:55 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_file_getmodtime.3,v 1.3 2000/08/01 01:19:14 tale Exp $
+.\"
 .so isc_file.3
diff --git a/doc/man/isc/isc_file_mktemplate.3 b/doc/man/isc/isc_file_mktemplate.3
index 1fd96a1fc8..296b2a51f7 100644
--- a/doc/man/isc/isc_file_mktemplate.3
+++ b/doc/man/isc/isc_file_mktemplate.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_file_mktemplate.3,v 1.2 2000/07/27 09:42:56 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_file_mktemplate.3,v 1.3 2000/08/01 01:19:15 tale Exp $
+.\"
 .so isc_file.3
diff --git a/doc/man/isc/isc_file_openunique.3 b/doc/man/isc/isc_file_openunique.3
index 8037bbb46b..2333656e6c 100644
--- a/doc/man/isc/isc_file_openunique.3
+++ b/doc/man/isc/isc_file_openunique.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_file_openunique.3,v 1.2 2000/07/27 09:42:58 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_file_openunique.3,v 1.3 2000/08/01 01:19:16 tale Exp $
+.\"
 .so isc_file.3
diff --git a/doc/man/isc/isc_file_remove.3 b/doc/man/isc/isc_file_remove.3
index abe3359080..5da1566397 100644
--- a/doc/man/isc/isc_file_remove.3
+++ b/doc/man/isc/isc_file_remove.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_file_remove.3,v 1.2 2000/07/27 09:42:59 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_file_remove.3,v 1.3 2000/08/01 01:19:17 tale Exp $
+.\"
 .so isc_file.3
diff --git a/doc/man/isc/isc_file_settime.3 b/doc/man/isc/isc_file_settime.3
index 11c01372bb..a29f8b75ab 100644
--- a/doc/man/isc/isc_file_settime.3
+++ b/doc/man/isc/isc_file_settime.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_file_settime.3,v 1.2 2000/07/27 09:43:00 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_file_settime.3,v 1.3 2000/08/01 01:19:18 tale Exp $
+.\"
 .so isc_file.3
diff --git a/doc/man/isc/isc_interfaceiter_create.3 b/doc/man/isc/isc_interfaceiter_create.3
index 431c089bcc..fc32f9c486 100644
--- a/doc/man/isc/isc_interfaceiter_create.3
+++ b/doc/man/isc/isc_interfaceiter_create.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_interfaceiter_create.3,v 1.2 2000/07/27 09:43:01 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_interfaceiter_create.3,v 1.3 2000/08/01 01:19:19 tale Exp $
+.\"
 .so isc_netif.3
diff --git a/doc/man/isc/isc_interfaceiter_current.3 b/doc/man/isc/isc_interfaceiter_current.3
index de395cab9c..f75fc247fa 100644
--- a/doc/man/isc/isc_interfaceiter_current.3
+++ b/doc/man/isc/isc_interfaceiter_current.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_interfaceiter_current.3,v 1.2 2000/07/27 09:43:02 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_interfaceiter_current.3,v 1.3 2000/08/01 01:19:20 tale Exp $
+.\"
 .so isc_netif.3
diff --git a/doc/man/isc/isc_interfaceiter_destroy.3 b/doc/man/isc/isc_interfaceiter_destroy.3
index 8370398616..c415dee2d5 100644
--- a/doc/man/isc/isc_interfaceiter_destroy.3
+++ b/doc/man/isc/isc_interfaceiter_destroy.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_interfaceiter_destroy.3,v 1.2 2000/07/27 09:43:03 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_interfaceiter_destroy.3,v 1.3 2000/08/01 01:19:22 tale Exp $
+.\"
 .so isc_netif.3
diff --git a/doc/man/isc/isc_interfaceiter_first.3 b/doc/man/isc/isc_interfaceiter_first.3
index e83a85ca5a..c6912c0699 100644
--- a/doc/man/isc/isc_interfaceiter_first.3
+++ b/doc/man/isc/isc_interfaceiter_first.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_interfaceiter_first.3,v 1.2 2000/07/27 09:43:04 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_interfaceiter_first.3,v 1.3 2000/08/01 01:19:23 tale Exp $
+.\"
 .so isc_netif.3
diff --git a/doc/man/isc/isc_interfaceiter_next.3 b/doc/man/isc/isc_interfaceiter_next.3
index 2dddb98849..07d29143f1 100644
--- a/doc/man/isc/isc_interfaceiter_next.3
+++ b/doc/man/isc/isc_interfaceiter_next.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_interfaceiter_next.3,v 1.2 2000/07/27 09:43:05 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_interfaceiter_next.3,v 1.3 2000/08/01 01:19:24 tale Exp $
+.\"
 .so isc_netif.3
diff --git a/doc/man/isc/isc_interval_iszero.3 b/doc/man/isc/isc_interval_iszero.3
index 819edee76f..5cf65c7ba8 100644
--- a/doc/man/isc/isc_interval_iszero.3
+++ b/doc/man/isc/isc_interval_iszero.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_interval_iszero.3,v 1.2 2000/07/27 09:43:06 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_interval_iszero.3,v 1.3 2000/08/01 01:19:25 tale Exp $
+.\"
 .so isc_time.3
diff --git a/doc/man/isc/isc_ipproto.3 b/doc/man/isc/isc_ipproto.3
index 5ee0fec049..a8caf83543 100644
--- a/doc/man/isc/isc_ipproto.3
+++ b/doc/man/isc/isc_ipproto.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: isc_ipproto.3,v 1.3 2000/07/27 09:43:07 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_ipproto.3,v 1.4 2000/08/01 01:19:26 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt ISC_IPPROTO 3
 .Os BIND9 9
@@ -25,14 +25,14 @@
 .Nd protocol probe functions
 .Sh SYNOPSIS
 .Fd #include  
- 
+
 .Fd #include 
 .Fd #include 
- 
+
 .Fd #include 
 .Fd #include 
 .Fd #include 
-.Fd #include  
+.Fd #include 
 
 .Fo isc_net_probeipv4
 .Fa void
@@ -49,12 +49,12 @@ check that the operating system support the IPv4 and IPv6 protocols
 respectively.
 .Sh RETURN VALUES
 .Fn isc_net_probeipv4
-returns 
+returns
 .Er ISC_R_SUCCESS
 if the IPv4 protocol is supported by the kernel and
 .Fn isc_net_probeipv6
 returns
-.Er ISC_R_SUCCESS 
+.Er ISC_R_SUCCESS
 if the operating system supports IPv6.
 .Fn try_proto
 returns
diff --git a/doc/man/isc/isc_net_probeipv4.3 b/doc/man/isc/isc_net_probeipv4.3
index ca3c376881..19417e00d5 100644
--- a/doc/man/isc/isc_net_probeipv4.3
+++ b/doc/man/isc/isc_net_probeipv4.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_net_probeipv4.3,v 1.2 2000/07/27 09:43:08 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_net_probeipv4.3,v 1.3 2000/08/01 01:19:28 tale Exp $
+.\"
 .so isc_ipproto.3
diff --git a/doc/man/isc/isc_net_probeipv6.3 b/doc/man/isc/isc_net_probeipv6.3
index 1aed85155a..28da28bebe 100644
--- a/doc/man/isc/isc_net_probeipv6.3
+++ b/doc/man/isc/isc_net_probeipv6.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_net_probeipv6.3,v 1.2 2000/07/27 09:43:09 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_net_probeipv6.3,v 1.3 2000/08/01 01:19:29 tale Exp $
+.\"
 .so isc_ipproto.3
diff --git a/doc/man/isc/isc_netif.3 b/doc/man/isc/isc_netif.3
index 8f8c50fc75..e577f05d97 100644
--- a/doc/man/isc/isc_netif.3
+++ b/doc/man/isc/isc_netif.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: isc_netif.3,v 1.2 2000/07/27 09:43:11 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_netif.3,v 1.3 2000/08/01 01:19:30 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt ISC_NETIF 3
 .Os BIND9 9
@@ -32,18 +32,18 @@
 .Nd network interface management
 .Sh SYNOPSIS
 .Fd #include 
- 
+
 .Fd #include 
 .Fd #include 
 .Fd #ifdef HAVE_SYS_SOCKIO_H
 .Fd #include          /* Required for ifiter_ioctl.c. */
 .Fd #endif
- 
+
 .Fd #include 
 .Fd #include 
 .Fd #include 
 .Fd #include 
- 
+
 .Fd #include 
 .Fd #include 
 .Fd #include 
@@ -51,7 +51,7 @@
 .Fd #include 
 .Fd #include 
 .Fd #include 
- 
+
 .Fd #include             /* Must follow . */
 
 .Ft isc_result_t
@@ -69,7 +69,7 @@
 .\" .Fo internal_destroy
 .\" .Fc
 .\" .Ft static void
-.\" .Fo get_addr 
+.\" .Fo get_addr
 .\" .Fa "unsigned int family"
 .\" .Fa "isc_netaddr_t *dst"
 .\" .Fa "struct sockaddr *src"
@@ -94,14 +94,14 @@
 Details of the system's network interfaces can be retrieved with
 .Fn isc_interfaceiter_create .
 It uses
-.Xr sysctl 3 
+.Xr sysctl 3
 or an
 .Dv SIOCGLIFCONF
 .Xr ioctl 2
 to get the information from the kernel.
 Configuration details of the system's network interfaces - IP addresses, network
 mask, status, MAC address, etc. - is stored in a buffer which is
-accessed through 
+accessed through
 .Fa iterp .
 Memory is allocated from the memory context
 .Fa mctx
@@ -126,7 +126,7 @@ Information from the
 .Dv isc_interfaceiter_t
 can be accessed using
 .Fn isc_interfaceiter_current ,
-.Fn isc_interfaceiter_first 
+.Fn isc_interfaceiter_first
 and
 .Fn isc_interfaceiter_next .
 .\" which use the internal functions
@@ -136,7 +136,7 @@ and
 .\" .Pp
 .\" .Fn internal_current
 .\" gets information for the current network interface from
-.\" .Fa iter .  
+.\" .Fa iter .
 .\" .Fn internal_current
 .\" sets
 .\" .Dv iter->current
@@ -159,7 +159,7 @@ and
 .\" .Xr isc_interfaceiter_destroy 3 .
 .\" .Pp
 .\" .Fn get_addr
-.\" extracts the network address part of the 
+.\" extracts the network address part of the
 .\" .Dv sockaddr
 .\" struct referenced by
 .\" .Fa src
@@ -168,7 +168,7 @@ and
 .\" .Fa family
 .\" indicates the address family \*-
 .\" .Dv AF_INET
-.\" or 
+.\" or
 .\" .Dv AF_INET6 .
 .\" The address family is given explicitly because the network address might
 .\" contain a netmask obtained by an
@@ -178,7 +178,7 @@ and
 .\" .Dv src->sa_family .
 .Pp
 .Fn isc_interfaceiter_current
-copies the configuration details of 
+copies the configuration details of
 .Fa iter 's
 current network interface to
 .Fa ifdata .
@@ -190,7 +190,7 @@ which has an address in a supported address family: i.e. an IPv4 or
 IPv6 address.
 .Fn isc_interfaceiter_next
 find the next network interface in the list referenced by
-.Fa iter 
+.Fa iter
 that has an IPv4 or IPv6 address.
 .Pp
 The
@@ -199,7 +199,7 @@ structure referenced by
 .Fa iterp
 is discarded by calling
 .Fn isc_interfaceiter_destroy .
-Any memory associated with 
+Any memory associated with
 .Fa iterp is freed.
 .Sh RETURN VALUES
 Successful calls to
@@ -236,9 +236,9 @@ if  it was not possible to obtain a list of network interfaces.
 .Fn isc_interfaceiter_current
 always returns
 .Er ISC_R_SUCCESS
-if 
+if
 .Fa iter
-points to a valid 
+points to a valid
 .Dv isc_interfaceiter_t
 structure.
 .Pp
diff --git a/doc/man/isc/isc_socket.3 b/doc/man/isc/isc_socket.3
index 6a268c94f6..6dc986fc02 100644
--- a/doc/man/isc/isc_socket.3
+++ b/doc/man/isc/isc_socket.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: isc_socket.3,v 1.2 2000/07/27 09:43:12 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_socket.3,v 1.3 2000/08/01 01:19:31 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt ISC_SOCKET 3
 .Os BIND9 9
@@ -45,20 +45,20 @@
 .Nd name server network I/O
 .Sh SYNOPSIS
 .Fd #include 
-.Fd 
+.Fd
 .Fd #include 
 .Fd #include 
 .Fd #include 
 .Fd #include 
 .Fd #include 
-.Fd 
+.Fd
 .Fd #include 
 .Fd #include 
 .Fd #include 
 .Fd #include 
 .Fd #include 
 .Fd #include 
-.Fd 
+.Fd
 .Fd #include 
 .Fd #include 
 .Fd #include 
@@ -72,7 +72,7 @@
 .Fd #include 
 .Fd #include 
 .Fd #include 
-.Fd 
+.Fd
 .Ft isc_result_t
 .Fo isc_socket_create
 .Fa "isc_socketmgr_t *manager"
@@ -85,7 +85,7 @@
 .Fa "isc_socket_t *sock"
 .Fa "isc_socket_t **socketp"
 .Fc
-.Ft void 
+.Ft void
 .Fo isc_socket_detach
 .Fa "isc_socket_t **socketp"
 .Fc
@@ -234,18 +234,18 @@ struct isc_socket {
         isc_socketmgr_t        *manager;
         isc_mutex_t             lock;
         isc_sockettype_t        type;
- 
+
         /* Locked by socket lock. */
         unsigned int            references;
         int                     fd;
         isc_result_t            recv_result;
         isc_result_t            send_result;
- 
+
         ISC_LIST(isc_socketevent_t)             send_list;
         ISC_LIST(isc_socketevent_t)             recv_list;
         ISC_LIST(isc_socket_newconnev_t)        accept_list;
         isc_socket_connev_t                    *connect_ev;
- 
+
         /*
          * Internal events.  Posted when a descriptor is readable or
          * writable.  These are statically allocated and never freed.
@@ -253,9 +253,9 @@ struct isc_socket {
          */
         intev_t                 readable_ev;
         intev_t                 writable_ev;
- 
+
         isc_sockaddr_t          address;  /* remote address */
- 
+
         unsigned int            pending_recv : 1,
                                 pending_send : 1,
                                 pending_accept : 1,
@@ -263,7 +263,7 @@ struct isc_socket {
                                 connected : 1,
                                 connecting : 1, /* connect pending */
                                 bound : 1; /* bound to local addr */
- 
+
 #ifdef ISC_NET_RECVOVERFLOW
         unsigned char           overflow; /* used for MSG_TRUNC fake */
 #endif
@@ -298,7 +298,7 @@ typedef struct isc_socketmgr isc_socketmgr_t;
 .Pp
 .Fn isc_socket_create
 creates a new socket of protocol family
-.Fa pf 
+.Fa pf
 which is either
 .Dv PF_INET
 or
@@ -359,7 +359,7 @@ by
 If the caller uses this manager to hold any socket references, it will
 deadlock itself.
 Therefore those sockets should be detached by calling
-.Xr isc_socket_detach 3 
+.Xr isc_socket_detach 3
 before invoking
 .Fn isc_socketmgr_destroy .
 .Pp
@@ -413,7 +413,7 @@ or any data they refer to
 should not be modified by the caller until the completion event has
 been received.
 When a successful call to
-.Fn isc_socket_recvv 
+.Fn isc_socket_recvv
 completes,
 .Fa *buflist
 will be empty.
@@ -450,7 +450,7 @@ The functions
 .Fn isc_socket_send ,
 .Fn isc_socket_sendto ,
 .Fn isc_socket_sendv
-and 
+and
 .Fn isc_socket_sendtov
 are used to send data to the peer for socket
 .Fa sock .
@@ -476,7 +476,7 @@ when the data have been sent.
 If
 .Fa action
 is NULL, no completion event is posted.
-.Pp 
+.Pp
 For
 .Fn isc_socket_sendto
 and
@@ -578,7 +578,7 @@ is zero, a reasonable system default is used, typically
 .Dv SOMAXCONN .
 The value of
 .Fa backlog
-may be ignored on other operating systems. 
+may be ignored on other operating systems.
 .Pp
 .Fn isc_socket_accept
 is used to queue an accept event when an incoming connection request
@@ -636,7 +636,7 @@ gets the name of socket
 and copies it to
 .Fa addressp .
 Both functions have assertion checks to ensure that
-.Fa sock 
+.Fa sock
 is a valid socket
 and that
 .Fa *addressp
@@ -648,14 +648,14 @@ Socket events that hav been queued for some task can be cancelled using
 and
 .Fa task
 are a valid socket and task pointers respectively.
-.Fa how 
+.Fa how
 is a bitmask of the events that are to be cancelled.
 Possible values for
 .Fa how
 are any combination of
 .Dv ISC_SOCKCANCEL_RECV ,
 .Dv ISC_SOCKCANCEL_SEND ,
-.Dv ISC_SOCKCANCEL_ACCEPT 
+.Dv ISC_SOCKCANCEL_ACCEPT
 and
 .Dv ISC_SOCKCANCEL_CONNECT .
 When the events are cancelled,
@@ -686,7 +686,7 @@ are a valid socket, task and action respectively.
 .Pp
 When the event handler returns, its
 .Dv result
-member can sometimes contain useful information. 
+member can sometimes contain useful information.
 Depending on the marker type, the event's
 .Dv result member
 will contain the same error that the last
@@ -751,7 +751,7 @@ socket event handler.
 The handler that is invoked for
 the
 .Dv ISC_SOCKEVENT_RECVDONE
-when the socket read 
+when the socket read
 completes will return
 .Er ISC_R_SUCCESS
 on success or
@@ -761,14 +761,14 @@ if it encounters an error.
 The functions
 .Fn isc_socket_sendto ,
 .Fn isc_socket_sendtov ,
-.Fn isc_socket_send 
+.Fn isc_socket_send
 and
-.Fn isc_socket_sendv 
+.Fn isc_socket_sendv
 all return
 .Er ISC_R_SUCCESS
 on success.
 If these four functions are unable to allocate memory when setting up
-an event handler, they return 
+an event handler, they return
 .Er ISC_R_NOMEMORY .
 The event handler that is invoked when a
 .Dv ISC_SOCKEVENT_SENDDONE
@@ -791,7 +791,7 @@ does no have sufficient permission to access it.
 .Er ISC_R_ADDRNOTAVAIL
 is returned if the specified address is not available.
 .Fn isc_socket_bind
-returns 
+returns
 .Er ISC_R_ADDRINUSE
 if the address is already in use and
 .Er ISC_R_BOUND
@@ -799,12 +799,12 @@ if
 .Fa sock had already been bound to an address.
 .Er ISC_R_UNEXPECTED
 is returned for any other error conditions that are reported by
-.Xr bind 2 
+.Xr bind 2
 and an error message printed on
 .Dv stderr .
 .Pp
 .Fn isc_socket_listen
-returns 
+returns
 .Er ISC_R_SUCCESS
 on success.
 .Er ISC_R_UNEXPECTED
@@ -837,10 +837,10 @@ The event handler returns
 .Er ISC_R_SUCCESS
 when the connection attempt completes successfully.
 It returns
-.Er ISC_R_TIMEDOUT 
+.Er ISC_R_TIMEDOUT
 when the connection attempt times out or
 .Er ISC_R_CONNREFUSED
-if the peer 
+if the peer
 .Fa addr
 refused the connection.
 An error of
diff --git a/doc/man/isc/isc_socket_accept.3 b/doc/man/isc/isc_socket_accept.3
index 9a366280a6..3872da33d0 100644
--- a/doc/man/isc/isc_socket_accept.3
+++ b/doc/man/isc/isc_socket_accept.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_socket_accept.3,v 1.2 2000/07/27 09:43:13 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_socket_accept.3,v 1.3 2000/08/01 01:19:33 tale Exp $
+.\"
 .so isc_socket.3
diff --git a/doc/man/isc/isc_socket_attach.3 b/doc/man/isc/isc_socket_attach.3
index ed5f742803..8ed92ab640 100644
--- a/doc/man/isc/isc_socket_attach.3
+++ b/doc/man/isc/isc_socket_attach.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_socket_attach.3,v 1.2 2000/07/27 09:43:14 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_socket_attach.3,v 1.3 2000/08/01 01:19:34 tale Exp $
+.\"
 .so isc_socket.3
diff --git a/doc/man/isc/isc_socket_bind.3 b/doc/man/isc/isc_socket_bind.3
index 306c2b27d4..440df7a0e8 100644
--- a/doc/man/isc/isc_socket_bind.3
+++ b/doc/man/isc/isc_socket_bind.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_socket_bind.3,v 1.2 2000/07/27 09:43:15 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_socket_bind.3,v 1.3 2000/08/01 01:19:35 tale Exp $
+.\"
 .so isc_socket.3
diff --git a/doc/man/isc/isc_socket_cancel.3 b/doc/man/isc/isc_socket_cancel.3
index 3c53b6659f..4bb99e12e9 100644
--- a/doc/man/isc/isc_socket_cancel.3
+++ b/doc/man/isc/isc_socket_cancel.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_socket_cancel.3,v 1.2 2000/07/27 09:43:16 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_socket_cancel.3,v 1.3 2000/08/01 01:19:36 tale Exp $
+.\"
 .so isc_socket.3
diff --git a/doc/man/isc/isc_socket_connect.3 b/doc/man/isc/isc_socket_connect.3
index 493c483e03..5f190dbca4 100644
--- a/doc/man/isc/isc_socket_connect.3
+++ b/doc/man/isc/isc_socket_connect.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_socket_connect.3,v 1.2 2000/07/27 09:43:17 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_socket_connect.3,v 1.3 2000/08/01 01:19:37 tale Exp $
+.\"
 .so isc_socket.3
diff --git a/doc/man/isc/isc_socket_create.3 b/doc/man/isc/isc_socket_create.3
index ca9cce469f..c4cfa18ede 100644
--- a/doc/man/isc/isc_socket_create.3
+++ b/doc/man/isc/isc_socket_create.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_socket_create.3,v 1.2 2000/07/27 09:43:18 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_socket_create.3,v 1.3 2000/08/01 01:19:38 tale Exp $
+.\"
 .so isc_socket.3
diff --git a/doc/man/isc/isc_socket_detach.3 b/doc/man/isc/isc_socket_detach.3
index c197cbce3b..6da84e5b23 100644
--- a/doc/man/isc/isc_socket_detach.3
+++ b/doc/man/isc/isc_socket_detach.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_socket_detach.3,v 1.2 2000/07/27 09:43:19 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_socket_detach.3,v 1.3 2000/08/01 01:19:40 tale Exp $
+.\"
 .so isc_socket.3
diff --git a/doc/man/isc/isc_socket_getpeername.3 b/doc/man/isc/isc_socket_getpeername.3
index 028d737e83..f5bfd8662b 100644
--- a/doc/man/isc/isc_socket_getpeername.3
+++ b/doc/man/isc/isc_socket_getpeername.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_socket_getpeername.3,v 1.2 2000/07/27 09:43:20 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_socket_getpeername.3,v 1.3 2000/08/01 01:19:41 tale Exp $
+.\"
 .so isc_socket.3
diff --git a/doc/man/isc/isc_socket_getsockname.3 b/doc/man/isc/isc_socket_getsockname.3
index 474e7032a5..d263cfcd2e 100644
--- a/doc/man/isc/isc_socket_getsockname.3
+++ b/doc/man/isc/isc_socket_getsockname.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_socket_getsockname.3,v 1.2 2000/07/27 09:43:21 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_socket_getsockname.3,v 1.3 2000/08/01 01:19:42 tale Exp $
+.\"
 .so isc_socket.3
diff --git a/doc/man/isc/isc_socket_gettype.3 b/doc/man/isc/isc_socket_gettype.3
index cb30dd9055..7f0cbfd973 100644
--- a/doc/man/isc/isc_socket_gettype.3
+++ b/doc/man/isc/isc_socket_gettype.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_socket_gettype.3,v 1.2 2000/07/27 09:43:23 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_socket_gettype.3,v 1.3 2000/08/01 01:19:43 tale Exp $
+.\"
 .so isc_socket.3
diff --git a/doc/man/isc/isc_socket_isbound.3 b/doc/man/isc/isc_socket_isbound.3
index 6813ae2963..bd73fb111a 100644
--- a/doc/man/isc/isc_socket_isbound.3
+++ b/doc/man/isc/isc_socket_isbound.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_socket_isbound.3,v 1.2 2000/07/27 09:43:24 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_socket_isbound.3,v 1.3 2000/08/01 01:19:44 tale Exp $
+.\"
 .so isc_socket.3
diff --git a/doc/man/isc/isc_socket_listen.3 b/doc/man/isc/isc_socket_listen.3
index 1189ab70d7..eff2a3f479 100644
--- a/doc/man/isc/isc_socket_listen.3
+++ b/doc/man/isc/isc_socket_listen.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_socket_listen.3,v 1.2 2000/07/27 09:43:25 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_socket_listen.3,v 1.3 2000/08/01 01:19:45 tale Exp $
+.\"
 .so isc_socket.3
diff --git a/doc/man/isc/isc_socket_recv.3 b/doc/man/isc/isc_socket_recv.3
index 0e0e48ed35..6e786af3ea 100644
--- a/doc/man/isc/isc_socket_recv.3
+++ b/doc/man/isc/isc_socket_recv.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_socket_recv.3,v 1.2 2000/07/27 09:43:26 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_socket_recv.3,v 1.3 2000/08/01 01:19:46 tale Exp $
+.\"
 .so isc_socket.3
diff --git a/doc/man/isc/isc_socket_recvmark.3 b/doc/man/isc/isc_socket_recvmark.3
index 09224cb712..dd8f7eb386 100644
--- a/doc/man/isc/isc_socket_recvmark.3
+++ b/doc/man/isc/isc_socket_recvmark.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_socket_recvmark.3,v 1.2 2000/07/27 09:43:27 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_socket_recvmark.3,v 1.3 2000/08/01 01:19:47 tale Exp $
+.\"
 .so isc_socket.3
diff --git a/doc/man/isc/isc_socket_recvv.3 b/doc/man/isc/isc_socket_recvv.3
index d9a267e852..609650efb2 100644
--- a/doc/man/isc/isc_socket_recvv.3
+++ b/doc/man/isc/isc_socket_recvv.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_socket_recvv.3,v 1.2 2000/07/27 09:43:28 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_socket_recvv.3,v 1.3 2000/08/01 01:19:48 tale Exp $
+.\"
 .so isc_socket.3
diff --git a/doc/man/isc/isc_socket_send.3 b/doc/man/isc/isc_socket_send.3
index 064533f7ed..7119799cfe 100644
--- a/doc/man/isc/isc_socket_send.3
+++ b/doc/man/isc/isc_socket_send.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_socket_send.3,v 1.2 2000/07/27 09:43:29 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_socket_send.3,v 1.3 2000/08/01 01:19:50 tale Exp $
+.\"
 .so isc_socket.3
diff --git a/doc/man/isc/isc_socket_sendmark.3 b/doc/man/isc/isc_socket_sendmark.3
index d0fb12a241..9f9db404a6 100644
--- a/doc/man/isc/isc_socket_sendmark.3
+++ b/doc/man/isc/isc_socket_sendmark.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_socket_sendmark.3,v 1.2 2000/07/27 09:43:30 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_socket_sendmark.3,v 1.3 2000/08/01 01:19:51 tale Exp $
+.\"
 .so isc_socket.3
diff --git a/doc/man/isc/isc_socket_sendto.3 b/doc/man/isc/isc_socket_sendto.3
index 3a1cd5cfa6..f2cf071240 100644
--- a/doc/man/isc/isc_socket_sendto.3
+++ b/doc/man/isc/isc_socket_sendto.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_socket_sendto.3,v 1.2 2000/07/27 09:43:31 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_socket_sendto.3,v 1.3 2000/08/01 01:19:52 tale Exp $
+.\"
 .so isc_socket.3
diff --git a/doc/man/isc/isc_socket_sendtov.3 b/doc/man/isc/isc_socket_sendtov.3
index e0f36bede8..ebcd9f31ee 100644
--- a/doc/man/isc/isc_socket_sendtov.3
+++ b/doc/man/isc/isc_socket_sendtov.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_socket_sendtov.3,v 1.2 2000/07/27 09:43:32 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_socket_sendtov.3,v 1.3 2000/08/01 01:19:53 tale Exp $
+.\"
 .so isc_socket.3
diff --git a/doc/man/isc/isc_socket_sendv.3 b/doc/man/isc/isc_socket_sendv.3
index e239351cd3..dd5e728bb4 100644
--- a/doc/man/isc/isc_socket_sendv.3
+++ b/doc/man/isc/isc_socket_sendv.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_socket_sendv.3,v 1.2 2000/07/27 09:43:33 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_socket_sendv.3,v 1.3 2000/08/01 01:19:54 tale Exp $
+.\"
 .so isc_socket.3
diff --git a/doc/man/isc/isc_socketmgr_create.3 b/doc/man/isc/isc_socketmgr_create.3
index ea5767a169..3aa300fc51 100644
--- a/doc/man/isc/isc_socketmgr_create.3
+++ b/doc/man/isc/isc_socketmgr_create.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_socketmgr_create.3,v 1.2 2000/07/27 09:43:34 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_socketmgr_create.3,v 1.3 2000/08/01 01:19:55 tale Exp $
+.\"
 .so isc_socket.3
diff --git a/doc/man/isc/isc_socketmgr_destroy.3 b/doc/man/isc/isc_socketmgr_destroy.3
index a60ee3d189..a0f4f65a94 100644
--- a/doc/man/isc/isc_socketmgr_destroy.3
+++ b/doc/man/isc/isc_socketmgr_destroy.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_socketmgr_destroy.3,v 1.2 2000/07/27 09:43:35 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_socketmgr_destroy.3,v 1.3 2000/08/01 01:19:57 tale Exp $
+.\"
 .so isc_socket.3
diff --git a/doc/man/isc/isc_stdio.3 b/doc/man/isc/isc_stdio.3
index 5518e65d10..0638ba3a22 100644
--- a/doc/man/isc/isc_stdio.3
+++ b/doc/man/isc/isc_stdio.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: isc_stdio.3,v 1.2 2000/07/27 09:43:37 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_stdio.3,v 1.3 2000/08/01 01:19:58 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt ISC_STDIO 3
 .Os BIND9 9
@@ -115,13 +115,13 @@ is the
 .Dv FILE
 pointer and
 .Fa offset
-and 
+and
 .Fa whence
 have the usual meanings.
 The new position is found by adding
 .Fa offset
 bytes to the position specified by
-.Fa whence 
+.Fa whence
 which is set to the values
 .Dv SEEK_SET ,
 .Dv SEEK_CUR ,
@@ -147,7 +147,7 @@ bytes long, from the stream pointed to by
 The objects are stored at the location given by
 .Fa ptr .
 .Fa isc_stdio_write
-writes 
+writes
 .Fa nmemb
 objects, each
 .Fa size
diff --git a/doc/man/isc/isc_stdio_close.3 b/doc/man/isc/isc_stdio_close.3
index 0efa43f6f4..abea711735 100644
--- a/doc/man/isc/isc_stdio_close.3
+++ b/doc/man/isc/isc_stdio_close.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_stdio_close.3,v 1.2 2000/07/27 09:43:38 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_stdio_close.3,v 1.3 2000/08/01 01:19:59 tale Exp $
+.\"
 .so isc_stdio.3
diff --git a/doc/man/isc/isc_stdio_flush.3 b/doc/man/isc/isc_stdio_flush.3
index 5b29c685ce..ab642d4076 100644
--- a/doc/man/isc/isc_stdio_flush.3
+++ b/doc/man/isc/isc_stdio_flush.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_stdio_flush.3,v 1.2 2000/07/27 09:43:39 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_stdio_flush.3,v 1.3 2000/08/01 01:20:00 tale Exp $
+.\"
 .so isc_stdio.3
diff --git a/doc/man/isc/isc_stdio_open.3 b/doc/man/isc/isc_stdio_open.3
index b9be1da8af..bc49e64995 100644
--- a/doc/man/isc/isc_stdio_open.3
+++ b/doc/man/isc/isc_stdio_open.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_stdio_open.3,v 1.2 2000/07/27 09:43:40 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_stdio_open.3,v 1.3 2000/08/01 01:20:01 tale Exp $
+.\"
 .so isc_stdio.3
diff --git a/doc/man/isc/isc_stdio_read.3 b/doc/man/isc/isc_stdio_read.3
index 819a74a15c..6e2ada0a25 100644
--- a/doc/man/isc/isc_stdio_read.3
+++ b/doc/man/isc/isc_stdio_read.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_stdio_read.3,v 1.2 2000/07/27 09:43:41 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_stdio_read.3,v 1.3 2000/08/01 01:20:03 tale Exp $
+.\"
 .so isc_stdio.3
diff --git a/doc/man/isc/isc_stdio_seek.3 b/doc/man/isc/isc_stdio_seek.3
index d4de781294..7032272b2a 100644
--- a/doc/man/isc/isc_stdio_seek.3
+++ b/doc/man/isc/isc_stdio_seek.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_stdio_seek.3,v 1.2 2000/07/27 09:43:42 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_stdio_seek.3,v 1.3 2000/08/01 01:20:04 tale Exp $
+.\"
 .so isc_stdio.3
diff --git a/doc/man/isc/isc_stdio_sync.3 b/doc/man/isc/isc_stdio_sync.3
index 38a83ae01f..bbc5518437 100644
--- a/doc/man/isc/isc_stdio_sync.3
+++ b/doc/man/isc/isc_stdio_sync.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_stdio_sync.3,v 1.2 2000/07/27 09:43:43 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_stdio_sync.3,v 1.3 2000/08/01 01:20:05 tale Exp $
+.\"
 .so isc_stdio.3
diff --git a/doc/man/isc/isc_stdio_write.3 b/doc/man/isc/isc_stdio_write.3
index 727561e46a..508a6822b7 100644
--- a/doc/man/isc/isc_stdio_write.3
+++ b/doc/man/isc/isc_stdio_write.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_stdio_write.3,v 1.2 2000/07/27 09:43:44 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_stdio_write.3,v 1.3 2000/08/01 01:20:06 tale Exp $
+.\"
 .so isc_stdio.3
diff --git a/doc/man/isc/isc_stdtime.3 b/doc/man/isc/isc_stdtime.3
index 6c006faa1b..37d54da214 100644
--- a/doc/man/isc/isc_stdtime.3
+++ b/doc/man/isc/isc_stdtime.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: isc_stdtime.3,v 1.2 2000/07/27 09:43:45 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_stdtime.3,v 1.3 2000/08/01 01:20:07 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt ISC_STDTIME 3
 .Os BIND9 9
@@ -26,9 +26,9 @@
 .Fd #include 
 
 .Fd #include 
- 
+
 .Fd #include 
-.Fd #include   
+.Fd #include 
 
 .Ft void
 .Fo isc_stdtime_get
@@ -39,7 +39,7 @@
 sets
 .Fa t
 to the number of seconds since the UNIX epoch, 00:00:00 UTC, January
-1, 1970.                                   
+1, 1970.
 .Sh SEE ALSO
 .Xr gettimeofday 2 ,
 .Xr isc_time_now 3 .
@@ -52,7 +52,7 @@ the UNIX epoch will overflow a 32-bit signed integer.
 This may cause unpredictable behaviour on systems which treat these
 timestamps as 32-bit signed quantities.
 .Dv isc_stdtime_t
-is defined as a 32-bit unsigned quantity, which means 
+is defined as a 32-bit unsigned quantity, which means
 .Fn isc_stdtime_get
 should be safe until some time in 2106.
 Applications that
diff --git a/doc/man/isc/isc_stdtime_get.3 b/doc/man/isc/isc_stdtime_get.3
index a16bb6e3f4..6ee737e652 100644
--- a/doc/man/isc/isc_stdtime_get.3
+++ b/doc/man/isc/isc_stdtime_get.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_stdtime_get.3,v 1.2 2000/07/27 09:43:46 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_stdtime_get.3,v 1.3 2000/08/01 01:20:08 tale Exp $
+.\"
 .so isc_stdtime.3
diff --git a/doc/man/isc/isc_time.3 b/doc/man/isc/isc_time.3
index ac427789ab..3ba9ca71da 100644
--- a/doc/man/isc/isc_time.3
+++ b/doc/man/isc/isc_time.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: isc_time.3,v 1.4 2000/07/27 09:43:47 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_time.3,v 1.5 2000/08/01 01:20:09 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt ISC_TIME 3
 .Os BIND9 9
@@ -32,17 +32,17 @@
 .Nm isc_time_microdiff ,
 .Nm isc_time_seconds ,
 .Nm isc_time_secondsastimet ,
-.Nm isc_time_nanoseconds 
+.Nm isc_time_nanoseconds
 .Nd time-related operations
 .Sh SYNOPSIS
 .Fd #include 
- 
+
 .Fd #include 
 .Fd #include 
 .Fd #include 
- 
+
 .Fd #include 
- 
+
 .Fd #include 
 .Fd #include 
 .Fd #include 
@@ -133,7 +133,7 @@ struct isc_time {
         unsigned int nanoseconds;
 };
 
-typedef struct isc_time isc_time_t; 
+typedef struct isc_time isc_time_t;
 .Ed
 The contents of these structures are private
 and MUST NOT be accessed by callers directly.
@@ -165,12 +165,12 @@ if
 .Fa *i
 is the zero interval.
 This condition should hold when the desired amount of time until an
-event associated with interval 
+event associated with interval
 .Fa *i
 has elapsed.
 .Pp
 .Fn isc_time_settoepoch
-sets 
+sets
 .Fa *t
 to the time of the epoch.
 On
@@ -195,7 +195,7 @@ On a successful call to this function, the structure pointed at by
 is set to the number of seconds and nanoseconds since the epoch.
 .Pp
 .Fn isc_time_nowplusinterval
-sets 
+sets
 .Fa *t
 to the current time plus the interval specified in
 .Fa *i .
@@ -206,7 +206,7 @@ compares the times referenced by
 and
 .Fa *t2 .
 It returns 0 if the two times are equal.
-A value of 1 is returned when 
+A value of 1 is returned when
 .Fa *t1
 is greater than
 .Fa *t2 .
@@ -288,7 +288,7 @@ is returned when the functions are successful.
 .Pp
 Calls to
 .Fn isc_time_add ,
-.Fn isc_time_subtract 
+.Fn isc_time_subtract
 and
 .Fn isc_time_secondsastimet
 normally return
@@ -301,7 +301,7 @@ if the addition of the time values represented by
 and
 .Fa i
 result in a number of seconds that are too big to fit in a
-.Dv "unsigned int" 
+.Dv "unsigned int"
 quantity.
 If the time value given by
 .Fa i
diff --git a/doc/man/isc/isc_time_add.3 b/doc/man/isc/isc_time_add.3
index b021921a57..18b7c44171 100644
--- a/doc/man/isc/isc_time_add.3
+++ b/doc/man/isc/isc_time_add.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_time_add.3,v 1.2 2000/07/27 09:43:49 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_time_add.3,v 1.3 2000/08/01 01:20:10 tale Exp $
+.\"
 .so isc_time.3
diff --git a/doc/man/isc/isc_time_compare.3 b/doc/man/isc/isc_time_compare.3
index 27f77cdfa2..f63a76c3e1 100644
--- a/doc/man/isc/isc_time_compare.3
+++ b/doc/man/isc/isc_time_compare.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_time_compare.3,v 1.2 2000/07/27 09:43:50 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_time_compare.3,v 1.3 2000/08/01 01:20:11 tale Exp $
+.\"
 .so isc_time.3
diff --git a/doc/man/isc/isc_time_isepoch.3 b/doc/man/isc/isc_time_isepoch.3
index 720f9f46f9..40bed93e89 100644
--- a/doc/man/isc/isc_time_isepoch.3
+++ b/doc/man/isc/isc_time_isepoch.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_time_isepoch.3,v 1.2 2000/07/27 09:43:51 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_time_isepoch.3,v 1.3 2000/08/01 01:20:12 tale Exp $
+.\"
 .so isc_time.3
diff --git a/doc/man/isc/isc_time_microdiff.3 b/doc/man/isc/isc_time_microdiff.3
index edc765810b..e104d37c3d 100644
--- a/doc/man/isc/isc_time_microdiff.3
+++ b/doc/man/isc/isc_time_microdiff.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_time_microdiff.3,v 1.2 2000/07/27 09:43:52 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_time_microdiff.3,v 1.3 2000/08/01 01:20:14 tale Exp $
+.\"
 .so isc_time.3
diff --git a/doc/man/isc/isc_time_nanoseconds.3 b/doc/man/isc/isc_time_nanoseconds.3
index ca49ab645d..644b3e8df1 100644
--- a/doc/man/isc/isc_time_nanoseconds.3
+++ b/doc/man/isc/isc_time_nanoseconds.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_time_nanoseconds.3,v 1.2 2000/07/27 09:43:53 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_time_nanoseconds.3,v 1.3 2000/08/01 01:20:15 tale Exp $
+.\"
 .so isc_time.3
diff --git a/doc/man/isc/isc_time_now.3 b/doc/man/isc/isc_time_now.3
index 2a11a3553a..f0b511b377 100644
--- a/doc/man/isc/isc_time_now.3
+++ b/doc/man/isc/isc_time_now.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_time_now.3,v 1.2 2000/07/27 09:43:54 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_time_now.3,v 1.3 2000/08/01 01:20:16 tale Exp $
+.\"
 .so isc_time.3
diff --git a/doc/man/isc/isc_time_nowplusinterval.3 b/doc/man/isc/isc_time_nowplusinterval.3
index 2a04609fab..871d978ee3 100644
--- a/doc/man/isc/isc_time_nowplusinterval.3
+++ b/doc/man/isc/isc_time_nowplusinterval.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_time_nowplusinterval.3,v 1.2 2000/07/27 09:43:55 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_time_nowplusinterval.3,v 1.3 2000/08/01 01:20:17 tale Exp $
+.\"
 .so isc_time.3
diff --git a/doc/man/isc/isc_time_seconds.3 b/doc/man/isc/isc_time_seconds.3
index 9d432a596e..b3e911399f 100644
--- a/doc/man/isc/isc_time_seconds.3
+++ b/doc/man/isc/isc_time_seconds.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_time_seconds.3,v 1.2 2000/07/27 09:43:56 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_time_seconds.3,v 1.3 2000/08/01 01:20:18 tale Exp $
+.\"
 .so isc_time.3
diff --git a/doc/man/isc/isc_time_secondsastimet.3 b/doc/man/isc/isc_time_secondsastimet.3
index 8cc8b4b079..7a0fecf3d2 100644
--- a/doc/man/isc/isc_time_secondsastimet.3
+++ b/doc/man/isc/isc_time_secondsastimet.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_time_secondsastimet.3,v 1.2 2000/07/27 09:43:57 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_time_secondsastimet.3,v 1.3 2000/08/01 01:20:19 tale Exp $
+.\"
 .so isc_time.3
diff --git a/doc/man/isc/isc_time_set.3 b/doc/man/isc/isc_time_set.3
index 880b56a18b..9112c853b9 100644
--- a/doc/man/isc/isc_time_set.3
+++ b/doc/man/isc/isc_time_set.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_time_set.3,v 1.2 2000/07/27 09:43:58 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_time_set.3,v 1.3 2000/08/01 01:20:20 tale Exp $
+.\"
 .so isc_time.3
diff --git a/doc/man/isc/isc_time_settoepoch.3 b/doc/man/isc/isc_time_settoepoch.3
index 97a8b0e2da..09c27b9e75 100644
--- a/doc/man/isc/isc_time_settoepoch.3
+++ b/doc/man/isc/isc_time_settoepoch.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_time_settoepoch.3,v 1.2 2000/07/27 09:43:59 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_time_settoepoch.3,v 1.3 2000/08/01 01:20:21 tale Exp $
+.\"
 .so isc_time.3
diff --git a/doc/man/isc/isc_time_subtract.3 b/doc/man/isc/isc_time_subtract.3
index febe6eb925..0f5d84d5c5 100644
--- a/doc/man/isc/isc_time_subtract.3
+++ b/doc/man/isc/isc_time_subtract.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: isc_time_subtract.3,v 1.2 2000/07/27 09:44:00 tale Exp $
-.\" 
+.\"
+.\" $Id: isc_time_subtract.3,v 1.3 2000/08/01 01:20:22 tale Exp $
+.\"
 .so isc_time.3
diff --git a/doc/man/lwres/lwres.3 b/doc/man/lwres/lwres.3
index 9f22585a4f..31577c3d2d 100644
--- a/doc/man/lwres/lwres.3
+++ b/doc/man/lwres/lwres.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: lwres.3,v 1.2 2000/07/27 09:44:02 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres.3,v 1.3 2000/08/01 01:20:24 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt LWRES 3
 .Os BIND9 9
@@ -42,9 +42,9 @@ Clients use the functions provided by the lightweight resolver library
 to encode requests and decode responses.
 The server for the lightweight resolver is
 .Nm lwresd .
-In reality this is implemented by the name server, 
+In reality this is implemented by the name server,
 .Nm named ,
-though when operating as the lightweight resolver server, 
+though when operating as the lightweight resolver server,
 .Nm lwresd
 is functionally and logically distinct from the actual name server.
 The protocol consists of a number of opcodes, each of which has a
@@ -97,7 +97,7 @@ character.
 This simplifies structure handling and parsing for both the server
 receiving a request and the client receiving a reply.
 It also eliminates data copying by enabling a mapping structure to
-directly point at data in the actual receive buffer. 
+directly point at data in the actual receive buffer.
 .Sh OPCODES
 .Pp
 Every lightweight resolver operation uses a unique opcode.
@@ -105,12 +105,12 @@ Each opcode is assigned a number.
 Opcodes in the range 0x00000000 and 0x03ffffff are reserved for use by
 the lightweight resolver library.
 Opcodes between 0x04000000 and 0xffffffff have been set aside for use by
-applications. 
+applications.
 .Pp
 Three opcodes are currently defined:
 .Bl -tag -width LWRES_OPCODE_GETADDRSBYNAME
 .It Li LWRES_OPCODE_NOOP
-The no-op opcode is essentially an echo operation, comparable to 
+The no-op opcode is essentially an echo operation, comparable to
 .Xr ping 1 .
 The server simply returns the entire data region that had been sent by
 the client.
@@ -165,24 +165,24 @@ function translates from the canonical form to the op-code specific
 structure.
 Memory allocated to the opcode's request or reply structures is
 discarded using the
-.Ar free 
+.Ar free
 function.
 Clients will typically use the op-code specific
 .Ar xxx_request_render ,
-.Ar xxx_response_parse 
+.Ar xxx_response_parse
 and
 .Ar xxx_response_free
 functions.
 The name server will use the
 .Ar xxx_request_parse ,
 .Ar xxx_response_render
-and 
+and
 .Ar xxx_request_free
 functions.
 .Pp
 For example, the no-op opcode -
 .Dv LWRES_OPCODE_NOOP
-- uses 
+- uses
 .Dv lwres_nooprequest_t
 and
 .Dv lwres_noopresponse_t
@@ -214,7 +214,7 @@ releases the memory allocated to the
 and
 .Dv lwres_noopresponse_t
 structures respectively.
-.\" 
+.\"
 .\"	XXXJR
 .\"	NOT YET.
 .\"	This is just a placeholder to indicate where the section on the
@@ -251,9 +251,9 @@ primitives on that context structure or else create a context for each
 thread.
 See
 .Xr lwres_context 3 .
-Once the context has been created, 
+Once the context has been created,
 .Fn lwres_conf_init
-is called to read 
+is called to read
 .Pa /etc/resolv.conf
 so that various options such as sort lists, search lists and so on can
 be applied.
@@ -285,6 +285,6 @@ described above.
 .Xr lwres_context 3 ,
 .Xr lwres_config 3 ,
 .Xr resolver 5 ,
-.Xr lwres_getipnode 3 
+.Xr lwres_getipnode 3
 .Xr lwresd 8 ,
 .Xr named 8 .
diff --git a/doc/man/lwres/lwres_addr_parse.3 b/doc/man/lwres/lwres_addr_parse.3
index 6bab942584..11345fbe25 100644
--- a/doc/man/lwres/lwres_addr_parse.3
+++ b/doc/man/lwres/lwres_addr_parse.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_addr_parse.3,v 1.2 2000/07/27 09:44:03 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_addr_parse.3,v 1.3 2000/08/01 01:20:25 tale Exp $
+.\"
 .so lwres_resutil.3
diff --git a/doc/man/lwres/lwres_buffer.3 b/doc/man/lwres/lwres_buffer.3
index 401aebe76f..ec69ae6c87 100644
--- a/doc/man/lwres/lwres_buffer.3
+++ b/doc/man/lwres/lwres_buffer.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: lwres_buffer.3,v 1.2 2000/07/27 09:44:04 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_buffer.3,v 1.3 2000/08/01 01:20:26 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt LWRES_BUFFER 3
 .Os BIND9 9
@@ -39,7 +39,7 @@
 .Nd lightweight resolver buffer management
 .Sh SYNOPSIS
 .Fd #include 
-.Fd 
+.Fd
 .Ft void
 .Fo lwres_buffer_init
 .Fa "lwres_buffer_t *b"
@@ -132,7 +132,7 @@ struct lwres_buffer {
 	unsigned int 		active;
 };
 .Ed
-The main reason for making the buffer structure public is so that 
+The main reason for making the buffer structure public is so that
 buffer operations can be implemented using macros.
 Applications should not manipulate this structure directly.
 They should use the functions listed below.
@@ -166,7 +166,7 @@ It extends from the current offset to an offset in the
 remaining region.
 Initially, the active region is empty.
 If the current offset advances beyond the chosen offset,
-the active region will also be empty.   
+the active region will also be empty.
 .Pp
 Except for
 .Fn lwres_buffer_init ,
@@ -193,7 +193,7 @@ The
 .Fa *b
 is invalidated by
 .Fn lwres_buffer_invalidate .
-.Fa *b 
+.Fa *b
 must be a valid lightweight resolver buffer.
 .Pp
 The functions
@@ -206,7 +206,7 @@ buffer
 by
 .Fa n
 bytes.
-.Fa *b 
+.Fa *b
 .Fn lwres_buffer_add
 checks for buffer overflow and
 .Fn lwres_buffer_subtract
@@ -219,9 +219,9 @@ A lightweight resolver buffer is re-initialised by
 .Fn lwres_buffer_clear .
 The function sets
 .Li b->used ,
-.Li b->current 
+.Li b->current
 and
-.Li b->active 
+.Li b->active
 to zero.
 .Pp
 .Fn lwres_buffer_first
@@ -289,11 +289,11 @@ respectively.
 .Fn lwres_buffer_putmem
 copies
 .Fa length
-bytes of memory at 
+bytes of memory at
 .Fa base
 to
 .Fa b.
-Conversely, 
+Conversely,
 .Fn lwres_buffer_getmem
 copies
 .Fa length
diff --git a/doc/man/lwres/lwres_buffer_add.3 b/doc/man/lwres/lwres_buffer_add.3
index 00bd2561f1..3694e497ca 100644
--- a/doc/man/lwres/lwres_buffer_add.3
+++ b/doc/man/lwres/lwres_buffer_add.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_buffer_add.3,v 1.2 2000/07/27 09:44:05 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_buffer_add.3,v 1.3 2000/08/01 01:20:27 tale Exp $
+.\"
 .so lwres_buffer.3
diff --git a/doc/man/lwres/lwres_buffer_back.3 b/doc/man/lwres/lwres_buffer_back.3
index 811657e69a..552b635cfe 100644
--- a/doc/man/lwres/lwres_buffer_back.3
+++ b/doc/man/lwres/lwres_buffer_back.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_buffer_back.3,v 1.2 2000/07/27 09:44:06 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_buffer_back.3,v 1.3 2000/08/01 01:20:28 tale Exp $
+.\"
 .so lwres_buffer.3
diff --git a/doc/man/lwres/lwres_buffer_clear.3 b/doc/man/lwres/lwres_buffer_clear.3
index 2737e2475c..6b78222349 100644
--- a/doc/man/lwres/lwres_buffer_clear.3
+++ b/doc/man/lwres/lwres_buffer_clear.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_buffer_clear.3,v 1.2 2000/07/27 09:44:07 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_buffer_clear.3,v 1.3 2000/08/01 01:20:29 tale Exp $
+.\"
 .so lwres_buffer.3
diff --git a/doc/man/lwres/lwres_buffer_first.3 b/doc/man/lwres/lwres_buffer_first.3
index 99f3a466f7..57373d02b4 100644
--- a/doc/man/lwres/lwres_buffer_first.3
+++ b/doc/man/lwres/lwres_buffer_first.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_buffer_first.3,v 1.2 2000/07/27 09:44:08 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_buffer_first.3,v 1.3 2000/08/01 01:20:30 tale Exp $
+.\"
 .so lwres_buffer.3
diff --git a/doc/man/lwres/lwres_buffer_forward.3 b/doc/man/lwres/lwres_buffer_forward.3
index fcebbeb7c8..04bcfe3b98 100644
--- a/doc/man/lwres/lwres_buffer_forward.3
+++ b/doc/man/lwres/lwres_buffer_forward.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_buffer_forward.3,v 1.2 2000/07/27 09:44:09 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_buffer_forward.3,v 1.3 2000/08/01 01:20:31 tale Exp $
+.\"
 .so lwres_buffer.3
diff --git a/doc/man/lwres/lwres_buffer_getmem.3 b/doc/man/lwres/lwres_buffer_getmem.3
index 09e50498c8..c057924444 100644
--- a/doc/man/lwres/lwres_buffer_getmem.3
+++ b/doc/man/lwres/lwres_buffer_getmem.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_buffer_getmem.3,v 1.2 2000/07/27 09:44:10 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_buffer_getmem.3,v 1.3 2000/08/01 01:20:33 tale Exp $
+.\"
 .so lwres_buffer.3
diff --git a/doc/man/lwres/lwres_buffer_getuint16.3 b/doc/man/lwres/lwres_buffer_getuint16.3
index c3a5873a21..b7142d6eb3 100644
--- a/doc/man/lwres/lwres_buffer_getuint16.3
+++ b/doc/man/lwres/lwres_buffer_getuint16.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_buffer_getuint16.3,v 1.2 2000/07/27 09:44:12 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_buffer_getuint16.3,v 1.3 2000/08/01 01:20:34 tale Exp $
+.\"
 .so lwres_buffer.3
diff --git a/doc/man/lwres/lwres_buffer_getuint32.3 b/doc/man/lwres/lwres_buffer_getuint32.3
index eeed1336b3..1cc7564e99 100644
--- a/doc/man/lwres/lwres_buffer_getuint32.3
+++ b/doc/man/lwres/lwres_buffer_getuint32.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_buffer_getuint32.3,v 1.2 2000/07/27 09:44:13 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_buffer_getuint32.3,v 1.3 2000/08/01 01:20:35 tale Exp $
+.\"
 .so lwres_buffer.3
diff --git a/doc/man/lwres/lwres_buffer_getuint8.3 b/doc/man/lwres/lwres_buffer_getuint8.3
index e7633793ad..63f50650ae 100644
--- a/doc/man/lwres/lwres_buffer_getuint8.3
+++ b/doc/man/lwres/lwres_buffer_getuint8.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_buffer_getuint8.3,v 1.2 2000/07/27 09:44:14 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_buffer_getuint8.3,v 1.3 2000/08/01 01:20:36 tale Exp $
+.\"
 .so lwres_buffer.3
diff --git a/doc/man/lwres/lwres_buffer_init.3 b/doc/man/lwres/lwres_buffer_init.3
index ffc200e917..35601e65c7 100644
--- a/doc/man/lwres/lwres_buffer_init.3
+++ b/doc/man/lwres/lwres_buffer_init.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_buffer_init.3,v 1.2 2000/07/27 09:44:15 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_buffer_init.3,v 1.3 2000/08/01 01:20:37 tale Exp $
+.\"
 .so lwres_buffer.3
diff --git a/doc/man/lwres/lwres_buffer_invalidate.3 b/doc/man/lwres/lwres_buffer_invalidate.3
index f281800361..d149f42c58 100644
--- a/doc/man/lwres/lwres_buffer_invalidate.3
+++ b/doc/man/lwres/lwres_buffer_invalidate.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_buffer_invalidate.3,v 1.2 2000/07/27 09:44:16 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_buffer_invalidate.3,v 1.3 2000/08/01 01:20:38 tale Exp $
+.\"
 .so lwres_buffer.3
diff --git a/doc/man/lwres/lwres_buffer_putmem.3 b/doc/man/lwres/lwres_buffer_putmem.3
index c092c0e998..7fabb0f1e5 100644
--- a/doc/man/lwres/lwres_buffer_putmem.3
+++ b/doc/man/lwres/lwres_buffer_putmem.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_buffer_putmem.3,v 1.2 2000/07/27 09:44:17 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_buffer_putmem.3,v 1.3 2000/08/01 01:20:39 tale Exp $
+.\"
 .so lwres_buffer.3
diff --git a/doc/man/lwres/lwres_buffer_putuint16.3 b/doc/man/lwres/lwres_buffer_putuint16.3
index 435a12f82d..c54379c6a4 100644
--- a/doc/man/lwres/lwres_buffer_putuint16.3
+++ b/doc/man/lwres/lwres_buffer_putuint16.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_buffer_putuint16.3,v 1.2 2000/07/27 09:44:18 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_buffer_putuint16.3,v 1.3 2000/08/01 01:20:40 tale Exp $
+.\"
 .so lwres_buffer.3
diff --git a/doc/man/lwres/lwres_buffer_putuint32.3 b/doc/man/lwres/lwres_buffer_putuint32.3
index 5fb450a0d3..01312598e0 100644
--- a/doc/man/lwres/lwres_buffer_putuint32.3
+++ b/doc/man/lwres/lwres_buffer_putuint32.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_buffer_putuint32.3,v 1.2 2000/07/27 09:44:19 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_buffer_putuint32.3,v 1.3 2000/08/01 01:20:41 tale Exp $
+.\"
 .so lwres_buffer.3
diff --git a/doc/man/lwres/lwres_buffer_putuint8.3 b/doc/man/lwres/lwres_buffer_putuint8.3
index 25afe81a25..f6e8c07920 100644
--- a/doc/man/lwres/lwres_buffer_putuint8.3
+++ b/doc/man/lwres/lwres_buffer_putuint8.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_buffer_putuint8.3,v 1.2 2000/07/27 09:44:20 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_buffer_putuint8.3,v 1.3 2000/08/01 01:20:42 tale Exp $
+.\"
 .so lwres_buffer.3
diff --git a/doc/man/lwres/lwres_buffer_subtract.3 b/doc/man/lwres/lwres_buffer_subtract.3
index f0e2c6df9e..dc4f74d1e8 100644
--- a/doc/man/lwres/lwres_buffer_subtract.3
+++ b/doc/man/lwres/lwres_buffer_subtract.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_buffer_subtract.3,v 1.2 2000/07/27 09:44:21 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_buffer_subtract.3,v 1.3 2000/08/01 01:20:43 tale Exp $
+.\"
 .so lwres_buffer.3
diff --git a/doc/man/lwres/lwres_conf_clear.3 b/doc/man/lwres/lwres_conf_clear.3
index debb6f0a58..98cb907f3f 100644
--- a/doc/man/lwres/lwres_conf_clear.3
+++ b/doc/man/lwres/lwres_conf_clear.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_conf_clear.3,v 1.2 2000/07/27 09:44:22 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_conf_clear.3,v 1.3 2000/08/01 01:20:45 tale Exp $
+.\"
 .so lwres_config.3
diff --git a/doc/man/lwres/lwres_conf_get.3 b/doc/man/lwres/lwres_conf_get.3
index eec9ddcf47..92b1431bb0 100644
--- a/doc/man/lwres/lwres_conf_get.3
+++ b/doc/man/lwres/lwres_conf_get.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_conf_get.3,v 1.2 2000/07/27 09:44:23 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_conf_get.3,v 1.3 2000/08/01 01:20:46 tale Exp $
+.\"
 .so lwres_config.3
diff --git a/doc/man/lwres/lwres_conf_init.3 b/doc/man/lwres/lwres_conf_init.3
index 61c3864e7b..06eba65af2 100644
--- a/doc/man/lwres/lwres_conf_init.3
+++ b/doc/man/lwres/lwres_conf_init.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_conf_init.3,v 1.2 2000/07/27 09:44:25 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_conf_init.3,v 1.3 2000/08/01 01:20:47 tale Exp $
+.\"
 .so lwres_config.3
diff --git a/doc/man/lwres/lwres_conf_parse.3 b/doc/man/lwres/lwres_conf_parse.3
index 432efb5de4..c5d3195907 100644
--- a/doc/man/lwres/lwres_conf_parse.3
+++ b/doc/man/lwres/lwres_conf_parse.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_conf_parse.3,v 1.2 2000/07/27 09:44:26 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_conf_parse.3,v 1.3 2000/08/01 01:20:48 tale Exp $
+.\"
 .so lwres_config.3
diff --git a/doc/man/lwres/lwres_conf_print.3 b/doc/man/lwres/lwres_conf_print.3
index eddce35786..06a3249329 100644
--- a/doc/man/lwres/lwres_conf_print.3
+++ b/doc/man/lwres/lwres_conf_print.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_conf_print.3,v 1.2 2000/07/27 09:44:27 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_conf_print.3,v 1.3 2000/08/01 01:20:50 tale Exp $
+.\"
 .so lwres_config.3
diff --git a/doc/man/lwres/lwres_config.3 b/doc/man/lwres/lwres_config.3
index be18178f3f..dfd89fe705 100644
--- a/doc/man/lwres/lwres_config.3
+++ b/doc/man/lwres/lwres_config.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: lwres_config.3,v 1.2 2000/07/27 09:44:28 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_config.3,v 1.3 2000/08/01 01:20:51 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt LWRES_CONFIG 3
 .Os BIND9 9
@@ -59,7 +59,7 @@ structure for lightweight resolver context
 .Fa ctx .
 .Pp
 .Fn lwres_conf_clear
-frees up all the internal memory used by 
+frees up all the internal memory used by
 that
 .Dv lwres_conf_t
 structure in resolver context
@@ -83,7 +83,7 @@ to the
 .Fa fp.
 .Sh RETURN VALUES
 .Fn lwres_conf_parse
-returns 
+returns
 .Er LWRES_R_SUCCESS
 if it successfully read and parsed
 .Fa filename .
@@ -91,7 +91,7 @@ It returns
 .Er LWRES_R_FAILURE
 if
 .Fa filename
-could not be opened or contained incorrect 
+could not be opened or contained incorrect
 resolver statements.
 .Pp
 .Fn lwres_conf_print
diff --git a/doc/man/lwres/lwres_context.3 b/doc/man/lwres/lwres_context.3
index e2437a6662..2ae8205992 100644
--- a/doc/man/lwres/lwres_context.3
+++ b/doc/man/lwres/lwres_context.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: lwres_context.3,v 1.2 2000/07/27 09:44:29 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_context.3,v 1.3 2000/08/01 01:20:52 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt LWRES_CONTEXT 3
 .Os BIND9 9
@@ -30,14 +30,14 @@
 .Nd lightweight resolver memory allocation routines
 .Sh SYNOPSIS
 .Fd #include 
-.Fd 
+.Fd
 .Ft lwres_result_t
 .Fo lwres_context_create
 .Fa "lwres_context_t **contextp"
 .Fa "void *arg"
 .Fa "lwres_malloc_t malloc_function"
 .Fa "lwres_free_t free_function"
-.Fc 
+.Fc
 .Ft lwres_result_t
 .Fo lwres_context_destroy
 .Fa "lwres_context_t **contextp"
@@ -155,7 +155,7 @@ is not NULL.
 .Fn lwres_context_initserial
 sets the serial number for context
 .Fa *ctx
-to 
+to
 .Fa serial .
 .Fn lwres_context_nextserial
 returns the current serial number for the context and increments
@@ -219,7 +219,7 @@ returned in
 .Fa *recvd_len .
 .Sh RETURN VALUES
 .Fn lwres_context_create
-returns 
+returns
 .Er LWRES_R_NOMEMORY
 if memory for the
 .Dv "struct lwres_context"
@@ -240,7 +240,7 @@ completes successfully.
 is returned if an I/O error occurs and
 .Er LWRES_R_TIMEOUT
 is returned if the
-.Xr recvfrom 2 
+.Xr recvfrom 2
 call times out.
 .Sh SEE ALSO
 .Xr lwres_conf_init 3 ,
diff --git a/doc/man/lwres/lwres_context_allocmem.3 b/doc/man/lwres/lwres_context_allocmem.3
index f139cbaadb..6d4aa2bdfd 100644
--- a/doc/man/lwres/lwres_context_allocmem.3
+++ b/doc/man/lwres/lwres_context_allocmem.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_context_allocmem.3,v 1.2 2000/07/27 09:44:30 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_context_allocmem.3,v 1.3 2000/08/01 01:20:53 tale Exp $
+.\"
 .so lwres_context.3
diff --git a/doc/man/lwres/lwres_context_create.3 b/doc/man/lwres/lwres_context_create.3
index 3d19c22703..617ff64f37 100644
--- a/doc/man/lwres/lwres_context_create.3
+++ b/doc/man/lwres/lwres_context_create.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_context_create.3,v 1.2 2000/07/27 09:44:31 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_context_create.3,v 1.3 2000/08/01 01:20:54 tale Exp $
+.\"
 .so lwres_context.3
diff --git a/doc/man/lwres/lwres_context_destroy.3 b/doc/man/lwres/lwres_context_destroy.3
index 42f53ef23e..f47ccbcd4b 100644
--- a/doc/man/lwres/lwres_context_destroy.3
+++ b/doc/man/lwres/lwres_context_destroy.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_context_destroy.3,v 1.2 2000/07/27 09:44:32 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_context_destroy.3,v 1.3 2000/08/01 01:20:55 tale Exp $
+.\"
 .so lwres_context.3
diff --git a/doc/man/lwres/lwres_context_freemem.3 b/doc/man/lwres/lwres_context_freemem.3
index 52e3e99d9f..1cd987a4e9 100644
--- a/doc/man/lwres/lwres_context_freemem.3
+++ b/doc/man/lwres/lwres_context_freemem.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_context_freemem.3,v 1.2 2000/07/27 09:44:33 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_context_freemem.3,v 1.3 2000/08/01 01:20:56 tale Exp $
+.\"
 .so lwres_context.3
diff --git a/doc/man/lwres/lwres_context_initserial.3 b/doc/man/lwres/lwres_context_initserial.3
index ae30577aec..9de6c3edb0 100644
--- a/doc/man/lwres/lwres_context_initserial.3
+++ b/doc/man/lwres/lwres_context_initserial.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_context_initserial.3,v 1.2 2000/07/27 09:44:34 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_context_initserial.3,v 1.3 2000/08/01 01:20:57 tale Exp $
+.\"
 .so lwres_context.3
diff --git a/doc/man/lwres/lwres_context_nextserial.3 b/doc/man/lwres/lwres_context_nextserial.3
index 78f751cb4a..82867c3dbc 100644
--- a/doc/man/lwres/lwres_context_nextserial.3
+++ b/doc/man/lwres/lwres_context_nextserial.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_context_nextserial.3,v 1.2 2000/07/27 09:44:35 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_context_nextserial.3,v 1.3 2000/08/01 01:20:58 tale Exp $
+.\"
 .so lwres_context.3
diff --git a/doc/man/lwres/lwres_context_sendrecv.3 b/doc/man/lwres/lwres_context_sendrecv.3
index 8d2cfb7066..7b94ab584c 100644
--- a/doc/man/lwres/lwres_context_sendrecv.3
+++ b/doc/man/lwres/lwres_context_sendrecv.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_context_sendrecv.3,v 1.2 2000/07/27 09:44:36 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_context_sendrecv.3,v 1.3 2000/08/01 01:20:59 tale Exp $
+.\"
 .so lwres_context.3
diff --git a/doc/man/lwres/lwres_endhostent.3 b/doc/man/lwres/lwres_endhostent.3
index 231ab21487..62f7a61def 100644
--- a/doc/man/lwres/lwres_endhostent.3
+++ b/doc/man/lwres/lwres_endhostent.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_endhostent.3,v 1.2 2000/07/27 09:44:38 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_endhostent.3,v 1.3 2000/08/01 01:21:00 tale Exp $
+.\"
 .so lwres_gethostent.3
diff --git a/doc/man/lwres/lwres_endhostent_r.3 b/doc/man/lwres/lwres_endhostent_r.3
index 4c5a898e49..a5f651ea21 100644
--- a/doc/man/lwres/lwres_endhostent_r.3
+++ b/doc/man/lwres/lwres_endhostent_r.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_endhostent_r.3,v 1.2 2000/07/27 09:44:39 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_endhostent_r.3,v 1.3 2000/08/01 01:21:01 tale Exp $
+.\"
 .so lwres_gethostent.3
diff --git a/doc/man/lwres/lwres_freeaddrinfo.3 b/doc/man/lwres/lwres_freeaddrinfo.3
index 4fd640c5db..5583a99cc3 100644
--- a/doc/man/lwres/lwres_freeaddrinfo.3
+++ b/doc/man/lwres/lwres_freeaddrinfo.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_freeaddrinfo.3,v 1.2 2000/07/27 09:44:40 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_freeaddrinfo.3,v 1.3 2000/08/01 01:21:02 tale Exp $
+.\"
 .so lwres_getaddrinfo.3
diff --git a/doc/man/lwres/lwres_freehostent.3 b/doc/man/lwres/lwres_freehostent.3
index 2bfd986665..3b3d8511d2 100644
--- a/doc/man/lwres/lwres_freehostent.3
+++ b/doc/man/lwres/lwres_freehostent.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_freehostent.3,v 1.2 2000/07/27 09:44:41 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_freehostent.3,v 1.3 2000/08/01 01:21:04 tale Exp $
+.\"
 .so lwres_getipnode.3
diff --git a/doc/man/lwres/lwres_gabn.3 b/doc/man/lwres/lwres_gabn.3
index 57ddc1f158..4e0b353854 100644
--- a/doc/man/lwres/lwres_gabn.3
+++ b/doc/man/lwres/lwres_gabn.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: lwres_gabn.3,v 1.2 2000/07/27 09:44:42 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gabn.3,v 1.3 2000/08/01 01:21:05 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt LWRES_GABN 3
 .Os BIND9 9
@@ -29,7 +29,7 @@
 .Nd lightweight resolver getaddrbyname functions
 .Sh SYNOPSIS
 .Fd #include 
-.Fd 
+.Fd
 .Ft lwres_result_t
 .Fo lwres_gabnrequest_render
 .Fa "lwres_context_t *ctx"
@@ -91,9 +91,9 @@ These structures are defined in
 They are shown below.
 .Bd -literal -offset indent
 #define LWRES_OPCODE_GETADDRSBYNAME	0x00010001U
- 
+
 typedef struct lwres_addr lwres_addr_t;
-typedef LWRES_LIST(lwres_addr_t) lwres_addrlist_t; 
+typedef LWRES_LIST(lwres_addr_t) lwres_addrlist_t;
 
 typedef struct {
 	lwres_uint32_t	flags;
@@ -140,7 +140,7 @@ uses context
 .Fa ctx
 to convert the contents of packet
 .Fa pkt
-to a 
+to a
 .Dv lwres_gabnrequest_t
 structure.
 Buffer
@@ -187,7 +187,7 @@ if memory allocation fails.
 is returned if the available space in the buffer
 .Fa b
 is too small to accommodate the packet header or the
-.Dv lwres_gabnrequest_t 
+.Dv lwres_gabnrequest_t
 and
 .Dv lwres_gabnresponse_t
 structures.
@@ -205,4 +205,4 @@ in the packet header structure
 .Dv lwres_lwpacket_t
 indicate that the packet is not a response to an earlier query.
 .Sh SEE ALSO
-.Xr lwres_packet 3 
+.Xr lwres_packet 3
diff --git a/doc/man/lwres/lwres_gabnrequest_free.3 b/doc/man/lwres/lwres_gabnrequest_free.3
index 4767669a77..749c5ab1d2 100644
--- a/doc/man/lwres/lwres_gabnrequest_free.3
+++ b/doc/man/lwres/lwres_gabnrequest_free.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gabnrequest_free.3,v 1.2 2000/07/27 09:44:43 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gabnrequest_free.3,v 1.3 2000/08/01 01:21:06 tale Exp $
+.\"
 .so lwres_gabn.3
diff --git a/doc/man/lwres/lwres_gabnrequest_parse.3 b/doc/man/lwres/lwres_gabnrequest_parse.3
index bac556421f..537c99b70c 100644
--- a/doc/man/lwres/lwres_gabnrequest_parse.3
+++ b/doc/man/lwres/lwres_gabnrequest_parse.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gabnrequest_parse.3,v 1.2 2000/07/27 09:44:44 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gabnrequest_parse.3,v 1.3 2000/08/01 01:21:07 tale Exp $
+.\"
 .so lwres_gabn.3
diff --git a/doc/man/lwres/lwres_gabnrequest_render.3 b/doc/man/lwres/lwres_gabnrequest_render.3
index bdbbd58668..15eee1fa06 100644
--- a/doc/man/lwres/lwres_gabnrequest_render.3
+++ b/doc/man/lwres/lwres_gabnrequest_render.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gabnrequest_render.3,v 1.2 2000/07/27 09:44:45 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gabnrequest_render.3,v 1.3 2000/08/01 01:21:08 tale Exp $
+.\"
 .so lwres_gabn.3
diff --git a/doc/man/lwres/lwres_gabnresponse_free.3 b/doc/man/lwres/lwres_gabnresponse_free.3
index ce1e7a56b2..59039418d7 100644
--- a/doc/man/lwres/lwres_gabnresponse_free.3
+++ b/doc/man/lwres/lwres_gabnresponse_free.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gabnresponse_free.3,v 1.2 2000/07/27 09:44:46 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gabnresponse_free.3,v 1.3 2000/08/01 01:21:09 tale Exp $
+.\"
 .so lwres_gabn.3
diff --git a/doc/man/lwres/lwres_gabnresponse_parse.3 b/doc/man/lwres/lwres_gabnresponse_parse.3
index cc935353ff..001bdb7724 100644
--- a/doc/man/lwres/lwres_gabnresponse_parse.3
+++ b/doc/man/lwres/lwres_gabnresponse_parse.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gabnresponse_parse.3,v 1.2 2000/07/27 09:44:47 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gabnresponse_parse.3,v 1.3 2000/08/01 01:21:10 tale Exp $
+.\"
 .so lwres_gabn.3
diff --git a/doc/man/lwres/lwres_gabnresponse_render.3 b/doc/man/lwres/lwres_gabnresponse_render.3
index ecb88418cf..45e34be225 100644
--- a/doc/man/lwres/lwres_gabnresponse_render.3
+++ b/doc/man/lwres/lwres_gabnresponse_render.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gabnresponse_render.3,v 1.2 2000/07/27 09:44:48 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gabnresponse_render.3,v 1.3 2000/08/01 01:21:11 tale Exp $
+.\"
 .so lwres_gabn.3
diff --git a/doc/man/lwres/lwres_gai_strerror.3 b/doc/man/lwres/lwres_gai_strerror.3
index 8db5b5528d..d36140f3c0 100644
--- a/doc/man/lwres/lwres_gai_strerror.3
+++ b/doc/man/lwres/lwres_gai_strerror.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: lwres_gai_strerror.3,v 1.2 2000/07/27 09:44:49 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gai_strerror.3,v 1.3 2000/08/01 01:21:12 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt LWRES_GAI_STRERROR 3
 .Os BIND9 9
@@ -24,7 +24,7 @@
 .Nd print suitable error string
 .Sh SYNOPSIS
 .Fd #include 
-.Fd 
+.Fd
 .Ft char *
 .Fo gai_strerror
 .Fa "int ecode"
diff --git a/doc/man/lwres/lwres_getaddrinfo.3 b/doc/man/lwres/lwres_getaddrinfo.3
index 090b7ef6f2..6039a1ff07 100644
--- a/doc/man/lwres/lwres_getaddrinfo.3
+++ b/doc/man/lwres/lwres_getaddrinfo.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: lwres_getaddrinfo.3,v 1.2 2000/07/27 09:44:50 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_getaddrinfo.3,v 1.3 2000/08/01 01:21:13 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt LWRES_GETADDRINFO 3
 .Os BIND9 9
@@ -25,7 +25,7 @@
 .Nd socket address structure to host and service name
 .Sh SYNOPSIS
 .Fd #include 
-.Fd 
+.Fd
 .Ft int
 .Fo lwres_getaddrinfo
 .Fa "const char *hostname"
@@ -88,14 +88,14 @@ The caller can supply the following structure elements in
 the protocol family that should be used.
 When
 .Li ai_family
-is set to 
+is set to
 .Dv PF_UNSPEC ,
 it means the caller will accept any protocol family supported by the
 operating system.
 .It Dv ai_socktype
 denotes the type of socket -
 .Dv SOCK_STREAM ,
-.Dv SOCK_DGRAM 
+.Dv SOCK_DGRAM
 or
 .Dv SOCK_RAW
 - that is wanted.
@@ -139,9 +139,9 @@ does not set the
 .Dv AI_PASSIVE
 bit, the returned socket address structure will be ready
 for use in a call to
-.Xr connect 2 
+.Xr connect 2
 for a connection-oriented protocol or
-.Xr connect 2 , 
+.Xr connect 2 ,
 .Xr sendto 2 ,
 or
 .Xr sendmsg 2
@@ -153,7 +153,7 @@ is a
 .Dv NULL
 pointer and
 .Dv AI_PASSIVE
-is not set in 
+is not set in
 .Li ai_flags .
 .Pp
 If
@@ -161,7 +161,7 @@ If
 is set to
 .Dv AI_NUMERICHOST
 it indicates that
-the 
+the
 .Dv non-NuLL
 .Fa hostname
 should be treated as a numeric string defining an IPv4 or IPv6 address.
@@ -177,7 +177,7 @@ passed via
 .Fa arg
 must be zero.
 .Pp
-If 
+If
 .Fa arg
 is not supplied, a
 .Dv NULL
@@ -200,7 +200,7 @@ the
 .Li ai_next
 pointer, until a
 .Dv NULL
-pointer is encountered. 
+pointer is encountered.
 The three members
 .Li ai_family ,
 ai_socktype,
@@ -237,7 +237,7 @@ is a pointer to a
 returns zero on success or one of the error codes listed in
 .Xr gai_strerror 3
 if an error occurs.
-If both 
+If both
 .Fa hostname
 and
 .Fa servname
@@ -253,8 +253,8 @@ returns
 .Xr RFC2133 ,
 .Xr getservbyname 3 ,
 .Xr bind 2
-.Xr connect 2 
-.Xr connect 2 , 
+.Xr connect 2
+.Xr connect 2 ,
 .Xr sendto 2 ,
 .Xr sendmsg 2 ,
 .Xr socket 2 .
diff --git a/doc/man/lwres/lwres_getaddrsbyname.3 b/doc/man/lwres/lwres_getaddrsbyname.3
index d248687954..6e6a88f83d 100644
--- a/doc/man/lwres/lwres_getaddrsbyname.3
+++ b/doc/man/lwres/lwres_getaddrsbyname.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_getaddrsbyname.3,v 1.2 2000/07/27 09:44:52 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_getaddrsbyname.3,v 1.3 2000/08/01 01:21:15 tale Exp $
+.\"
 .so lwres_resutil.3
diff --git a/doc/man/lwres/lwres_gethostbyaddr.3 b/doc/man/lwres/lwres_gethostbyaddr.3
index f5c9ae936c..721d18e157 100644
--- a/doc/man/lwres/lwres_gethostbyaddr.3
+++ b/doc/man/lwres/lwres_gethostbyaddr.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gethostbyaddr.3,v 1.2 2000/07/27 09:44:53 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gethostbyaddr.3,v 1.3 2000/08/01 01:21:16 tale Exp $
+.\"
 .so lwres_gethostent.3
diff --git a/doc/man/lwres/lwres_gethostbyaddr_r.3 b/doc/man/lwres/lwres_gethostbyaddr_r.3
index 93a93f7504..1d36c82e8b 100644
--- a/doc/man/lwres/lwres_gethostbyaddr_r.3
+++ b/doc/man/lwres/lwres_gethostbyaddr_r.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gethostbyaddr_r.3,v 1.2 2000/07/27 09:44:54 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gethostbyaddr_r.3,v 1.3 2000/08/01 01:21:17 tale Exp $
+.\"
 .so lwres_gethostent.3
diff --git a/doc/man/lwres/lwres_gethostbyname.3 b/doc/man/lwres/lwres_gethostbyname.3
index 8b457e3fd0..f8e60eddae 100644
--- a/doc/man/lwres/lwres_gethostbyname.3
+++ b/doc/man/lwres/lwres_gethostbyname.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gethostbyname.3,v 1.2 2000/07/27 09:44:55 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gethostbyname.3,v 1.3 2000/08/01 01:21:18 tale Exp $
+.\"
 .so lwres_gethostent.3
diff --git a/doc/man/lwres/lwres_gethostbyname2.3 b/doc/man/lwres/lwres_gethostbyname2.3
index c198c01f95..9c8c7b5be8 100644
--- a/doc/man/lwres/lwres_gethostbyname2.3
+++ b/doc/man/lwres/lwres_gethostbyname2.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gethostbyname2.3,v 1.2 2000/07/27 09:44:56 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gethostbyname2.3,v 1.3 2000/08/01 01:21:19 tale Exp $
+.\"
 .so lwres_gethostent.3
diff --git a/doc/man/lwres/lwres_gethostbyname_r.3 b/doc/man/lwres/lwres_gethostbyname_r.3
index beeb795a94..6433a236e0 100644
--- a/doc/man/lwres/lwres_gethostbyname_r.3
+++ b/doc/man/lwres/lwres_gethostbyname_r.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gethostbyname_r.3,v 1.2 2000/07/27 09:44:57 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gethostbyname_r.3,v 1.3 2000/08/01 01:21:20 tale Exp $
+.\"
 .so lwres_gethostent.3
diff --git a/doc/man/lwres/lwres_gethostent.3 b/doc/man/lwres/lwres_gethostent.3
index 288296bf96..c997d6f2e6 100644
--- a/doc/man/lwres/lwres_gethostent.3
+++ b/doc/man/lwres/lwres_gethostent.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: lwres_gethostent.3,v 1.2 2000/07/27 09:44:58 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gethostent.3,v 1.3 2000/08/01 01:21:21 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt LWRES_GETHOSTENT 3
 .Os BIND9 9
@@ -34,7 +34,7 @@
 .Nd lightweight resolver get network host entry
 .Sh SYNOPSIS
 .Fd #include 
-.Fd 
+.Fd
 .Ft struct hostent *
 .Fo lwres_gethostbyname
 .Fa "const char *name"
@@ -100,7 +100,7 @@ These functions define the interface to the lightweight resolver
 daemon \fPNOT IF IT IS GOING AWAY\fP
 for looking up hostnames and addresses. They are similar to the
 standard
-.Xr gethostent 3 
+.Xr gethostent 3
 functions provided by as part of the standard system software.
 They use a
 .Dv "struct hostent"
@@ -125,7 +125,7 @@ The official (canonical) name of the host.
 A NULL-terminated array of alternate names (nicknames) for the host.
 .It Li h_addrtype
 The type of address being returned -
-.Dv PF_INET 
+.Dv PF_INET
 or
 .Dv PF_INET6 .
 .It Li h_length
@@ -137,7 +137,7 @@ terminated array of network addresses for the host.
 Host addresses are returned in network byte order.
 .El
 .Pp
-For backward compatibility with very old software, 
+For backward compatibility with very old software,
 .Li h_addr
 is the first address in
 .Li h_addr_list.
@@ -168,10 +168,10 @@ always looks for an IPv4 address while
 .Fn lwres_gethostbyname2
 looks for an address of protocol family
 .Fa af :
-either 
+either
 .Dv PF_INET
 or
-.Dv PF_INET6 
+.Dv PF_INET6
 - IPv4 or IPV6 addresses respectively.
 Both functions call
 .Fn lwres_getipnodebyname
@@ -206,15 +206,15 @@ It also calls
 .Fn lwres_getipnodebyname
 to lookup the hostname
 .Fa name .
-If 
+If
 .Fn lwres_getipnodebyname
 encounters an error, the error code is returned in
-.Fa *error . 
+.Fa *error .
 .Fa resbuf
 is a pointer to a
 .Dv "struct hostent"
 which is initialised by a successful call to
-.Fn lwres_gethostbyname_r . 
+.Fn lwres_gethostbyname_r .
 .Fa buf
 is a buffer of length
 .Fa len
@@ -259,7 +259,7 @@ The other function parameters are identical to those in
 is a pointer to a
 .Dv "struct hostent"
 which is initialised by a successful call to
-.Fn lwres_gethostbyaddr_r . 
+.Fn lwres_gethostbyaddr_r .
 .Fa buf
 is a buffer of length
 .Fa len
@@ -281,11 +281,11 @@ which is a pointer to the
 it created.
 .Sh RETURN VALUES
 .Pp
-The functions 
+The functions
 .Fn lwres_gethostbyname ,
 .Fn lwres_gethostbyname2 ,
 .Fn lwres_gethostbyaddr ,
-and 
+and
 .Fn lwres_gethostent
 are not thread-safe because they free any memory that had been allocated
 in a previous call to those functions before they perform a lookup.
@@ -348,7 +348,7 @@ and
 .Li h_addr_list
 elements of the
 .Dv "struct hostent" .
-If 
+If
 .Fa buf
 was too small, both
 .Fn lwres_gethostbyname_r
@@ -366,7 +366,7 @@ to
 Although
 .Fn lwres_gethostbyname ,
 .Fn lwres_gethostbyname2 ,
-.Fn lwres_gethostbyaddr 
+.Fn lwres_gethostbyaddr
 and
 .Fn lwres_endhostent
 call thread-safe functions to perform lookups, these 3 functions
@@ -386,7 +386,7 @@ calls to those routines.
 Thread-safe versions for name and address lookup are provided by
 .Fn lwres_gethostbyname_r ,
 and
-.Fn lwres_gethostbyaddr_r 
+.Fn lwres_gethostbyaddr_r
 respectively.
 .Pp
 Although the above functions can be considered as drop-in replacements
@@ -400,6 +400,6 @@ or in
 .Dv NIS/YP
 or
 .Dv NIS+
-maps which could be supported by the operating system's 
+maps which could be supported by the operating system's
 .Xr gethostent 3
 functions.
diff --git a/doc/man/lwres/lwres_gethostent_r.3 b/doc/man/lwres/lwres_gethostent_r.3
index f9f4719dab..76a45bbc57 100644
--- a/doc/man/lwres/lwres_gethostent_r.3
+++ b/doc/man/lwres/lwres_gethostent_r.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gethostent_r.3,v 1.2 2000/07/27 09:44:59 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gethostent_r.3,v 1.3 2000/08/01 01:21:23 tale Exp $
+.\"
 .so lwres_gethostent.3
diff --git a/doc/man/lwres/lwres_getipnode.3 b/doc/man/lwres/lwres_getipnode.3
index be7b2fdf46..ff4b80c902 100644
--- a/doc/man/lwres/lwres_getipnode.3
+++ b/doc/man/lwres/lwres_getipnode.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: lwres_getipnode.3,v 1.2 2000/07/27 09:45:00 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_getipnode.3,v 1.3 2000/08/01 01:21:24 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt LWRES_GETIPNODE 3
 .Os BIND9 9
@@ -26,7 +26,7 @@
 .Nd lookup functions for the lightweight resolver
 .Sh SYNOPSIS
 .Fd #include 
-.Fd 
+.Fd
 .Ft struct hostent *
 .Fo lwres_getipnodebyname
 .Fa "const char *name"
@@ -69,7 +69,7 @@ The official (canonical) name of the host.
 A NULL-terminated array of alternate names (nicknames) for the host.
 .It Li h_addrtype
 The type of address being returned -
-.Dv PF_INET 
+.Dv PF_INET
 or
 .Dv PF_INET6 .
 .It Li h_length
@@ -81,7 +81,7 @@ terminated array of network addresses for the host.
 Host addresses are returned in network byte order.
 .El
 .Pp
-For backward compatibility with very old software, 
+For backward compatibility with very old software,
 .Li h_addr
 is the first address in
 .Li h_addr_list.
@@ -170,7 +170,7 @@ gets discarded.
 .Pp
 .Fn lwres_freehostent
 releases all the memory associated with
-the 
+the
 .Dv "struct hostent"
 pointer
 .Fa he .
diff --git a/doc/man/lwres/lwres_getipnodebyaddr.3 b/doc/man/lwres/lwres_getipnodebyaddr.3
index 9edc2ca4b1..9dd965c37d 100644
--- a/doc/man/lwres/lwres_getipnodebyaddr.3
+++ b/doc/man/lwres/lwres_getipnodebyaddr.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_getipnodebyaddr.3,v 1.2 2000/07/27 09:45:02 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_getipnodebyaddr.3,v 1.3 2000/08/01 01:21:25 tale Exp $
+.\"
 .so lwres_getipnode.3
diff --git a/doc/man/lwres/lwres_getipnodebyname.3 b/doc/man/lwres/lwres_getipnodebyname.3
index c044391730..52a9749e65 100644
--- a/doc/man/lwres/lwres_getipnodebyname.3
+++ b/doc/man/lwres/lwres_getipnodebyname.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_getipnodebyname.3,v 1.2 2000/07/27 09:45:03 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_getipnodebyname.3,v 1.3 2000/08/01 01:21:26 tale Exp $
+.\"
 .so lwres_getipnode.3
diff --git a/doc/man/lwres/lwres_getnamebyaddr.3 b/doc/man/lwres/lwres_getnamebyaddr.3
index 53ba12ece6..efea2d0042 100644
--- a/doc/man/lwres/lwres_getnamebyaddr.3
+++ b/doc/man/lwres/lwres_getnamebyaddr.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_getnamebyaddr.3,v 1.2 2000/07/27 09:45:04 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_getnamebyaddr.3,v 1.3 2000/08/01 01:21:27 tale Exp $
+.\"
 .so lwres_resutil.3
diff --git a/doc/man/lwres/lwres_getnameinfo.3 b/doc/man/lwres/lwres_getnameinfo.3
index 4d8dde7bf7..c7e8986735 100644
--- a/doc/man/lwres/lwres_getnameinfo.3
+++ b/doc/man/lwres/lwres_getnameinfo.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: lwres_getnameinfo.3,v 1.3 2000/07/27 09:45:05 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_getnameinfo.3,v 1.4 2000/08/01 01:21:28 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt LWRES_GETNAMEINFO 3
 .Os BIND9 9
@@ -24,7 +24,7 @@
 .Nd lightweight resolver socket address structure to hostname and service name
 .Sh SYNOPSIS
 .Fd #include 
-.Fd 
+.Fd
 .Ft int
 .Fo lwres_getnameinfo
 .Fa "const struct sockaddr *sa"
@@ -109,7 +109,7 @@ is called immediately before
 .Fn lwres_getnameinfo
 returns so that the created resolver context gets discarded.
 .Sh RETURN VALUES
-.Fn lwres_getnameinfo 
+.Fn lwres_getnameinfo
 returns 0 on success or a non-zero error code if an error occurs.
 .\"
 .\"	The error codes below were invented by the ISC/Nominum. They
diff --git a/doc/man/lwres/lwres_gnba.3 b/doc/man/lwres/lwres_gnba.3
index dc92cf5d56..d25661261b 100644
--- a/doc/man/lwres/lwres_gnba.3
+++ b/doc/man/lwres/lwres_gnba.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: lwres_gnba.3,v 1.2 2000/07/27 09:45:06 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gnba.3,v 1.3 2000/08/01 01:21:29 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt LWRES_GNBA 3
 .Os BIND9 9
@@ -29,7 +29,7 @@
 .Nd lightweight resolver getnamebyaddress functions
 .Sh SYNOPSIS
 .Fd #include 
-.Fd 
+.Fd
 .Ft lwres_result_t
 .Fo lwres_gnbarequest_render
 .Fa "lwres_context_t *ctx"
@@ -133,7 +133,7 @@ uses context
 .Fa ctx
 to convert the contents of packet
 .Fa pkt
-to a 
+to a
 .Dv lwres_gnbarequest_t
 structure.
 Buffer
@@ -180,7 +180,7 @@ if memory allocation fails.
 is returned if the available space in the buffer
 .Fa b
 is too small to accommodate the packet header or the
-.Dv lwres_gnbarequest_t 
+.Dv lwres_gnbarequest_t
 and
 .Dv lwres_gnbaresponse_t
 structures.
@@ -198,4 +198,4 @@ in the packet header structure
 .Dv lwres_lwpacket_t
 indicate that the packet is not a response to an earlier query.
 .Sh SEE ALSO
-.Xr lwres_packet 3 
+.Xr lwres_packet 3
diff --git a/doc/man/lwres/lwres_gnbarequest_free.3 b/doc/man/lwres/lwres_gnbarequest_free.3
index 5212f560d4..6557e2e039 100644
--- a/doc/man/lwres/lwres_gnbarequest_free.3
+++ b/doc/man/lwres/lwres_gnbarequest_free.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gnbarequest_free.3,v 1.2 2000/07/27 09:45:08 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gnbarequest_free.3,v 1.3 2000/08/01 01:21:30 tale Exp $
+.\"
 .so lwres_gnba.3
diff --git a/doc/man/lwres/lwres_gnbarequest_parse.3 b/doc/man/lwres/lwres_gnbarequest_parse.3
index 1c3bf275f0..288581aa70 100644
--- a/doc/man/lwres/lwres_gnbarequest_parse.3
+++ b/doc/man/lwres/lwres_gnbarequest_parse.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gnbarequest_parse.3,v 1.2 2000/07/27 09:45:09 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gnbarequest_parse.3,v 1.3 2000/08/01 01:21:31 tale Exp $
+.\"
 .so lwres_gnba.3
diff --git a/doc/man/lwres/lwres_gnbarequest_render.3 b/doc/man/lwres/lwres_gnbarequest_render.3
index 980a8dea1a..fbfed7f156 100644
--- a/doc/man/lwres/lwres_gnbarequest_render.3
+++ b/doc/man/lwres/lwres_gnbarequest_render.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gnbarequest_render.3,v 1.2 2000/07/27 09:45:10 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gnbarequest_render.3,v 1.3 2000/08/01 01:21:33 tale Exp $
+.\"
 .so lwres_gnba.3
diff --git a/doc/man/lwres/lwres_gnbaresponse_free.3 b/doc/man/lwres/lwres_gnbaresponse_free.3
index e5d76319b2..682aa01c71 100644
--- a/doc/man/lwres/lwres_gnbaresponse_free.3
+++ b/doc/man/lwres/lwres_gnbaresponse_free.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gnbaresponse_free.3,v 1.2 2000/07/27 09:45:11 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gnbaresponse_free.3,v 1.3 2000/08/01 01:21:34 tale Exp $
+.\"
 .so lwres_gnba.3
diff --git a/doc/man/lwres/lwres_gnbaresponse_parse.3 b/doc/man/lwres/lwres_gnbaresponse_parse.3
index bd18d82a90..f713f0d4dd 100644
--- a/doc/man/lwres/lwres_gnbaresponse_parse.3
+++ b/doc/man/lwres/lwres_gnbaresponse_parse.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gnbaresponse_parse.3,v 1.2 2000/07/27 09:45:13 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gnbaresponse_parse.3,v 1.3 2000/08/01 01:21:35 tale Exp $
+.\"
 .so lwres_gnba.3
diff --git a/doc/man/lwres/lwres_gnbaresponse_render.3 b/doc/man/lwres/lwres_gnbaresponse_render.3
index 0befce742f..133808779e 100644
--- a/doc/man/lwres/lwres_gnbaresponse_render.3
+++ b/doc/man/lwres/lwres_gnbaresponse_render.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gnbaresponse_render.3,v 1.2 2000/07/27 09:45:14 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gnbaresponse_render.3,v 1.3 2000/08/01 01:21:36 tale Exp $
+.\"
 .so lwres_gnba.3
diff --git a/doc/man/lwres/lwres_herror.3 b/doc/man/lwres/lwres_herror.3
index 2c6ff76502..644c5e6f4b 100644
--- a/doc/man/lwres/lwres_herror.3
+++ b/doc/man/lwres/lwres_herror.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_herror.3,v 1.2 2000/07/27 09:45:15 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_herror.3,v 1.3 2000/08/01 01:21:37 tale Exp $
+.\"
 .so lwres_hstrerror.3
diff --git a/doc/man/lwres/lwres_hstrerror.3 b/doc/man/lwres/lwres_hstrerror.3
index 9833b8caee..8e922c8442 100644
--- a/doc/man/lwres/lwres_hstrerror.3
+++ b/doc/man/lwres/lwres_hstrerror.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: lwres_hstrerror.3,v 1.2 2000/07/27 09:45:16 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_hstrerror.3,v 1.3 2000/08/01 01:21:38 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt LWRES_ERROR 3
 .Os BIND9 9
@@ -25,7 +25,7 @@
 .Nd lightweight resolver error message generation
 .Sh SYNOPSIS
 .Fd #include 
-.Fd 
+.Fd
 .Ft void
 .Fo lwres_herror
 .Fa "const char *s"
@@ -63,7 +63,7 @@ The values of the error codes and messages are as follows:
 .Sh RETURN VALUES
 The string \*qUnknown resolver error\*q is returned by
 .Fn lwres_hstrerror
-when the value of 
+when the value of
 .Li lwres_h_errno
 is not a valid error code.
 .Sh SEE ALSO
diff --git a/doc/man/lwres/lwres_inetaton.3 b/doc/man/lwres/lwres_inetaton.3
index 268548a6dc..75658a149a 100644
--- a/doc/man/lwres/lwres_inetaton.3
+++ b/doc/man/lwres/lwres_inetaton.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: lwres_inetaton.3,v 1.2 2000/07/27 09:45:18 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_inetaton.3,v 1.3 2000/08/01 01:21:39 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt LWRES_INETATON 3
 .Os BIND9 9
@@ -25,7 +25,7 @@
 .Sh SYNOPSIS
 .Fd #include 
 .Fd #include 
-.Fd 
+.Fd
 .Ft int
 .Fo lwres_net_aton
 .Fa "const char *cp"
@@ -65,8 +65,8 @@ a leading 0x or 0X implies hex; a decimal number is assumed otherwise.
 .Pp
 If a one-part address is given, its value is placed in the network
 address without any byte rearrangement.
-When a two-part address - 
-.Li a.b - 
+When a two-part address -
+.Li a.b -
 is supplied, the last part is considered a 24-bit quantity and placed
 in the bottom 3 bytes of
 .Li addr->s_addr .
diff --git a/doc/man/lwres/lwres_inetntop.3 b/doc/man/lwres/lwres_inetntop.3
index b245ce50be..c69fdfc75d 100644
--- a/doc/man/lwres/lwres_inetntop.3
+++ b/doc/man/lwres/lwres_inetntop.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: lwres_inetntop.3,v 1.2 2000/07/27 09:45:19 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_inetntop.3,v 1.3 2000/08/01 01:21:41 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt LWRES_INETNTOP 3
 .Os BIND9 9
@@ -24,7 +24,7 @@
 .Nd lightweight resolver IP address presentation
 .Sh SYNOPSIS
 .Fd #include 
-.Fd 
+.Fd
 .Ft const char *
 .Fo lwres_net_ntop
 .Fa "int af"
@@ -35,7 +35,7 @@
 .Sh DESCRIPTION
 .Fn lwres_net_ntop
 converts an IP address of protocol family
-.Fa af 
+.Fa af
 - IPv4 or IPv6 - at location
 .Fa src
 from network format to its conventional representation as a string.
diff --git a/doc/man/lwres/lwres_inetpton.3 b/doc/man/lwres/lwres_inetpton.3
index b5fd8b586e..d24625a1ef 100644
--- a/doc/man/lwres/lwres_inetpton.3
+++ b/doc/man/lwres/lwres_inetpton.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: lwres_inetpton.3,v 1.2 2000/07/27 09:45:20 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_inetpton.3,v 1.3 2000/08/01 01:21:42 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt LWRES_INETPTON 3
 .Os BIND9 9
@@ -24,7 +24,7 @@
 .Nd lightweight resolver IP address conversion
 .Sh SYNOPSIS
 .Fd #include 
-.Fd 
+.Fd
 .Ft int
 .Fo lwres_net_pton
 .Fa "int af"
@@ -37,7 +37,7 @@ converts the presentation format of an IP address
 .Fa src
 to its representation in network format.
 .Fa af
-indicates the protocol family for the address 
+indicates the protocol family for the address
 .Dv PF_INET
 or
 .Dv PF_INET6
diff --git a/doc/man/lwres/lwres_lwpacket_parseheader.3 b/doc/man/lwres/lwres_lwpacket_parseheader.3
index 45daafec99..ebaada062e 100644
--- a/doc/man/lwres/lwres_lwpacket_parseheader.3
+++ b/doc/man/lwres/lwres_lwpacket_parseheader.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_lwpacket_parseheader.3,v 1.2 2000/07/27 09:45:22 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_lwpacket_parseheader.3,v 1.3 2000/08/01 01:21:43 tale Exp $
+.\"
 .so lwres_packet.3
diff --git a/doc/man/lwres/lwres_lwpacket_renderheader.3 b/doc/man/lwres/lwres_lwpacket_renderheader.3
index 735268ac8b..b439d1f6c2 100644
--- a/doc/man/lwres/lwres_lwpacket_renderheader.3
+++ b/doc/man/lwres/lwres_lwpacket_renderheader.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_lwpacket_renderheader.3,v 1.2 2000/07/27 09:45:23 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_lwpacket_renderheader.3,v 1.3 2000/08/01 01:21:44 tale Exp $
+.\"
 .so lwres_packet.3
diff --git a/doc/man/lwres/lwres_net_aton.3 b/doc/man/lwres/lwres_net_aton.3
index 6173183e0f..c6c40ad45e 100644
--- a/doc/man/lwres/lwres_net_aton.3
+++ b/doc/man/lwres/lwres_net_aton.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_net_aton.3,v 1.2 2000/07/27 09:45:24 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_net_aton.3,v 1.3 2000/08/01 01:21:45 tale Exp $
+.\"
 .so lwres_inetaton.3
diff --git a/doc/man/lwres/lwres_net_ntop.3 b/doc/man/lwres/lwres_net_ntop.3
index ee38d8378f..8e14b35a25 100644
--- a/doc/man/lwres/lwres_net_ntop.3
+++ b/doc/man/lwres/lwres_net_ntop.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_net_ntop.3,v 1.2 2000/07/27 09:45:25 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_net_ntop.3,v 1.3 2000/08/01 01:21:46 tale Exp $
+.\"
 .so lwres_inetntop.3
diff --git a/doc/man/lwres/lwres_net_pton.3 b/doc/man/lwres/lwres_net_pton.3
index 40c988a2e6..8d97eb974e 100644
--- a/doc/man/lwres/lwres_net_pton.3
+++ b/doc/man/lwres/lwres_net_pton.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_net_pton.3,v 1.2 2000/07/27 09:45:26 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_net_pton.3,v 1.3 2000/08/01 01:21:47 tale Exp $
+.\"
 .so lwres_inetpton.3
diff --git a/doc/man/lwres/lwres_noop.3 b/doc/man/lwres/lwres_noop.3
index 4272c9fb79..3846f41bd1 100644
--- a/doc/man/lwres/lwres_noop.3
+++ b/doc/man/lwres/lwres_noop.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: lwres_noop.3,v 1.2 2000/07/27 09:45:28 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_noop.3,v 1.3 2000/08/01 01:21:48 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt LWRES_NOOP 3
 .Os BIND9 9
@@ -29,7 +29,7 @@
 .Nd lightweight resolver no-op functions
 .Sh SYNOPSIS
 .Fd #include 
-.Fd 
+.Fd
 .Ft lwres_result_t
 .Fo lwres_nooprequest_render
 .Fa "lwres_context_t *ctx"
@@ -132,7 +132,7 @@ uses context
 .Fa ctx
 to convert the contents of packet
 .Fa pkt
-to a 
+to a
 .Dv lwres_nooprequest_t
 structure.
 Buffer
@@ -177,7 +177,7 @@ if memory allocation fails.
 is returned if the available space in the buffer
 .Fa b
 is too small to accommodate the packet header or the
-.Dv lwres_nooprequest_t 
+.Dv lwres_nooprequest_t
 and
 .Dv lwres_noopresponse_t
 structures.
@@ -195,4 +195,4 @@ in the packet header structure
 .Dv lwres_lwpacket_t
 indicate that the packet is not a response to an earlier query.
 .Sh SEE ALSO
-.Xr lwres_packet 3 
+.Xr lwres_packet 3
diff --git a/doc/man/lwres/lwres_nooprequest_free.3 b/doc/man/lwres/lwres_nooprequest_free.3
index e7e8ab38fc..5750ec73d1 100644
--- a/doc/man/lwres/lwres_nooprequest_free.3
+++ b/doc/man/lwres/lwres_nooprequest_free.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_nooprequest_free.3,v 1.2 2000/07/27 09:45:29 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_nooprequest_free.3,v 1.3 2000/08/01 01:21:50 tale Exp $
+.\"
 .so lwres_noop.3
diff --git a/doc/man/lwres/lwres_nooprequest_parse.3 b/doc/man/lwres/lwres_nooprequest_parse.3
index 2759d8afe7..2cd32707c9 100644
--- a/doc/man/lwres/lwres_nooprequest_parse.3
+++ b/doc/man/lwres/lwres_nooprequest_parse.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_nooprequest_parse.3,v 1.2 2000/07/27 09:45:31 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_nooprequest_parse.3,v 1.3 2000/08/01 01:21:51 tale Exp $
+.\"
 .so lwres_noop.3
diff --git a/doc/man/lwres/lwres_nooprequest_render.3 b/doc/man/lwres/lwres_nooprequest_render.3
index 3c4dc593b3..57ea067f09 100644
--- a/doc/man/lwres/lwres_nooprequest_render.3
+++ b/doc/man/lwres/lwres_nooprequest_render.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_nooprequest_render.3,v 1.2 2000/07/27 09:45:32 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_nooprequest_render.3,v 1.3 2000/08/01 01:21:52 tale Exp $
+.\"
 .so lwres_noop.3
diff --git a/doc/man/lwres/lwres_noopresponse_free.3 b/doc/man/lwres/lwres_noopresponse_free.3
index 7cb18fb200..201c9702af 100644
--- a/doc/man/lwres/lwres_noopresponse_free.3
+++ b/doc/man/lwres/lwres_noopresponse_free.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_noopresponse_free.3,v 1.2 2000/07/27 09:45:33 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_noopresponse_free.3,v 1.3 2000/08/01 01:21:53 tale Exp $
+.\"
 .so lwres_noop.3
diff --git a/doc/man/lwres/lwres_noopresponse_parse.3 b/doc/man/lwres/lwres_noopresponse_parse.3
index 12fc979723..5f6c437150 100644
--- a/doc/man/lwres/lwres_noopresponse_parse.3
+++ b/doc/man/lwres/lwres_noopresponse_parse.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_noopresponse_parse.3,v 1.2 2000/07/27 09:45:34 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_noopresponse_parse.3,v 1.3 2000/08/01 01:21:54 tale Exp $
+.\"
 .so lwres_noop.3
diff --git a/doc/man/lwres/lwres_noopresponse_render.3 b/doc/man/lwres/lwres_noopresponse_render.3
index 4b7545eb9f..b5e25864a0 100644
--- a/doc/man/lwres/lwres_noopresponse_render.3
+++ b/doc/man/lwres/lwres_noopresponse_render.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_noopresponse_render.3,v 1.2 2000/07/27 09:45:35 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_noopresponse_render.3,v 1.3 2000/08/01 01:21:55 tale Exp $
+.\"
 .so lwres_noop.3
diff --git a/doc/man/lwres/lwres_packet.3 b/doc/man/lwres/lwres_packet.3
index 18c3a3dda2..ddab3c6590 100644
--- a/doc/man/lwres/lwres_packet.3
+++ b/doc/man/lwres/lwres_packet.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: lwres_packet.3,v 1.2 2000/07/27 09:45:38 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_packet.3,v 1.3 2000/08/01 01:21:56 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt LWRES_PACKET 3
 .Os BIND9 9
@@ -27,7 +27,7 @@
 .Fd #include 
 .Fd #include 
 .Fd #include 
-.Fd 
+.Fd
 .Ft lwres_result_t
 .Fo lwres_lwpacket_renderheader
 .Fa "lwres_buffer_t *b"
@@ -72,7 +72,7 @@ is a request or a reply. Flag values can be set, but not defined by
 the caller.
 .It Li serial
 is set by the requestor and is returned in all replies. If two or more
-packets from the same source have the same serial number and are from 
+packets from the same source have the same serial number and are from
 the same source, they are assumed to be duplicates and the latter ones
 may be dropped.
 .It Li opcode
@@ -82,7 +82,7 @@ reserved for use by the lightweight resolver library. Opcodes between
 0x04000000 and 0xffffffff are application defined.
 .It Li result
 is only valid for replies.
-Results between 0x04000000 and 0xffffffff are application defined. 
+Results between 0x04000000 and 0xffffffff are application defined.
 Results between 0x00000000 and 0x03ffffff are reserved for library use.
 .It Li recvlength
 is the maximum buffer size that the receiver can handle on requests
@@ -140,6 +140,6 @@ return
 If there is insufficient space to copy data between the buffer
 .Fa *b
 and lightweight resolver packet
-.Fa *pkt 
+.Fa *pkt
 both functions return
 .Er LWRES_R_UNEXPECTEDEND .
diff --git a/doc/man/lwres/lwres_resutil.3 b/doc/man/lwres/lwres_resutil.3
index 3fb330dfb9..94f1262fbd 100644
--- a/doc/man/lwres/lwres_resutil.3
+++ b/doc/man/lwres/lwres_resutil.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: lwres_resutil.3,v 1.2 2000/07/27 09:45:39 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_resutil.3,v 1.3 2000/08/01 01:21:57 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt LWRES_RESUTIL 3
 .Os BIND9 9
@@ -27,7 +27,7 @@
 .Nd lightweight resolver utility functions
 .Sh SYNOPSIS
 .Fd #include 
-.Fd 
+.Fd
 .Ft lwres_result_t
 .Fo lwres_string_parse
 .Fa "lwres_buffer_t *b"
@@ -68,7 +68,7 @@ and the length of that string is given by
 .Fa *len .
 The buffer's current pointer is advanced to point at the character
 following the string length, the encoded string, and the trailing
-.Dv NULL 
+.Dv NULL
 character.
 .Fn lwres_string_parse
 has an assertion check that
@@ -117,7 +117,7 @@ typedef struct {
 .Ed
 The contents of this structure are not manipulated directly but
 they are controlled through the
-.Xr lwres_gabn 3 
+.Xr lwres_gabn 3
 functions.
 .Pp
 The lightweight resolver uses
@@ -139,7 +139,7 @@ Results of the lookup are returned in
 .Fa *structp .
 .Fn lwres_getaddrsbyname
 checks that its pointer arguments are not
-.Dv NULL 
+.Dv NULL
 and that
 .Fa addrtypes
 is non-zero.
@@ -165,8 +165,8 @@ Like
 .Fn lwres_getaddrsbyname ,
 .Fn lwres_getnamebyaddr
 uses assertion checking to ensure its pointer arguments are not
-.Dv NULL 
-and 
+.Dv NULL
+and
 .Fa addrtype
 is not zero.
 .Fn lwres_getaddrsbyname
diff --git a/doc/man/lwres/lwres_sethostent.3 b/doc/man/lwres/lwres_sethostent.3
index 69f0ee5a08..08f1beebd6 100644
--- a/doc/man/lwres/lwres_sethostent.3
+++ b/doc/man/lwres/lwres_sethostent.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_sethostent.3,v 1.2 2000/07/27 09:45:40 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_sethostent.3,v 1.3 2000/08/01 01:21:58 tale Exp $
+.\"
 .so lwres_gethostent.3
diff --git a/doc/man/lwres/lwres_sethostent_r.3 b/doc/man/lwres/lwres_sethostent_r.3
index 1dc1f12662..b728e84626 100644
--- a/doc/man/lwres/lwres_sethostent_r.3
+++ b/doc/man/lwres/lwres_sethostent_r.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_sethostent_r.3,v 1.2 2000/07/27 09:45:41 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_sethostent_r.3,v 1.3 2000/08/01 01:21:59 tale Exp $
+.\"
 .so lwres_gethostent.3
diff --git a/doc/man/lwres/lwres_string_parse.3 b/doc/man/lwres/lwres_string_parse.3
index da30657d05..57e97edb63 100644
--- a/doc/man/lwres/lwres_string_parse.3
+++ b/doc/man/lwres/lwres_string_parse.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_string_parse.3,v 1.2 2000/07/27 09:45:43 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_string_parse.3,v 1.3 2000/08/01 01:22:01 tale Exp $
+.\"
 .so lwres_resutil.3
diff --git a/doc/misc/options b/doc/misc/options
index dfe3b8a633..9b762fcb58 100644
--- a/doc/misc/options
+++ b/doc/misc/options
@@ -1,7 +1,7 @@
 Copyright (C) 2000  Internet Software Consortium.
 See COPYRIGHT in the source root or http://www.isc.org/copyright for terms.
 
-$Id: options,v 1.31 2000/07/12 15:55:10 gson Exp $
+$Id: options,v 1.32 2000/08/01 01:22:02 tale Exp $
 
 This is a summary of the implementation status of the various named.conf
 options in BIND 9.
@@ -12,7 +12,7 @@ Legend:
 
   No	    Not implemented, may be implemented in a later release.
 
-  Obsolete  Obsolete, not applicable to BIND 9, or just evil.  
+  Obsolete  Obsolete, not applicable to BIND 9, or just evil.
 	    Will not be implemented.
 
   *	    New in BIND 9.
@@ -24,9 +24,9 @@ Legend:
   %	    The default value has changed since BIND 8.
 
   @	    Semantics of certain pathological address match lists, in
-	    particular those involving double negation, have changed.  
+	    particular those involving double negation, have changed.
 	    The new semantics are generally safer.  IPv6 addresses
-	    are supported, but the predefined ACLs "localhost" and 
+	    are supported, but the predefined ACLs "localhost" and
 	    "localnets" match IPv4 addresses only.
 
   #	    BIND 9 accepts both LF and CRLF as end-of-line markers.
@@ -128,7 +128,7 @@ server ip_addr {
 
 trusted-keys						    Yes
 
-zone "domain_name" [ ( in | hs | hesiod | chaos ) ] { 
+zone "domain_name" [ ( in | hs | hesiod | chaos ) ] {
   type master;						    Yes
   file path_name;					    Yes
   [ forward ( only | first ); ]				    No
@@ -146,11 +146,11 @@ zone "domain_name" [ ( in | hs | hesiod | chaos ) ] {
   [ pubkey number number number string; ]		    No
 };
 
-zone "domain_name" [ ( in | hs | hesiod | chaos ) ] {	    
+zone "domain_name" [ ( in | hs | hesiod | chaos ) ] {
   type stub;						    No
 };
 
-zone "domain_name" [ ( in | hs | hesiod | chaos ) ] {	    
+zone "domain_name" [ ( in | hs | hesiod | chaos ) ] {
   type slave;						    Yes
   [ file path_name; ]					    Yes
   [ ixfr-base  path_name; ]				    Obsolete
@@ -174,11 +174,11 @@ zone "domain_name" [ ( in | hs | hesiod | chaos ) ] {
   [ pubkey number number number string; ]		    No
 };
 
-zone "domain_name" [ ( in | hs | hesiod | chaos ) ] {	    
+zone "domain_name" [ ( in | hs | hesiod | chaos ) ] {
   type forward;						    No
 };
 
-zone "." [ ( in | hs | hesiod | chaos ) ] {		    
+zone "." [ ( in | hs | hesiod | chaos ) ] {
   type hint;						    Yes
   file path_name;					    Yes
   [ check-names ( warn | fail | ignore ); ]		    No
diff --git a/install-sh b/install-sh
index ebc66913e9..058b26c82d 100755
--- a/install-sh
+++ b/install-sh
@@ -115,7 +115,7 @@ fi
 if [ x"$dir_arg" != x ]; then
 	dst=$src
 	src=""
-	
+
 	if [ -d $dst ]; then
 		instcmd=:
 	else
@@ -124,7 +124,7 @@ if [ x"$dir_arg" != x ]; then
 else
 
 # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
+# might cause directories to be created, which would be especially bad
 # if $src (and thus $dsttmp) contains '*'.
 
 	if [ -f $src -o -d $src ]
@@ -134,7 +134,7 @@ else
 		echo "install:  $src does not exist"
 		exit 1
 	fi
-	
+
 	if [ x"$dst" = x ]
 	then
 		echo "install:	no destination specified"
@@ -162,7 +162,7 @@ dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
 
 # Skip lots of stat calls in the usual case.
 if [ ! -d "$dstdir" ]; then
-defaultIFS='	
+defaultIFS='
 '
 IFS="${IFS-${defaultIFS}}"
 
@@ -201,17 +201,17 @@ else
 
 # If we're going to rename the final executable, determine the name now.
 
-	if [ x"$transformarg" = x ] 
+	if [ x"$transformarg" = x ]
 	then
 		dstfile=`basename $dst`
 	else
-		dstfile=`basename $dst $transformbasename | 
+		dstfile=`basename $dst $transformbasename |
 			sed $transformarg`$transformbasename
 	fi
 
 # don't allow the sed command to completely eliminate the filename
 
-	if [ x"$dstfile" = x ] 
+	if [ x"$dstfile" = x ]
 	then
 		dstfile=`basename $dst`
 	else
@@ -242,7 +242,7 @@ else
 # Now rename the file to the real destination.
 
 	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
+	$doit $mvcmd $dsttmp $dstdir/$dstfile
 
 fi &&
 
diff --git a/isc-config.sh.in b/isc-config.sh.in
index 2e1b45f28d..2bee1abdb9 100644
--- a/isc-config.sh.in
+++ b/isc-config.sh.in
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
 # 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
 # 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
@@ -15,7 +15,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: isc-config.sh.in,v 1.5 2000/07/27 09:36:22 tale Exp $
+# $Id: isc-config.sh.in,v 1.6 2000/08/01 01:11:05 tale Exp $
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 2486752295..07c3ec1528 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,9 +1,9 @@
 # Copyright (C) 1998-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
 # 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
@@ -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.10 2000/07/27 09:45:44 tale Exp $
+# $Id: Makefile.in,v 1.11 2000/08/01 01:22:03 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
index a939f54648..052fade1f5 100644
--- a/lib/dns/Makefile.in
+++ b/lib/dns/Makefile.in
@@ -1,9 +1,9 @@
 # Copyright (C) 1998-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
 # 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
@@ -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.95 2000/07/31 19:44:12 bwelling Exp $
+# $Id: Makefile.in,v 1.96 2000/08/01 01:22:05 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/dns/a6.c b/lib/dns/a6.c
index 239f441884..b1907d97bf 100644
--- a/lib/dns/a6.c
+++ b/lib/dns/a6.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: a6.c,v 1.15 2000/07/27 09:45:48 tale Exp $ */
+/* $Id: a6.c,v 1.16 2000/08/01 01:22:06 tale Exp $ */
 
 #include 
 
@@ -55,7 +55,7 @@ foreach(dns_a6context_t *a6ctx, dns_rdataset_t *parent, unsigned int depth,
 	expiration = a6ctx->now + parent->ttl;
 	if (expiration < a6ctx->expiration || a6ctx->expiration == 0)
 		a6ctx->expiration = expiration;
-	
+
 	depth++;
 	result = dns_rdataset_first(parent);
 	while (result == ISC_R_SUCCESS) {
diff --git a/lib/dns/acl.c b/lib/dns/acl.c
index 3242645b8a..5215974a7f 100644
--- a/lib/dns/acl.c
+++ b/lib/dns/acl.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: acl.c,v 1.12 2000/07/27 09:45:49 tale Exp $ */
+/* $Id: acl.c,v 1.13 2000/08/01 01:22:07 tale Exp $ */
 
 #include 
 
@@ -35,7 +35,7 @@ dns_acl_create(isc_mem_t *mctx, int n, dns_acl_t **target) {
 	 */
 	if (n == 0)
 		n = 1;
-	
+
 	acl = isc_mem_get(mctx, sizeof(*acl));
 	if (acl == NULL)
 		return (ISC_R_NOMEMORY);
@@ -45,12 +45,12 @@ dns_acl_create(isc_mem_t *mctx, int n, dns_acl_t **target) {
 	acl->elements = NULL;
 	acl->alloc = 0;
 	acl->length = 0;
-	
+
 	ISC_LINK_INIT(acl, nextincache);
 	/*
 	 * Must set magic early because we use dns_acl_detach() to clean up.
 	 */
-	acl->magic = DNS_ACL_MAGIC; 
+	acl->magic = DNS_ACL_MAGIC;
 
 	acl->elements = isc_mem_get(mctx, n * sizeof(dns_aclelement_t));
 	if (acl->elements == NULL) {
@@ -94,10 +94,10 @@ dns_acl_appendelement(dns_acl_t *acl, dns_aclelement_t *elt) {
 	 * Append the new element.
 	 */
 	acl->elements[acl->length++] = *elt;
-	
+
 	return (ISC_R_SUCCESS);
 }
-		       
+
 static isc_result_t
 dns_acl_anyornone(isc_mem_t *mctx, isc_boolean_t neg, dns_acl_t **target) {
 	isc_result_t result;
@@ -136,25 +136,25 @@ dns_acl_match(isc_netaddr_t *reqaddr,
 
 	REQUIRE(reqaddr != NULL);
 	REQUIRE(matchelt == NULL || *matchelt == NULL);
-	
+
 	for (i = 0; i < acl->length; i++) {
 		dns_aclelement_t *e = &acl->elements[i];
 		dns_acl_t *inner = NULL;
-		
+
 		switch (e->type) {
 		case dns_aclelementtype_ipprefix:
 			if (isc_netaddr_eqprefix(reqaddr,
-						 &e->u.ip_prefix.address, 
+						 &e->u.ip_prefix.address,
 						 e->u.ip_prefix.prefixlen))
 				goto matched;
 			break;
-			
+
 		case dns_aclelementtype_keyname:
 			if (reqsigner != NULL &&
 			    dns_name_equal(reqsigner, &e->u.keyname))
 			    goto matched;
 			break;
-		
+
 		case dns_aclelementtype_nestedacl:
 			inner = e->u.nestedacl;
 		nested:
@@ -167,7 +167,7 @@ dns_acl_match(isc_netaddr_t *reqaddr,
 			/*
 			 * Treat negative matches in indirect ACLs as
 			 * "no match".
-			 * That way, a negated indirect ACL will never become 
+			 * That way, a negated indirect ACL will never become
 			 * a surprise positive match through double negation.
 			 * XXXDCL this should be documented.
 			 */
@@ -196,7 +196,7 @@ dns_acl_match(isc_netaddr_t *reqaddr,
 			} else {
 				break;
 			}
-			
+
 		case dns_aclelementtype_localnets:
 			if (env != NULL && env->localnets != NULL) {
 				inner = env->localnets;
@@ -204,7 +204,7 @@ dns_acl_match(isc_netaddr_t *reqaddr,
 			} else {
 				break;
 			}
-			
+
 		default:
 			INSIST(0);
 			break;
diff --git a/lib/dns/aclconf.c b/lib/dns/aclconf.c
index a489d69999..b00826a7ea 100644
--- a/lib/dns/aclconf.c
+++ b/lib/dns/aclconf.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: aclconf.c,v 1.19 2000/07/27 09:45:50 tale Exp $ */
+/* $Id: aclconf.c,v 1.20 2000/08/01 01:22:08 tale Exp $ */
 
 #include 
 
@@ -34,7 +34,7 @@ dns_aclconfctx_init(dns_aclconfctx_t *ctx) {
 
 void
 dns_aclconfctx_destroy(dns_aclconfctx_t *ctx) {
-     	dns_acl_t *dacl, *next;	
+     	dns_acl_t *dacl, *next;
 	for (dacl = ISC_LIST_HEAD(ctx->named_acl_cache);
 	     dacl != NULL;
 	     dacl = next)
@@ -103,7 +103,7 @@ convert_keyname(char *txtname, isc_mem_t *mctx, dns_name_t *dnsname) {
 	}
 	return (dns_name_dup(dns_fixedname_name(&fixname), mctx, dnsname));
 }
-	       
+
 isc_result_t
 dns_acl_fromconfig(dns_c_ipmatchlist_t *caml,
 		   dns_c_ctx_t *cctx,
@@ -118,7 +118,7 @@ dns_acl_fromconfig(dns_c_ipmatchlist_t *caml,
 	dns_c_ipmatchelement_t *ce;
 
 	REQUIRE(target != NULL && *target == NULL);
-	
+
 	count = 0;
 	for (ce = ISC_LIST_HEAD(caml->elements);
 	     ce != NULL;
@@ -128,7 +128,7 @@ dns_acl_fromconfig(dns_c_ipmatchlist_t *caml,
 	result = dns_acl_create(mctx, count, &dacl);
 	if (result != ISC_R_SUCCESS)
 		return (result);
-	
+
 	de = dacl->elements;
 	for (ce = ISC_LIST_HEAD(caml->elements);
 	     ce != NULL;
@@ -192,7 +192,7 @@ dns_acl_fromconfig(dns_c_ipmatchlist_t *caml,
 
 	*target = dacl;
 	return (ISC_R_SUCCESS);
-	
+
  cleanup:
 	dns_acl_detach(&dacl);
 	return (result);
diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index 3d4499ae4e..93bdd29ca6 100644
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: adb.c,v 1.143 2000/07/27 09:45:52 tale Exp $ */
+/* $Id: adb.c,v 1.144 2000/08/01 01:22:09 tale Exp $ */
 
 /*
  * Implementation notes
@@ -578,7 +578,7 @@ import_a6(dns_a6context_t *a6ctx) {
 	addr_bucket = DNS_ADB_INVALIDBUCKET;
 
 	DP(ENTER_LEVEL, "ENTER: import_a6() name %p", name);
-	
+
 	nh = new_adbnamehook(adb, NULL);
 	if (nh == NULL) {
 		name->partial_result |= DNS_ADBFIND_INET6; /* clear for AAAA */
@@ -873,11 +873,11 @@ cancel_fetches_at_name(dns_adbname_t *name) {
 
 	if (NAME_FETCH_A(name))
 	    dns_resolver_cancelfetch(name->fetch_a->fetch);
-				     
+
 
 	if (NAME_FETCH_AAAA(name))
 	    dns_resolver_cancelfetch(name->fetch_aaaa->fetch);
-				     
+
 
 	fetch6 = ISC_LIST_HEAD(name->fetches_a6);
 	while (fetch6 != NULL) {
@@ -1522,7 +1522,7 @@ a6find(void *arg, dns_name_t *a6name, dns_rdatatype_t type, isc_stdtime_t now,
 	INSIST(DNS_ADBNAME_VALID(name));
 	adb = name->adb;
 	INSIST(DNS_ADB_VALID(adb));
-	
+
 	return (dns_view_simplefind(adb->view, a6name, type, now,
 				    DNS_DBFIND_GLUEOK, ISC_FALSE,
 				    rdataset, sigrdataset));
@@ -1537,7 +1537,7 @@ a6missing(dns_a6context_t *a6ctx, dns_name_t *a6name) {
 	dns_adb_t *adb;
 	dns_adbfetch6_t *fetch;
 	isc_result_t result;
-	
+
 	name = a6ctx->arg;
 	INSIST(DNS_ADBNAME_VALID(name));
 	adb = name->adb;
@@ -1803,7 +1803,7 @@ entry_is_bad_for_zone(dns_adb_t *adb, dns_adbentry_t *entry, dns_name_t *zone,
 
 		zi = next_zi;
 	}
-	
+
 	return (is_bad);
 }
 
@@ -1964,7 +1964,7 @@ check_expire_entry(dns_adb_t *adb, dns_adbentry_t **entryp, isc_stdtime_t now)
 		return;
 	if (entry->expires == 0 || entry->expires > now)
 		return;
-	
+
 	/*
 	 * The entry is not in use.  Delete it.
 	 */
@@ -2238,7 +2238,7 @@ dns_adb_create(isc_mem_t *mem, dns_view_t *view, isc_timermgr_t *timermgr,
 	isc_task_setname(adb->task, "ADB", adb);
 	/*
 	 * XXXMLG When this is changed to be a config file option,
-	 */ 
+	 */
 	isc_interval_set(&adb->tick_interval, CLEAN_SECONDS, 0);
 	result = isc_timer_create(adb->timermgr, isc_timertype_once,
 				  NULL, &adb->tick_interval, adb->task,
@@ -2351,7 +2351,7 @@ dns_adb_whenshutdown(dns_adb_t *adb, isc_task_t *task, isc_event_t **eventp) {
 	else
 		zeroirefcnt = ISC_FALSE;
 	UNLOCK(&adb->ilock);
-	
+
 	if (adb->shutting_down && zeroirefcnt &&
 	    isc_mempool_getallocated(adb->ahmp) == 0) {
 		/*
@@ -2365,7 +2365,7 @@ dns_adb_whenshutdown(dns_adb_t *adb, isc_task_t *task, isc_event_t **eventp) {
 		event->ev_sender = clone;
 		ISC_LIST_APPEND(adb->whenshutdown, event, ev_link);
 	}
-	
+
 	UNLOCK(&adb->lock);
 }
 
@@ -3441,7 +3441,7 @@ fetch_callback_a6(isc_task_t *task, isc_event_t *ev) {
 	ISC_LIST_UNLINK(name->fetches_a6, fetch, plink);
 
 	DP(ENTER_LEVEL, "ENTER: fetch_callback_a6() name %p", name);
-	
+
 	dns_resolver_destroyfetch(&fetch->fetch);
 	dev->fetch = NULL;
 
@@ -3615,7 +3615,7 @@ fetch_name_v4(dns_adbname_t *adbname, isc_boolean_t start_at_root) {
 	name = NULL;
 	nameservers = NULL;
 	dns_rdataset_init(&rdataset);
-	
+
 	if (start_at_root) {
 		DP(50, "fetch_name_v4: starting at DNS root for name %p",
 		   adbname);
@@ -3952,7 +3952,7 @@ dns_adb_freeaddrinfo(dns_adb_t *adb, dns_adbaddrinfo_t **addrp) {
 	isc_stdtime_get(&now);
 
 	*addrp = NULL;
-	
+
 	bucket = addr->entry->lock_bucket;
 	LOCK(&adb->entrylocks[bucket]);
 
diff --git a/lib/dns/byaddr.c b/lib/dns/byaddr.c
index b25e0bd121..19b4736ce5 100644
--- a/lib/dns/byaddr.c
+++ b/lib/dns/byaddr.c
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: byaddr.c,v 1.17 2000/07/27 09:45:53 tale Exp $ */
+/* $Id: byaddr.c,v 1.18 2000/08/01 01:22:11 tale Exp $ */
 
 #include 
 
@@ -64,7 +64,7 @@ struct dns_byaddr {
 static void byaddr_find(dns_byaddr_t *byaddr, dns_fetchevent_t *event);
 
 static char hex_digits[] = {
-	'0', '1', '2', '3', '4', '5', '6', '7', 
+	'0', '1', '2', '3', '4', '5', '6', '7',
 	'8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
 };
 
@@ -139,7 +139,7 @@ copy_ptr_targets(dns_byaddr_t *byaddr) {
 	/*
 	 * The caller must be holding the byaddr's lock.
 	 */
-	
+
 	result = dns_rdataset_first(&byaddr->rdataset);
 	while (result == ISC_R_SUCCESS) {
 		dns_rdataset_current(&byaddr->rdataset, &rdata);
@@ -161,7 +161,7 @@ copy_ptr_targets(dns_byaddr_t *byaddr) {
 	}
 	if (result == ISC_R_NOMORE)
 		result = ISC_R_SUCCESS;
-	
+
 	return (result);
 }
 
@@ -420,7 +420,7 @@ dns_byaddr_create(isc_mem_t *mctx, isc_netaddr_t *address, dns_view_t *view,
 	byaddr->canceled = ISC_FALSE;
 	dns_rdataset_init(&byaddr->rdataset);
 	byaddr->magic = BYADDR_MAGIC;
-	
+
 	*byaddrp = byaddr;
 
 	byaddr_find(byaddr, NULL);
diff --git a/lib/dns/cache.c b/lib/dns/cache.c
index f261535099..aa8c859d31 100644
--- a/lib/dns/cache.c
+++ b/lib/dns/cache.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cache.c,v 1.25 2000/07/27 09:45:54 tale Exp $ */
+/* $Id: cache.c,v 1.26 2000/08/01 01:22:12 tale Exp $ */
 
 #include 
 
@@ -41,7 +41,7 @@
 
 /*
  * A cache_cleaner_t encapsulsates the state of the periodic
- * cache cleaning. 
+ * cache cleaning.
  */
 
 typedef struct cache_cleaner cache_cleaner_t;
@@ -67,17 +67,17 @@ struct cache_cleaner {
 	unsigned int	cleaning_interval; /* The cleaning-interval from
 					      named.conf, in seconds. */
 	isc_timer_t 	*cleaning_timer;
-	isc_event_t	*resched_event;	/* Sent by cleaner task to 
+	isc_event_t	*resched_event;	/* Sent by cleaner task to
 					   itself to reschedule */
 
 	dns_dbiterator_t *iterator;
-	int 		 increment;	/* Number of names to 
+	int 		 increment;	/* Number of names to
 					   clean in one increment */
 	cleaner_state_t  state;		/* Idle/Busy. */
 };
 
 /*
- * The actual cache object. 
+ * The actual cache object.
  */
 
 struct dns_cache {
@@ -89,12 +89,12 @@ struct dns_cache {
 
 	/* Locked by 'lock'. */
 	int			references;
-	int			live_tasks;	
+	int			live_tasks;
 	dns_rdataclass_t	rdclass;
 	dns_db_t		*db;
 	cache_cleaner_t		cleaner;
 
-	/* Locked by 'filelock'. */	
+	/* Locked by 'filelock'. */
 	char *			filename;
 	/* Access to the on-disk cache file is also locked by 'filelock'. */
 };
@@ -117,7 +117,7 @@ incremental_cleaning_action(isc_task_t *task, isc_event_t *event);
 static void
 cleaner_shutdown_action(isc_task_t *task, isc_event_t *event);
 
-isc_result_t 
+isc_result_t
 dns_cache_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr,
 		 isc_timermgr_t *timermgr, dns_rdataclass_t rdclass,
 		 const char *db_type, unsigned int db_argc, char **db_argv,
@@ -157,8 +157,8 @@ dns_cache_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr,
 	if (result != ISC_R_SUCCESS)
 		goto cleanup_mutex;
 
-	cache->filename = NULL;	
-	
+	cache->filename = NULL;
+
 	cache->magic = CACHE_MAGIC;
 
 	result = cache_cleaner_init(cache, taskmgr, timermgr,
@@ -179,7 +179,7 @@ dns_cache_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr,
 	return (result);
 }
 
-static void 
+static void
 cache_free(dns_cache_t *cache) {
 	isc_mem_t *mctx;
 
@@ -204,11 +204,11 @@ cache_free(dns_cache_t *cache) {
 		dns_db_detach(&cache->db);
 
 	isc_mutex_destroy(&cache->lock);
-	cache->magic = 0;	
+	cache->magic = 0;
 	mctx = cache->mctx;
-	isc_mem_put(cache->mctx, cache, sizeof *cache);	
+	isc_mem_put(cache->mctx, cache, sizeof *cache);
 	isc_mem_detach(&mctx);
-}	
+}
 
 
 void
@@ -267,11 +267,11 @@ dns_cache_setfilename(dns_cache_t *cahce, char *filename) {
 	char *newname = isc_mem_strdup(filename);
 	if (newname == NULL)
 		return (ISC_R_NOMEMORY);
-	LOCK(&cache->filelock);	
+	LOCK(&cache->filelock);
 	if (cache->filename)
 		isc_mem_free(cache->mctx, cache->filename);
 	cache->filename = newname;
-	UNLOCK(&cache->filelock);	
+	UNLOCK(&cache->filelock);
 	return (ISC_R_SUCCESS);
 }
 
@@ -283,7 +283,7 @@ dns_cache_load(dns_cache_t *cache) {
 	LOCK(&cache->filelock);
 	/* XXX handle TTLs in a way appropriate for the cache */
 	result = dns_db_load(cache->db, cache->filename);
-	UNLOCK(&cache->filelock);	
+	UNLOCK(&cache->filelock);
 	return (result);
 }
 
@@ -310,16 +310,16 @@ dns_cache_setcleaninginterval(dns_cache_t *cache, unsigned int t) {
 				isc_timertype_ticker,
 				NULL, &interval, ISC_FALSE);
 	}
-	UNLOCK(&cache->lock);	
+	UNLOCK(&cache->lock);
 }
 
 /*
- * Initialize the cache cleaner object at *cleaner.  
+ * Initialize the cache cleaner object at *cleaner.
  * Space for the object must be allocated by the caller.
  */
 
 static isc_result_t
-cache_cleaner_init(dns_cache_t *cache, isc_taskmgr_t *taskmgr, 
+cache_cleaner_init(dns_cache_t *cache, isc_taskmgr_t *taskmgr,
 		   isc_timermgr_t *timermgr, cache_cleaner_t *cleaner)
 {
         isc_result_t result;
@@ -328,11 +328,11 @@ cache_cleaner_init(dns_cache_t *cache, isc_taskmgr_t *taskmgr,
 	cleaner->state = cleaner_s_idle;
 	cleaner->cache = cache;
 	cleaner->iterator = NULL;
-	
+
 	cleaner->task = NULL;
 	cleaner->cleaning_timer = NULL;
 	cleaner->resched_event = NULL;
-	
+
 	if (taskmgr != NULL && timermgr != NULL) {
 		result = isc_task_create(taskmgr, 1, &cleaner->task);
 		if (result != ISC_R_SUCCESS) {
@@ -354,7 +354,7 @@ cache_cleaner_init(dns_cache_t *cache, isc_taskmgr_t *taskmgr,
 					 dns_result_totext(result));
 			goto cleanup;
 		}
-			
+
 		cleaner->cleaning_interval = 0; /* Initially turned off. */
 		result = isc_timer_create(timermgr, isc_timertype_inactive,
 					   NULL, NULL,
@@ -368,7 +368,7 @@ cache_cleaner_init(dns_cache_t *cache, isc_taskmgr_t *taskmgr,
 			result = ISC_R_UNEXPECTED;
 			goto cleanup;
 		}
-		
+
 		cleaner->resched_event =
 			isc_event_allocate(cache->mctx, cleaner,
 					   DNS_EVENT_CACHECLEAN,
@@ -379,9 +379,9 @@ cache_cleaner_init(dns_cache_t *cache, isc_taskmgr_t *taskmgr,
 			goto cleanup;
 		}
 	}
-		
+
 	return (ISC_R_SUCCESS);
-	
+
  cleanup:
 	if (cleaner->cleaning_timer != NULL)
 		isc_timer_detach(&cleaner->cleaning_timer);
@@ -430,7 +430,7 @@ begin_cleaning(cache_cleaner_t *cleaner) {
 	return;
 
  destroyiter:
-	dns_dbiterator_destroy(&cleaner->iterator);	
+	dns_dbiterator_destroy(&cleaner->iterator);
  idle:
 	ENSURE(CLEANER_IDLE(cleaner));
 	return;
@@ -516,9 +516,9 @@ incremental_cleaning_action(isc_task_t *task, isc_event_t *event) {
 
 		/*
 		 * This is where the actual freeing takes place.
-		 */ 
+		 */
 		dns_db_detachnode(cleaner->cache->db, &node);
-		
+
 		/*
 		 * Step to the next node.
 		 */
@@ -562,12 +562,12 @@ incremental_cleaning_action(isc_task_t *task, isc_event_t *event) {
 	 * No longer busy; save the event for later use.
 	 */
 	end_cleaning(cleaner, event);
-	INSIST(CLEANER_IDLE(cleaner));	
+	INSIST(CLEANER_IDLE(cleaner));
 	return;
 }
 
 /*
- * Do immediate cleaning. 
+ * Do immediate cleaning.
  */
 isc_result_t
 dns_cache_clean(dns_cache_t *cache, isc_stdtime_t now) {
@@ -577,7 +577,7 @@ dns_cache_clean(dns_cache_t *cache, isc_stdtime_t now) {
 	result = dns_db_createiterator(cache->db, ISC_FALSE, &iterator);
 	if (result != ISC_R_SUCCESS)
 		return result;
-	
+
 	result = dns_dbiterator_first(iterator);
 
 	while (result == ISC_R_SUCCESS) {
@@ -603,7 +603,7 @@ dns_cache_clean(dns_cache_t *cache, isc_stdtime_t now) {
 
 		/*
 		 * This is where the actual freeing takes place.
-		 */ 
+		 */
 		dns_db_detachnode(cache->db, &node);
 
 		result = dns_dbiterator_next(iterator);
@@ -613,7 +613,7 @@ dns_cache_clean(dns_cache_t *cache, isc_stdtime_t now) {
 
 	if (result == ISC_R_NOMORE)
 		result = ISC_R_SUCCESS;
-	
+
 	return result;
 }
 
@@ -623,7 +623,7 @@ dns_cache_clean(dns_cache_t *cache, isc_stdtime_t now) {
 static void
 cleaner_shutdown_action(isc_task_t *task, isc_event_t *event) {
 	dns_cache_t *cache = event->ev_arg;
-	isc_boolean_t should_free = ISC_FALSE;	
+	isc_boolean_t should_free = ISC_FALSE;
 
 	UNUSED(task);
 
@@ -631,12 +631,12 @@ cleaner_shutdown_action(isc_task_t *task, isc_event_t *event) {
 
 	INSIST(event->ev_type == ISC_TASKEVENT_SHUTDOWN);
 	isc_event_free(&event);
-	
+
 	cache->live_tasks--;
 	INSIST(cache->live_tasks == 0);
 
 	if (cache->references == 0)
-		should_free = ISC_TRUE;		
+		should_free = ISC_TRUE;
 
 	/*
 	 * By detaching the timer in the context of its task,
@@ -648,7 +648,7 @@ cleaner_shutdown_action(isc_task_t *task, isc_event_t *event) {
 
 	/* Make sure we don't reschedule anymore. */
 	isc_task_purge(task, NULL, DNS_EVENT_CACHECLEAN, NULL);
-	
+
 	UNLOCK(&cache->lock);
 
 	if (should_free)
diff --git a/lib/dns/callbacks.c b/lib/dns/callbacks.c
index 8abd93ba26..31ab74ecd7 100644
--- a/lib/dns/callbacks.c
+++ b/lib/dns/callbacks.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: callbacks.c,v 1.9 2000/07/27 09:45:55 tale Exp $ */
+/* $Id: callbacks.c,v 1.10 2000/08/01 01:22:13 tale Exp $ */
 
 #include 
 
@@ -50,7 +50,7 @@ isclog_error_callback(dns_rdatacallbacks_t *callbacks, const char *fmt, ...) {
 	va_list ap;
 
 	UNUSED(callbacks);
-	
+
 	va_start(ap, fmt);
 	isc_log_vwrite(dns_lctx, DNS_LOGCATEGORY_GENERAL,
 		       DNS_LOGMODULE_MASTER, /* XXX */
diff --git a/lib/dns/compress.c b/lib/dns/compress.c
index 1502bac4eb..76ebb094c4 100644
--- a/lib/dns/compress.c
+++ b/lib/dns/compress.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: compress.c,v 1.34 2000/07/27 09:45:56 tale Exp $ */
+/* $Id: compress.c,v 1.35 2000/08/01 01:22:14 tale Exp $ */
 
 #define DNS_NAME_USEINLINE 1
 
@@ -230,7 +230,7 @@ unsigned int
 dns_decompress_getmethods(dns_decompress_t *dctx) {
 
 	REQUIRE(VALID_DCTX(dctx));
-	
+
 	return (dctx->allowed);
 }
 
@@ -238,7 +238,7 @@ int
 dns_decompress_edns(dns_decompress_t *dctx) {
 
 	REQUIRE(VALID_DCTX(dctx));
-	
+
 	return (dctx->edns);
 }
 
diff --git a/lib/dns/config/Makefile.in b/lib/dns/config/Makefile.in
index 43a8bd2147..06193dd2a5 100644
--- a/lib/dns/config/Makefile.in
+++ b/lib/dns/config/Makefile.in
@@ -1,9 +1,9 @@
 # Copyright (C) 1998-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
 # 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
@@ -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.16 2000/07/27 09:46:55 tale Exp $
+# $Id: Makefile.in,v 1.17 2000/08/01 01:23:13 tale Exp $
 
 srcdir		= @srcdir@
 VPATH		= @srcdir@
@@ -45,7 +45,7 @@ SRCS		= confparser.c confcommon.c confacl.c confcache.c \
 		  conflsn.c confndc.c confresolv.c confrrset.c \
 		  confview.c confzone.c
 
-SUBDIRS		=	
+SUBDIRS		=
 TARGETS		= ${OBJS}
 
 @BIND9_MAKE_RULES@
@@ -56,7 +56,7 @@ TARGETS		= ${OBJS}
 ##	mv y.tab.c confparser.c
 ##	mv y.tab.h confparser_p.h
 
-## This rule is here during development to help debugging. 
+## This rule is here during development to help debugging.
 ## Remove and uncomment the rule above before release.
 confparser.c: confparser.y
 	${YACC} -d ${srcdir}/confparser.y
diff --git a/lib/dns/config/confacl.c b/lib/dns/config/confacl.c
index 1929f604a8..5c8aecf3d9 100644
--- a/lib/dns/config/confacl.c
+++ b/lib/dns/config/confacl.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: confacl.c,v 1.19 2000/07/27 09:46:56 tale Exp $ */
+/* $Id: confacl.c,v 1.20 2000/08/01 01:23:14 tale Exp $ */
 
 #include 
 
@@ -32,7 +32,7 @@ acl_delete(dns_c_acl_t **aclptr);
 isc_result_t
 dns_c_acltable_new(isc_mem_t *mem, dns_c_acltable_t **newtable) {
 	dns_c_acltable_t *table;
-	
+
 	REQUIRE(mem != NULL);
 	REQUIRE(newtable != NULL);
 
@@ -61,7 +61,7 @@ dns_c_acltable_delete(dns_c_acltable_t **table) {
 
 	REQUIRE(table != NULL);
 	REQUIRE(*table != NULL);
-	
+
 	acltable = *table;
 
 	REQUIRE(DNS_C_CONFACLTABLE_VALID(acltable));
@@ -69,11 +69,11 @@ dns_c_acltable_delete(dns_c_acltable_t **table) {
 	dns_c_acltable_clear(acltable);
 
 	mem = acltable->mem;
-	
+
 	acltable->magic = 0;
 	acltable->mem = NULL;
-	
-	
+
+
 	isc_mem_put(mem, acltable, sizeof *acltable);
 
 	return (ISC_R_SUCCESS);
@@ -90,13 +90,13 @@ dns_c_acltable_print(FILE *fp, int indent, dns_c_acltable_t *table) {
 	if (table == NULL) {
 		return;
 	}
-		
+
 	REQUIRE(DNS_C_CONFACLTABLE_VALID(table));
-			
+
 	acl = ISC_LIST_HEAD(table->acl_list);
 	while (acl != NULL) {
 		acltmp = ISC_LIST_NEXT(acl, next);
-		
+
 		if (!acl->is_special) { /* don't print specials */
 			dns_c_acl_print(fp, indent, acl);
 			fprintf(fp, "\n");
@@ -111,14 +111,14 @@ dns_c_acltable_clear(dns_c_acltable_t *table) {
 	dns_c_acl_t *elem;
 	dns_c_acl_t *tmpelem;
 	isc_result_t r;
-	
+
 	REQUIRE(DNS_C_CONFACLTABLE_VALID(table));
-			
+
 	elem = ISC_LIST_HEAD(table->acl_list);
 	while (elem != NULL) {
 		tmpelem = ISC_LIST_NEXT(elem, next);
 		ISC_LIST_UNLINK(table->acl_list, elem, next);
-		
+
 		r = acl_delete(&elem);
 		if (r != ISC_R_SUCCESS) {
 			isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
@@ -154,7 +154,7 @@ dns_c_acltable_getacl(dns_c_acltable_t *table,
 
 		elem = ISC_LIST_NEXT(elem, next);
 	}
-	
+
 	if (elem != NULL) {
 		REQUIRE(DNS_C_CONFACL_VALID(elem));
 		*retval = elem;
@@ -171,7 +171,7 @@ dns_c_acltable_removeacl(dns_c_acltable_t *table, const char *aclname) {
 
 	REQUIRE(DNS_C_CONFACLTABLE_VALID(table));
 	REQUIRE(aclname != NULL);
-	
+
 	acl = ISC_LIST_HEAD(table->acl_list);
 	while (acl != NULL) {
 		tmpacl = ISC_LIST_NEXT(acl, next);
@@ -193,7 +193,7 @@ dns_c_acl_new(dns_c_acltable_t *table, const char *aclname,
 	      isc_boolean_t isspecial, dns_c_acl_t **newacl)
 {
 	dns_c_acl_t *acl;
-	
+
 	REQUIRE(DNS_C_CONFACLTABLE_VALID(table));
 	REQUIRE(aclname != NULL);
 	REQUIRE(*aclname != '\0');
@@ -223,7 +223,7 @@ dns_c_acl_new(dns_c_acltable_t *table, const char *aclname,
 	}
 
 	ISC_LIST_APPEND(table->acl_list, acl, next);
-	
+
 	*newacl = acl;
 
 	return (ISC_R_SUCCESS);
@@ -233,7 +233,7 @@ dns_c_acl_new(dns_c_acltable_t *table, const char *aclname,
 void
 dns_c_acl_print(FILE *fp, int indent, dns_c_acl_t *acl) {
 	REQUIRE(DNS_C_CONFACL_VALID(acl));
-	
+
 	dns_c_printtabs(fp, indent);
 	fprintf(fp, "acl ");
 	if (acl->name == NULL) {
@@ -258,7 +258,7 @@ dns_c_acl_setipml(dns_c_acl_t *acl,
 		  dns_c_ipmatchlist_t *ipml, isc_boolean_t deepcopy)
 {
 	isc_result_t res;
-	
+
 	REQUIRE(DNS_C_CONFACL_VALID(acl));
 	REQUIRE(ipml != NULL);
 
@@ -286,7 +286,7 @@ dns_c_acl_getipmlexpanded(isc_mem_t *mem, dns_c_acl_t *acl,
 	isc_result_t r;
 
 	REQUIRE(DNS_C_CONFACL_VALID(acl));
-	
+
 	if (acl->ipml == NULL) {
 		newlist = NULL;
 		r = ISC_R_SUCCESS;
@@ -300,7 +300,7 @@ dns_c_acl_getipmlexpanded(isc_mem_t *mem, dns_c_acl_t *acl,
 	}
 
 	*retval = newlist;
-	
+
 	return (r);
 }
 
@@ -317,7 +317,7 @@ dns_c_acl_expandacls(dns_c_acltable_t *table, dns_c_ipmatchlist_t *list) {
 	isc_boolean_t isneg;
 
 	REQUIRE(DNS_C_CONFACLTABLE_VALID(table));
-	
+
 	if (list == NULL) {
 		return (ISC_R_SUCCESS);
 	}
@@ -340,7 +340,7 @@ dns_c_acl_expandacls(dns_c_acltable_t *table, dns_c_ipmatchlist_t *list) {
 			if (acl->ipml != NULL) {
 				isneg = dns_c_ipmatchelement_isneg(elem);
 
-				/* XXX I this should be inserted in place and 
+				/* XXX I this should be inserted in place and
 				 *   not appended
 				 */
 				dns_c_ipmatchlist_append(list,
@@ -350,7 +350,7 @@ dns_c_acl_expandacls(dns_c_acltable_t *table, dns_c_ipmatchlist_t *list) {
 		default:
 			; /* Do nothing */
 		}
-			
+
 		tmpelem = ISC_LIST_NEXT(elem, next);
 
 		if (elem->type == dns_c_ipmatch_acl) {
@@ -372,7 +372,7 @@ acl_delete(dns_c_acl_t **aclptr) {
 
 	REQUIRE(aclptr != NULL);
 	REQUIRE(*aclptr != NULL);
-	
+
 	acl = *aclptr;
 
 	REQUIRE(DNS_C_CONFACL_VALID(acl));
@@ -380,18 +380,18 @@ acl_delete(dns_c_acl_t **aclptr) {
 	mem = acl->mytable->mem;
 
 	acl->mytable = NULL;
-	
+
 	isc_mem_free(mem, acl->name);
 
 	if (acl->ipml != NULL)
 		res = dns_c_ipmatchlist_detach(&acl->ipml);
 	else
 		res = ISC_R_SUCCESS;
-	
+
 	acl->magic = 0;
-	
+
 	isc_mem_put(mem, acl, sizeof *acl);
-	
+
 	return (res);
 }
 
diff --git a/lib/dns/config/confcache.c b/lib/dns/config/confcache.c
index 432dc38ebe..8ce9fda1ef 100644
--- a/lib/dns/config/confcache.c
+++ b/lib/dns/config/confcache.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: confcache.c,v 1.7 2000/07/27 09:46:57 tale Exp $ */
+/* $Id: confcache.c,v 1.8 2000/08/01 01:23:15 tale Exp $ */
 
 #include 
 
@@ -30,7 +30,7 @@ dns_c_cache_new(isc_mem_t *mem, dns_c_cache_t **cfgcache) {
 	(void) mem ; (void) cfgcache; /* lint */
 
 	/* XXX nothing yet */
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -43,5 +43,5 @@ dns_c_cache_delete(dns_c_cache_t **cfgcache) {
 	return (ISC_R_SUCCESS);
 }
 
-		
+
 
diff --git a/lib/dns/config/confcommon.c b/lib/dns/config/confcommon.c
index 3e72a9e552..920a59e1e0 100644
--- a/lib/dns/config/confcommon.c
+++ b/lib/dns/config/confcommon.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: confcommon.c,v 1.33 2000/07/27 09:46:59 tale Exp $ */
+/* $Id: confcommon.c,v 1.34 2000/08/01 01:23:16 tale Exp $ */
 
 #include 
 
@@ -38,7 +38,7 @@
 /***
  *** TYPES
  ***/
- 
+
 #define ordering_nametable_size \
 	(sizeof (ordering_nametable) / sizeof (struct dns_c_pvt_ont))
 static struct dns_c_pvt_ont {
@@ -66,7 +66,7 @@ static struct dns_c_pvt_lsnt {
 	{ dns_c_log_dynamic,		"dynamic" }
 };
 
-	
+
 static struct dsn_c_pvt_sfnt {
 	int val;
 	const char *strval;
@@ -93,14 +93,14 @@ static struct dsn_c_pvt_sfnt {
 #ifdef LOG_FTP
 	{ LOG_FTP,			"ftp" },
 #endif
-	{ LOG_LOCAL0,			"local0"}, 
-	{ LOG_LOCAL1,			"local1"}, 
-	{ LOG_LOCAL2,			"local2"}, 
-	{ LOG_LOCAL3,			"local3"}, 
-	{ LOG_LOCAL4,			"local4"}, 
-	{ LOG_LOCAL5,			"local5"}, 
-	{ LOG_LOCAL6,			"local6"}, 
-	{ LOG_LOCAL7,			"local7"}, 
+	{ LOG_LOCAL0,			"local0"},
+	{ LOG_LOCAL1,			"local1"},
+	{ LOG_LOCAL2,			"local2"},
+	{ LOG_LOCAL3,			"local3"},
+	{ LOG_LOCAL4,			"local4"},
+	{ LOG_LOCAL5,			"local5"},
+	{ LOG_LOCAL6,			"local6"},
+	{ LOG_LOCAL7,			"local7"},
 	{ 0,				NULL }
 };
 
@@ -148,7 +148,7 @@ static const char *category_nametable[] = {
 	"xfer-in",
 	"xfer-out",
 #endif
-	
+
 	NULL
 };
 
@@ -179,7 +179,7 @@ dns_c_printinunits(FILE *fp, isc_uint32_t val) {
 	/* XXXJAB These format strings may break if isc_offset_t is a large
 	   enough type and val has a value greater than MAX_ULONG. I know
 	   of no portablt solution to this. */
-	
+
 	if (val == DNS_C_SIZE_SPEC_DEFAULT)
 		fprintf(fp, "default");
 	else if (val == 0)
@@ -203,7 +203,7 @@ dns_c_dataclass_tostream(FILE *fp, dns_rdataclass_t rclass) {
 	isc_buffer_t sourceb;
 
 	isc_buffer_init(&sourceb, buffer, sizeof(buffer));
-	
+
 	if (dns_rdataclass_totext(rclass, &sourceb) == ISC_R_SUCCESS) {
 		INSIST(sourceb.used + 1 < sizeof(buffer));
 		buffer[sourceb.used] = '\0';
@@ -254,7 +254,7 @@ dns_c_string2ordering(char *name, dns_c_ordering_t *ordering) {
 			break;
 		}
 	}
-	
+
 	return (rval);
 }
 
@@ -303,7 +303,7 @@ dns_c_string2logseverity(const char *string,
 	isc_result_t rval = ISC_R_FAILURE;
 
 	REQUIRE(result != NULL);
-	
+
 	for (i = 0 ; i < log_severity_nametable_size ; i++) {
 		if (strcmp(log_severity_nametable[i].strval, string) == 0) {
 			*result = log_severity_nametable[i].val;
@@ -344,7 +344,7 @@ dns_c_string2category(const char *string,
 	isc_result_t rval = ISC_R_FAILURE;
 
 	REQUIRE (category != NULL);
-	
+
 	for (i = 0 ; i < category_nametable_size ; i++) {
 		if (strcmp(category_nametable[i].strval, string) == 0) {
 			*category = category_nametable[i].val;
@@ -370,7 +370,7 @@ dns_c_facility2string(int facility, isc_boolean_t printable) {
 			break;
 		}
 	}
-	
+
 	return (rval == NULL && printable ? "UNKNOWN_FACILITY" : rval);
 }
 
@@ -424,7 +424,7 @@ dns_c_transport2string(dns_c_trans_t transport,
 	case dns_trans_primary:
 		rval = "master";
 		break;
-		
+
 	case dns_trans_secondary:
 		rval = "slave";
 		break;
@@ -533,9 +533,9 @@ dns_c_isanyaddr(isc_sockaddr_t *inaddr) {
 
 	return (result);
 }
-	
 
-	
+
+
 void
 dns_c_print_ipaddr(FILE *fp, isc_sockaddr_t *inaddr) {
 	const char *p;
@@ -553,7 +553,7 @@ dns_c_print_ipaddr(FILE *fp, isc_sockaddr_t *inaddr) {
 		addr = (family == AF_INET ?
 			(void *)&inaddr->type.sin.sin_addr :
 			(void *)&inaddr->type.sin6.sin6_addr);
-		
+
 		p = inet_ntop(family, addr, tmpaddrstr, sizeof tmpaddrstr);
 		if (p == NULL) {
 			fprintf(fp, "BAD-IP-ADDRESS");
@@ -567,7 +567,7 @@ dns_c_print_ipaddr(FILE *fp, isc_sockaddr_t *inaddr) {
 isc_boolean_t
 dns_c_netaddrisanyaddr(isc_netaddr_t *inaddr) {
 	isc_boolean_t result = ISC_FALSE;
-	
+
 	if (inaddr->family == AF_INET) {
 		if (inaddr->type.in.s_addr == htonl(INADDR_ANY)) {
 			result = ISC_TRUE;
@@ -602,7 +602,7 @@ dns_c_netaddrprint(FILE *fp, isc_netaddr_t *inaddr) {
 		addr = (family == AF_INET ?
 			(void *)&inaddr->type.in :
 			(void *)&inaddr->type.in6);
-		
+
 		p = inet_ntop(family, addr, tmpaddrstr, sizeof tmpaddrstr);
 		if (p == NULL) {
 			fprintf(fp, "BAD-IP-ADDRESS");
@@ -630,16 +630,16 @@ dns_c_need_quote(const char *string) {
 }
 
 
-		
+
 void
 dns_c_peerlist_print(FILE *fp, int indent,
 		     dns_peerlist_t *servers)
 {
 	dns_peer_t *server;
-	
+
 	REQUIRE(fp != NULL);
 	REQUIRE(DNS_PEERLIST_VALID(servers));
-	
+
 	server = ISC_LIST_HEAD(servers->elements);
 	while (server != NULL) {
 		dns_c_peer_print(fp, indent, server);
@@ -648,7 +648,7 @@ dns_c_peerlist_print(FILE *fp, int indent,
 			fprintf(fp, "\n");
 		}
 	}
-	
+
 	return;
 }
 
@@ -660,15 +660,15 @@ dns_c_peer_print(FILE *fp, int indent, dns_peer_t *peer) {
 	dns_transfer_format_t tval;
 	isc_int32_t ival;
 	dns_name_t *name = NULL;
-	
+
 	REQUIRE(DNS_PEER_VALID(peer));
 	REQUIRE(fp != NULL);
-	
+
 	dns_c_printtabs(fp, indent);
 	fprintf(fp, "server ");
 	dns_c_netaddrprint(fp, &peer->address);
 	fprintf(fp, " {\n");
-	
+
 	res = dns_peer_getbogus(peer, &bval);
 	if (res == ISC_R_SUCCESS) {
 		dns_c_printtabs(fp, indent + 1);
@@ -708,7 +708,7 @@ dns_c_peer_print(FILE *fp, int indent, dns_peer_t *peer) {
 		dns_name_print(peer->key, fp);
 		fprintf(fp, "\"; };\n");
 	}
-	
+
 	dns_c_printtabs(fp, indent);
 	fprintf(fp, "};\n");
 }
@@ -729,16 +729,16 @@ dns_c_charptoname(isc_mem_t *mem, const char *keyval, dns_name_t **name) {
 	REQUIRE(name != NULL);
 
 	len = strlen(keyval);
-	
+
 	dns_name_init(&newkey, NULL);
 	res = isc_buffer_allocate(mem, &b1, len + 2);
 	REQUIRE(res == ISC_R_SUCCESS);
-	
+
 	dns_name_setbuffer(&newkey, b1);
-	
+
 	isc_buffer_init(&b2, keyval, len);
 	isc_buffer_add(&b2, len);
-	
+
 	res = dns_name_fromtext(&newkey, &b2, dns_rootname, ISC_FALSE, NULL);
 	if (res != ISC_R_SUCCESS) {
 		return (res);
@@ -747,7 +747,7 @@ dns_c_charptoname(isc_mem_t *mem, const char *keyval, dns_name_t **name) {
 	*name = isc_mem_get(mem, sizeof (dns_name_t));
 	REQUIRE(*name != NULL);
 	dns_name_init(*name, NULL);
-	
+
 	dns_name_dup(&newkey, mem, *name);
 	dns_name_invalidate(&newkey);
 	isc_buffer_free(&b1);
@@ -763,7 +763,7 @@ dns_c_ssutable_print(FILE *fp, int indent, dns_ssutable_t *ssutable) {
 	dns_rdatatype_t *types;
 	unsigned int i;
 	unsigned int tcount;
-	
+
 	res = dns_ssutable_firstrule(ssutable, &rule);
 	if (res != ISC_R_SUCCESS) {
 		return;
@@ -772,13 +772,13 @@ dns_c_ssutable_print(FILE *fp, int indent, dns_ssutable_t *ssutable) {
 	fputc('\n', fp);
 	dns_c_printtabs(fp, indent);
 	fprintf(fp, "update-policy {\n");
-	
+
 	do {
 		dns_c_printtabs(fp, indent + 1);
 
 		fputs ((dns_ssurule_isgrant(rule) ? "grant" : "deny"), fp);
 		fputc(' ', fp);
-		
+
 		dns_name_print(dns_ssurule_identity(rule), fp);
 		fputc(' ', fp);
 
@@ -845,4 +845,4 @@ dns_c_checkcategory(const char *name) {
 
 	return (ISC_R_FAILURE);
 }
-	
+
diff --git a/lib/dns/config/confctl.c b/lib/dns/config/confctl.c
index 887349b0ca..bdb8499452 100644
--- a/lib/dns/config/confctl.c
+++ b/lib/dns/config/confctl.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: confctl.c,v 1.28 2000/07/27 09:47:00 tale Exp $ */
+/* $Id: confctl.c,v 1.29 2000/08/01 01:23:17 tale Exp $ */
 
 #include 
 
@@ -28,7 +28,7 @@
 isc_result_t
 dns_c_ctrllist_new(isc_mem_t *mem, dns_c_ctrllist_t **newlist) {
 	dns_c_ctrllist_t *newl;
-	
+
 	REQUIRE(mem != NULL);
 	REQUIRE (newlist != NULL);
 
@@ -40,7 +40,7 @@ dns_c_ctrllist_new(isc_mem_t *mem, dns_c_ctrllist_t **newlist) {
 
 	newl->mem = mem;
 	newl->magic = DNS_C_CONFCTLLIST_MAGIC;
-	
+
 	ISC_LIST_INIT(newl->elements);
 
 	*newlist = newl;
@@ -80,7 +80,7 @@ dns_c_ctrllist_print(FILE *fp, int indent, dns_c_ctrllist_t *cl) {
 	}
 
 	REQUIRE(DNS_C_CONFCTLLIST_VALID(cl));
-	
+
 	fprintf(fp, "controls {\n");
 
 	ctl = dns_c_ctrllist_head(cl);
@@ -94,7 +94,7 @@ dns_c_ctrllist_print(FILE *fp, int indent, dns_c_ctrllist_t *cl) {
 			ctl = dns_c_ctrl_next(ctl);
 		}
 	}
-		
+
 	fprintf(fp, "};\n");
 }
 
@@ -106,11 +106,11 @@ dns_c_ctrllist_delete(dns_c_ctrllist_t **list) {
 
 	REQUIRE(list != NULL);
 	REQUIRE(*list != NULL);
-	
+
 	clist = *list;
 
 	REQUIRE(DNS_C_CONFCTLLIST_VALID(clist));
-	
+
 	ctrl = ISC_LIST_HEAD(clist->elements);
 	while (ctrl != NULL) {
 		tmpctrl = ISC_LIST_NEXT(ctrl, next);
@@ -131,7 +131,7 @@ isc_result_t
 dns_c_ctrl_validate(dns_c_ctrl_t *ctrl)
 {
 	isc_result_t result = ISC_R_SUCCESS;
-	
+
 	REQUIRE(DNS_C_CONFCTL_VALID(ctrl));
 
 	if (ctrl->control_type == dns_c_unix_control) {
@@ -154,7 +154,7 @@ dns_c_ctrl_validate(dns_c_ctrl_t *ctrl)
 	return (result);
 }
 
-		
+
 
 isc_result_t
 dns_c_ctrlinet_new(isc_mem_t *mem, dns_c_ctrl_t **control,
@@ -164,7 +164,7 @@ dns_c_ctrlinet_new(isc_mem_t *mem, dns_c_ctrl_t **control,
 {
 	dns_c_ctrl_t  *ctrl;
 	isc_result_t	res;
-	
+
 	REQUIRE(mem != NULL);
 	REQUIRE(control != NULL);
 
@@ -200,7 +200,7 @@ dns_c_ctrlunix_new(isc_mem_t *mem, dns_c_ctrl_t **control,
 		   const char *path, int perm, uid_t uid, gid_t gid)
 {
 	dns_c_ctrl_t  *ctrl;
-	
+
 	REQUIRE(mem != NULL);
 	REQUIRE(control != NULL);
 
@@ -218,13 +218,13 @@ dns_c_ctrlunix_new(isc_mem_t *mem, dns_c_ctrl_t **control,
 					/* XXXJAB logwrite */
 		return (ISC_R_NOMEMORY);
 	}
-	
+
 	ctrl->u.unix_v.perm = perm;
 	ctrl->u.unix_v.owner = uid;
 	ctrl->u.unix_v.group = gid;
 
 	ctrl->keyidlist = NULL;
-	
+
 	*control = ctrl;
 
 	return (ISC_R_SUCCESS);
@@ -235,7 +235,7 @@ dns_c_ctrl_delete(dns_c_ctrl_t **control) {
 	isc_result_t res = ISC_R_SUCCESS;
 	isc_mem_t *mem;
 	dns_c_ctrl_t *ctrl;
-	
+
 	REQUIRE(control != NULL);
 	REQUIRE(*control != NULL);
 
@@ -266,7 +266,7 @@ dns_c_ctrl_delete(dns_c_ctrl_t **control) {
 	}
 
 	ctrl->magic = 0;
-	
+
 	isc_mem_put(mem, ctrl, sizeof *ctrl);
 
 	*control = NULL;
@@ -280,22 +280,22 @@ dns_c_ctrl_print(FILE *fp, int indent, dns_c_ctrl_t *ctl) {
 	dns_c_ipmatchlist_t *iml;
 
 	REQUIRE(DNS_C_CONFCTL_VALID(ctl));
-		
+
 	(void) indent;
-	
+
 	if (ctl->control_type == dns_c_inet_control) {
 		port = isc_sockaddr_getport(&ctl->u.inet_v.addr);
 		iml = ctl->u.inet_v.matchlist;
-		
+
 		fprintf(fp, "inet ");
 		dns_c_print_ipaddr(fp,  &ctl->u.inet_v.addr);
-		
+
 		if (port == 0) {
 			fprintf(fp, " port *\n");
 		} else {
 			fprintf(fp, " port %d\n", port);
 		}
-		
+
 		dns_c_printtabs(fp, indent + 1);
 		fprintf(fp, "allow ");
 		dns_c_ipmatchlist_print(fp, indent + 2, iml);
@@ -326,7 +326,7 @@ dns_c_ctrllist_head (dns_c_ctrllist_t *list)
 	return(ISC_LIST_HEAD(list->elements));
 }
 
-	
+
 dns_c_ctrl_t *
 dns_c_ctrl_next(dns_c_ctrl_t *ctl)
 {
@@ -334,5 +334,5 @@ dns_c_ctrl_next(dns_c_ctrl_t *ctl)
 
 	return (ISC_LIST_NEXT(ctl, next));
 }
-		
-	
+
+
diff --git a/lib/dns/config/confctx.c b/lib/dns/config/confctx.c
index 694f72a1b9..3f8ed7de5d 100644
--- a/lib/dns/config/confctx.c
+++ b/lib/dns/config/confctx.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: confctx.c,v 1.78 2000/07/31 21:07:00 explorer Exp $ */
+/* $Id: confctx.c,v 1.79 2000/08/01 01:23:19 tale Exp $ */
 
 #include 
 
@@ -236,28 +236,28 @@ dns_c_checkconfig(dns_c_ctx_t *cfg)
 	dns_c_lstnlist_t       *listenlist;
 	dns_c_ctrllist_t       *controls;
 
-	
+
 	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");
 	}
 
-	
+
 	if (dns_c_ctx_getdumpfilename(cfg, &cpval) != ISC_R_NOTFOUND) {
 		isc_log_write(dns_lctx,DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_WARNING,
 			      "option 'dump-file' is not yet implemented");
 	}
-	
-		
+
+
 	if (dns_c_ctx_getmemstatsfilename(cfg, &cpval) != ISC_R_NOTFOUND) {
 		isc_log_write(dns_lctx,DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_WARNING,
 			      "option 'memstatistics-file' is not yet "
 			      "implemented");
 	}
-	
+
 
 	if (dns_c_ctx_getauthnxdomain(cfg, &bval) != ISC_R_NOTFOUND) {
 		isc_log_write(dns_lctx,DNS_LOGCATEGORY_CONFIG,
@@ -273,14 +273,14 @@ dns_c_checkconfig(dns_c_ctx_t *cfg)
 			      "option 'deallocate-on-exit' is obsolete");
 	}
 
-	
+
 	if (dns_c_ctx_getdialup(cfg, &bval) != ISC_R_NOTFOUND) {
 		isc_log_write(dns_lctx,DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_WARNING,
 			      "option 'dialup' is not yet implemented");
 	}
 
-	
+
 	if (dns_c_ctx_getfakeiquery(cfg, &bval) != ISC_R_NOTFOUND) {
 		isc_log_write(dns_lctx,DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_WARNING,
@@ -309,7 +309,7 @@ dns_c_checkconfig(dns_c_ctx_t *cfg)
 			      "implemented");
 	}
 
-	
+
 	if (dns_c_ctx_getmultiplecnames(cfg, &bval) != ISC_R_NOTFOUND) {
 		isc_log_write(dns_lctx,DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_WARNING,
@@ -348,7 +348,7 @@ dns_c_checkconfig(dns_c_ctx_t *cfg)
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_WARNING,
 			      "option 'check-names' is not yet implemented");
 	}
-	
+
 
 	if (dns_c_ctx_getblackhole(cfg, &ipml) != ISC_R_NOTFOUND) {
 		dns_c_ipmatchlist_detach(&ipml);
@@ -364,7 +364,7 @@ dns_c_checkconfig(dns_c_ctx_t *cfg)
 			      "option 'lame-ttl' is not yet "
 			      "implemented");
 	}
-	
+
 
 	if (dns_c_ctx_getminroots(cfg, &uintval) != ISC_R_NOTFOUND) {
 		isc_log_write(dns_lctx,DNS_LOGCATEGORY_CONFIG,
@@ -372,7 +372,7 @@ dns_c_checkconfig(dns_c_ctx_t *cfg)
 			      "option 'min-roots' is not yet "
 			      "implemented");
 	}
-	
+
 
 	if (dns_c_ctx_getserialqueries(cfg, &uintval) != ISC_R_NOTFOUND) {
 		isc_log_write(dns_lctx,DNS_LOGCATEGORY_CONFIG,
@@ -380,7 +380,7 @@ dns_c_checkconfig(dns_c_ctx_t *cfg)
 			      "option 'serial-queries' is not yet "
 			      "implemented");
 	}
-	
+
 
 	if (dns_c_ctx_getmaxlogsizeixfr(cfg, &uintval) != ISC_R_NOTFOUND) {
 		isc_log_write(dns_lctx,DNS_LOGCATEGORY_CONFIG,
@@ -388,7 +388,7 @@ dns_c_checkconfig(dns_c_ctx_t *cfg)
 			      "option 'max-ixfr-log-size' is not yet "
 			      "implemented");
 	}
-	
+
 
 	if (dns_c_ctx_getcoresize(cfg, &uintval) != ISC_R_NOTFOUND) {
 		isc_log_write(dns_lctx,DNS_LOGCATEGORY_CONFIG,
@@ -396,7 +396,7 @@ dns_c_checkconfig(dns_c_ctx_t *cfg)
 			      "option 'coresize' is not yet "
 			      "implemented");
 	}
-	
+
 
 	if (dns_c_ctx_getdatasize(cfg, &uintval) != ISC_R_NOTFOUND) {
 		isc_log_write(dns_lctx,DNS_LOGCATEGORY_CONFIG,
@@ -404,7 +404,7 @@ dns_c_checkconfig(dns_c_ctx_t *cfg)
 			      "option 'datasize' is not yet "
 			      "implemented");
 	}
-	
+
 
 	if (dns_c_ctx_getfiles(cfg, &uintval) != ISC_R_NOTFOUND) {
 		isc_log_write(dns_lctx,DNS_LOGCATEGORY_CONFIG,
@@ -413,14 +413,14 @@ dns_c_checkconfig(dns_c_ctx_t *cfg)
 			      "implemented");
 	}
 
-	
+
 	if (dns_c_ctx_getstacksize(cfg, &uintval) != ISC_R_NOTFOUND) {
 		isc_log_write(dns_lctx,DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_WARNING,
 			      "option 'stacksize' is not yet "
 			      "implemented");
 	}
-	
+
 
 	if (dns_c_ctx_getheartbeatinterval(cfg, &uintval) != ISC_R_NOTFOUND) {
 		isc_log_write(dns_lctx,DNS_LOGCATEGORY_CONFIG,
@@ -429,7 +429,7 @@ dns_c_checkconfig(dns_c_ctx_t *cfg)
 			      "implemented");
 	}
 
-	
+
 	if (dns_c_ctx_getstatsinterval(cfg, &uintval) != ISC_R_NOTFOUND) {
 		isc_log_write(dns_lctx,DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_WARNING,
@@ -437,7 +437,7 @@ dns_c_checkconfig(dns_c_ctx_t *cfg)
 			      "implemented");
 	}
 
-	
+
 	if (dns_c_ctx_gettopology(cfg, &ipml) != ISC_R_NOTFOUND) {
 		dns_c_ipmatchlist_detach(&ipml);
 		isc_log_write(dns_lctx,DNS_LOGCATEGORY_CONFIG,
@@ -453,13 +453,13 @@ dns_c_checkconfig(dns_c_ctx_t *cfg)
 			      "option 'sortlist' is not yet implemented");
 	}
 
-	
+
 	if (dns_c_ctx_getrrsetorderlist(cfg, &olist) != ISC_R_NOTFOUND) {
 		isc_log_write(dns_lctx,DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_WARNING,
 			      "option 'rrset-order' is not yet implemented");
 	}
-		
+
 
 	if (dns_c_ctx_getallowupdateforwarding(cfg, &ipml) != ISC_R_NOTFOUND) {
 		dns_c_ipmatchlist_detach(&ipml);
@@ -504,7 +504,7 @@ dns_c_checkconfig(dns_c_ctx_t *cfg)
 			result = tmpres;
 		}
 	}
-	
+
 
 	return (result);
 }
@@ -517,7 +517,7 @@ dns_c_ctx_new(isc_mem_t *mem, dns_c_ctx_t **cfg)
 {
 	dns_c_ctx_t *tmpcfg;
 	isc_result_t r;
-	
+
 	REQUIRE(mem != NULL);
 
 	tmpcfg = isc_mem_get(mem, sizeof *tmpcfg);
@@ -543,7 +543,7 @@ dns_c_ctx_new(isc_mem_t *mem, dns_c_ctx_t **cfg)
 
 	tmpcfg->currview = NULL;
 	tmpcfg->currzone = NULL;
-	
+
 	r = acl_init(tmpcfg);
 	if (r != ISC_R_SUCCESS) {
 		return (r);
@@ -553,17 +553,17 @@ dns_c_ctx_new(isc_mem_t *mem, dns_c_ctx_t **cfg)
 	if (r != ISC_R_SUCCESS) {
 		return (r);
 	}
-	
-	
+
+
 #if 1					/* XXX brister */
 	tmpcfg->controls = NULL;
-#else	
+#else
 	r = dns_c_ctrllist_new(mem, &tmpcfg->controls);
 	if (r != ISC_R_SUCCESS) {
 		dns_c_ctx_delete(&tmpcfg);
 		return r;
 	}
-#endif	
+#endif
 
 	*cfg = tmpcfg;
 
@@ -586,35 +586,35 @@ dns_c_ctx_delete(dns_c_ctx_t **cfg)
 
 	if (c->options != NULL)
 		dns_c_ctx_optionsdelete(&c->options);
-	
+
 	if (c->controls != NULL)
 		dns_c_ctrllist_delete(&c->controls);
-	
+
 	if (c->peers != NULL)
 		dns_peerlist_detach(&c->peers);
-	
+
 	if (c->acls != NULL)
 		dns_c_acltable_delete(&c->acls);
-	
+
 	if (c->keydefs != NULL)
 		dns_c_kdeflist_delete(&c->keydefs);
-	
+
 	if (c->zlist != NULL)
 		dns_c_zonelist_delete(&c->zlist);
-	
+
 	if (c->trusted_keys != NULL)
 		dns_c_tkeylist_delete(&c->trusted_keys);
-	
+
 	if (c->logging != NULL)
 		dns_c_logginglist_delete(&c->logging);
-	
+
 	if (c->views != NULL)
 		dns_c_viewtable_delete(&c->views);
 
 	c->magic = 0;
 	isc_mem_put(c->mem, c, sizeof *c);
 	*cfg = NULL;
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -623,7 +623,7 @@ isc_result_t
 dns_c_ctx_setcontrols(dns_c_ctx_t *cfg, dns_c_ctrllist_t *ctrls)
 {
 	isc_boolean_t existed = ISC_FALSE;
-	
+
 	REQUIRE(DNS_C_CONFCTX_VALID(cfg));
 	REQUIRE(DNS_C_CONFCTLLIST_VALID(ctrls));
 
@@ -647,9 +647,9 @@ dns_c_ctx_getcontrols(dns_c_ctx_t *cfg, dns_c_ctrllist_t **ctrls)
 	return (cfg->controls != NULL ? ISC_R_SUCCESS : ISC_R_NOTFOUND);
 }
 
-	
 
-		      
+
+
 isc_result_t
 dns_c_ctx_setcurrzone(dns_c_ctx_t *cfg, dns_c_zone_t *zone)
 {
@@ -672,7 +672,7 @@ dns_c_ctx_getcurrzone(dns_c_ctx_t *cfg)
 	return (cfg->currzone);
 }
 
-	
+
 
 isc_result_t
 dns_c_ctx_setcurrview(dns_c_ctx_t *cfg,
@@ -704,7 +704,7 @@ dns_c_ctx_getpeerlist(dns_c_ctx_t *cfg, dns_peerlist_t **retval)
 {
 	REQUIRE(DNS_C_CONFCTX_VALID(cfg));
 	REQUIRE(retval != NULL);
-	
+
 	if (cfg->peers == NULL) {
 		*retval = NULL;
 		return (ISC_R_NOTFOUND);
@@ -727,7 +727,7 @@ dns_c_ctx_unsetpeerlist(dns_c_ctx_t *cfg)
 		return (ISC_R_FAILURE);
 	}
 }
-	
+
 
 isc_result_t
 dns_c_ctx_setpeerlist(dns_c_ctx_t *cfg, dns_peerlist_t *newval)
@@ -757,38 +757,38 @@ dns_c_ctx_print(FILE *fp, int indent, dns_c_ctx_t *cfg)
 					cfg->logging, ISC_FALSE);
 		fprintf(fp,"\n");
 	}
-	
-	
+
+
 	if (cfg->keydefs != NULL) {
 		dns_c_kdeflist_print(fp, indent, cfg->keydefs);
 		fprintf(fp, "\n");
 	}
-	
+
 
 	if (cfg->trusted_keys != NULL) {
 		dns_c_tkeylist_print(fp, indent, cfg->trusted_keys);
 		fprintf(fp, "\n");
 	}
-	
+
 
 	if (cfg->acls != NULL) {
 		dns_c_acltable_print(fp, indent, cfg->acls);
 		fprintf(fp,"\n");
 	}
-	
+
 
 	if (cfg->options != NULL) {
 		dns_c_ctx_optionsprint(fp, indent, cfg->options);
 		fprintf(fp,"\n");
 	}
-	
+
 
 	if (cfg->views != NULL) {
 		dns_c_viewtable_print(fp, indent, cfg->views);
 		fprintf(fp, "\n");
 	}
-	
-	
+
+
 	if (cfg->zlist != NULL) {
 		dns_c_zonelist_print(fp, indent, cfg->zlist, NULL);
 		fprintf(fp, "\n");
@@ -798,7 +798,7 @@ dns_c_ctx_print(FILE *fp, int indent, dns_c_ctx_t *cfg)
 		dns_c_ctrllist_print(fp, indent, cfg->controls);
 		fprintf(fp, "\n");
 	}
-	
+
 
 	if (cfg->peers != NULL) {
 		dns_c_peerlist_print(fp, indent, cfg->peers);
@@ -814,25 +814,25 @@ dns_c_ctx_optionsprint(FILE *fp, int indent, dns_c_options_t *options)
 	dns_severity_t nameseverity;
 	in_port_t port;
 	in_port_t defport = DNS_C_DEFAULTPORT;
-	
+
 	REQUIRE(fp != NULL);
 
 	if (options == NULL) {
 		return;
 	}
-	
+
 	REQUIRE(DNS_C_CONFOPT_VALID(options));
 
 	if (options->port != NULL) {
 		defport = *options->port;
 	}
-	
+
 #define PRINT_INTEGER(FIELD, NAME)					\
 	if (options->FIELD != NULL) {					\
 		dns_c_printtabs(fp, indent + 1);			\
 		fprintf(fp, "%s %d;\n",NAME,(int)*options->FIELD);	\
 	}
-	
+
 #define PRINT_AS_MINUTES(FIELD, NAME)				\
 	if (options->FIELD != NULL) {				\
 		dns_c_printtabs(fp, indent + 1);		\
@@ -870,7 +870,7 @@ dns_c_ctx_optionsprint(FILE *fp, int indent, dns_c_options_t *options)
 		dns_c_printtabs(fp, indent + 1);			\
 		fprintf(fp, "%s \"%s\";\n", NAME, options->FIELD);	\
 	}
-	
+
 #define PRINT_IPANDPORT(FIELD, NAME)				\
 	if (options->FIELD != NULL) {				\
 		port = isc_sockaddr_getport(options->FIELD);	\
@@ -904,7 +904,7 @@ dns_c_ctx_optionsprint(FILE *fp, int indent, dns_c_options_t *options)
 			dns_c_transport2string(INDEX, ISC_TRUE),	    \
 			dns_c_nameseverity2string(nameseverity, ISC_TRUE)); \
 	}
-		
+
 
 #define PRINT_IPMLIST(FIELD, NAME)					 \
 	if (options->FIELD != NULL) {					 \
@@ -929,13 +929,13 @@ dns_c_ctx_optionsprint(FILE *fp, int indent, dns_c_options_t *options)
 	PRINT_CHAR_P(random_seed_file, "random-seed-file");
 
 	PRINT_INTEGER(port, "port");
-	
+
 	PRINT_INTEGER(transfers_in, "transfers-in");
 	PRINT_INTEGER(transfers_per_ns, "transfers-per-ns");
 	PRINT_INTEGER(transfers_out, "transfers-out");
 	PRINT_INTEGER(max_log_size_ixfr, "max-ixfr-log-size");
-	
-	
+
+
 	PRINT_AS_MINUTES(clean_interval, "cleaning-interval");
 	PRINT_AS_MINUTES(interface_interval, "interface-interval");
 	PRINT_AS_MINUTES(stats_interval, "statistics-interval");
@@ -952,11 +952,11 @@ dns_c_ctx_optionsprint(FILE *fp, int indent, dns_c_options_t *options)
 	PRINT_INTEGER(min_roots, "min-roots");
 	PRINT_INTEGER(serial_queries, "serial-queries");
 	PRINT_INTEGER(sig_valid_interval, "sig-validity-interval");
-	PRINT_AS_SIZE_CLAUSE(max_cache_size, "max-cache-size");	
-	
-	PRINT_AS_SIZE_CLAUSE(data_size, "datasize");	
-	PRINT_AS_SIZE_CLAUSE(stack_size, "stacksize");	
-	PRINT_AS_SIZE_CLAUSE(core_size, "coresize");	
+	PRINT_AS_SIZE_CLAUSE(max_cache_size, "max-cache-size");
+
+	PRINT_AS_SIZE_CLAUSE(data_size, "datasize");
+	PRINT_AS_SIZE_CLAUSE(stack_size, "stacksize");
+	PRINT_AS_SIZE_CLAUSE(core_size, "coresize");
 	PRINT_AS_SIZE_CLAUSE(files, "files");
 
 	PRINT_INTEGER(max_ncache_ttl, "max-ncache-ttl");
@@ -991,10 +991,10 @@ dns_c_ctx_optionsprint(FILE *fp, int indent, dns_c_options_t *options)
 			dns_c_transformat2string(*options->transfer_format,
 						 ISC_TRUE));
 	}
-	
+
 	PRINT_IP(transfer_source, "transfer-source");
 	PRINT_IP(transfer_source_v6, "transfer-source-v6");
-	
+
 	PRINT_IPANDPORT(query_source, "query-source");
 	PRINT_IPANDPORT(query_source_v6, "query-source-v6");
 
@@ -1004,11 +1004,11 @@ dns_c_ctx_optionsprint(FILE *fp, int indent, dns_c_options_t *options)
 			dns_c_addata2string(*options->additional_data,
 					    ISC_TRUE));
 	}
-		
+
 	PRINT_CHECKNAME(dns_trans_primary);
 	PRINT_CHECKNAME(dns_trans_secondary);
 	PRINT_CHECKNAME(dns_trans_response);
-	
+
 	fprintf(fp, "\n");
 
 	PRINT_IPMLIST(queryacl, "allow-query");
@@ -1018,19 +1018,19 @@ dns_c_ctx_optionsprint(FILE *fp, int indent, dns_c_options_t *options)
 	PRINT_IPMLIST(topology, "topology");
 	PRINT_IPMLIST(sortlist, "sortlist");
 	PRINT_IPMLIST(allowupdateforwarding, "allow-update-forwarding");
-	
+
 	if (options->listens != NULL) {
 		dns_c_lstnlist_print(fp, indent + 1,
 				     options->listens,
 				     defport);
 	}
-	
+
 	if (options->v6listens != NULL) {
 		dns_c_lstnlistv6_print(fp, indent + 1,
 				       options->v6listens,
 				       defport);
 	}
-	
+
 	dns_c_ctx_forwarderprint(fp, indent + 1, options);
 
 	if (options->ordering != NULL) {
@@ -1044,7 +1044,7 @@ dns_c_ctx_optionsprint(FILE *fp, int indent, dns_c_options_t *options)
 					options->also_notify);
 		fprintf(fp, ";\n");
 	}
-	
+
 	PRINT_CHAR_P(tkeydomain, "tkey-domain");
 
 	if (options->tkeydhkeycp != NULL) {
@@ -1052,7 +1052,7 @@ dns_c_ctx_optionsprint(FILE *fp, int indent, dns_c_options_t *options)
 		fprintf(fp, "tkey-dhkey \"%s\" %d ;\n",
 			options->tkeydhkeycp, options->tkeydhkeyi);
 	}
-	
+
 
 	dns_c_printtabs(fp, indent);
 	fprintf(fp,"};\n");
@@ -1064,9 +1064,9 @@ dns_c_ctx_optionsprint(FILE *fp, int indent, dns_c_options_t *options)
 #undef PRINT_CHAR_P
 #undef PRINT_IPMLIST
 #undef PRINT_IPANDPORT
-#undef PRINT_IP	
+#undef PRINT_IP
 #undef PRINT_CHECKNAME
-	
+
 }
 
 void
@@ -1104,13 +1104,13 @@ dns_c_ctx_getoptions(dns_c_ctx_t *cfg, dns_c_options_t **options)
 {
 	REQUIRE(DNS_C_CONFCTX_VALID(cfg));
 	REQUIRE(options != NULL);
-	
+
 	if (cfg->options != NULL) {
 		REQUIRE(DNS_C_CONFOPT_VALID(cfg->options));
 	}
-	
+
 	*options = cfg->options;
-	
+
 	return (cfg->options == NULL ? ISC_R_NOTFOUND : ISC_R_SUCCESS);
 }
 
@@ -1124,7 +1124,7 @@ dns_c_ctx_unsetoptions(dns_c_ctx_t *cfg)
 	}
 
 	REQUIRE(DNS_C_CONFOPT_VALID(cfg->options));
-	
+
 	dns_c_ctx_optionsdelete(&cfg->options);
 
 	return (ISC_R_SUCCESS);
@@ -1151,11 +1151,11 @@ dns_c_ctx_setlogging(dns_c_ctx_t *cfg, dns_c_logginglist_t *newval,
 	dns_c_logginglist_t *ll;
 	isc_result_t res;
 	isc_boolean_t existed;
-	
+
 	REQUIRE(DNS_C_CONFCTX_VALID(cfg));
 
 	existed = ISC_TF(cfg->logging != NULL);
-	
+
 	if (deepcopy) {
 		res = dns_c_logginglist_copy(cfg->mem, &ll, newval);
 		if (res != ISC_R_SUCCESS) {
@@ -1164,7 +1164,7 @@ dns_c_ctx_setlogging(dns_c_ctx_t *cfg, dns_c_logginglist_t *newval,
 	} else {
 		ll = newval;
 	}
-	
+
 	cfg->logging = ll;
 
 	return (existed ? ISC_R_EXISTS : ISC_R_SUCCESS);
@@ -1183,7 +1183,7 @@ dns_c_ctx_unsetlogging(dns_c_ctx_t *cfg)
 	return (dns_c_logginglist_delete(&cfg->logging));
 }
 
-	
+
 
 isc_result_t
 dns_c_ctx_getkdeflist(dns_c_ctx_t *cfg,
@@ -1193,7 +1193,7 @@ dns_c_ctx_getkdeflist(dns_c_ctx_t *cfg,
         REQUIRE(retval != NULL);
 
 	*retval = cfg->keydefs;
-	
+
         if (cfg->keydefs == NULL) {
 		return (ISC_R_NOTFOUND);
 	} else {
@@ -1207,13 +1207,13 @@ dns_c_ctx_setkdeflist(dns_c_ctx_t *cfg,
 		      dns_c_kdeflist_t *newval, isc_boolean_t deepcopy)
 {
 	isc_result_t res;
-	
+
 	REQUIRE(DNS_C_CONFCTX_VALID(cfg));
 
 	if (cfg->keydefs != NULL) {
 		dns_c_kdeflist_delete(&cfg->keydefs);
 	}
-	
+
 	if (newval == NULL) {
 		cfg->keydefs = NULL;
 		res = ISC_R_SUCCESS;
@@ -1228,7 +1228,7 @@ dns_c_ctx_setkdeflist(dns_c_ctx_t *cfg,
 	return (res);
 }
 
-	
+
 isc_result_t
 dns_c_ctx_addfile_channel(dns_c_ctx_t *cfg, const char *name,
 			  dns_c_logchan_t **chan)
@@ -1278,7 +1278,7 @@ dns_c_ctx_addsyslogchannel(dns_c_ctx_t *cfg, const char *name,
 					   ISC_FALSE);
 
 	*chan = newc;
-	
+
 	return (res);
 }
 
@@ -1305,7 +1305,7 @@ dns_c_ctx_addnullchannel(dns_c_ctx_t *cfg, const char *name,
 					   ISC_FALSE);
 
 	*chan = newc;
-	
+
 	return (res);
 }
 
@@ -1330,7 +1330,7 @@ dns_c_ctx_addstderrchannel(dns_c_ctx_t *cfg, const char *name,
 	res = dns_c_logginglist_addchannel(cfg->logging, newc, ISC_FALSE);
 
 	*chan = newc;
-	
+
 	return (res);
 }
 
@@ -1350,12 +1350,12 @@ dns_c_ctx_addcategory(dns_c_ctx_t *cfg, const char *catname,
 	if (res != ISC_R_SUCCESS) {
 		return (res);
 	}
-	
+
 	res = dns_c_logginglist_addcategory(cfg->logging, newc,
 					    ISC_FALSE);
 
 	*newcat = newc;
-	
+
 	return (res);
 }
 
@@ -1372,7 +1372,7 @@ dns_c_ctx_currchannel(dns_c_ctx_t *cfg, dns_c_logchan_t **channel)
 	newc = ISC_LIST_TAIL(cfg->logging->channels);
 
 	*channel = newc;
-	
+
 	return (newc == NULL ? ISC_R_NOTFOUND : ISC_R_SUCCESS);
 }
 
@@ -1412,7 +1412,7 @@ dns_c_ctx_currcategory(dns_c_ctx_t *cfg, dns_c_logcat_t **category)
 	newc = ISC_LIST_TAIL(llist->categories);
 
 	*category = newc;
-	
+
 	return (newc == NULL ? ISC_R_NOTFOUND : ISC_R_SUCCESS);
 }
 
@@ -1432,7 +1432,7 @@ dns_c_ctx_optionsnew(isc_mem_t *mem, dns_c_options_t **options)
 	REQUIRE(options != NULL);
 
 	*options = NULL;
-	
+
 	opts = isc_mem_get(mem, sizeof *opts);
 	if (opts == NULL) {
 		return (ISC_R_NOMEMORY);
@@ -1452,7 +1452,7 @@ dns_c_ctx_optionsnew(isc_mem_t *mem, dns_c_options_t **options)
 	opts->random_seed_file = NULL;
 
 	opts->port = NULL;
-	
+
 	opts->transfers_in = NULL;
 	opts->transfers_per_ns = NULL;
 	opts->transfers_out = NULL;
@@ -1461,7 +1461,7 @@ dns_c_ctx_optionsnew(isc_mem_t *mem, dns_c_options_t **options)
 	opts->interface_interval = NULL;
 	opts->stats_interval = NULL;
 	opts->heartbeat_interval = NULL;
-	
+
 	opts->max_transfer_time_in = NULL;
 	opts->max_transfer_time_out = NULL;
 	opts->max_transfer_idle_in = NULL;
@@ -1472,7 +1472,7 @@ dns_c_ctx_optionsnew(isc_mem_t *mem, dns_c_options_t **options)
 	opts->min_roots = NULL;
 	opts->serial_queries = NULL;
 	opts->sig_valid_interval = NULL;
-	
+
 	opts->data_size = NULL;
 	opts->stack_size = NULL;
 	opts->core_size = NULL;
@@ -1480,7 +1480,7 @@ dns_c_ctx_optionsnew(isc_mem_t *mem, dns_c_options_t **options)
 	opts->max_cache_size = NULL;
 	opts->max_ncache_ttl = NULL;
 	opts->max_cache_ttl = NULL;
-	
+
 	opts->expert_mode = NULL;
 	opts->fake_iquery = NULL;
 	opts->recursion = NULL;
@@ -1513,7 +1513,7 @@ dns_c_ctx_optionsnew(isc_mem_t *mem, dns_c_options_t **options)
 	opts->tkeydhkeycp = NULL;
 	opts->tkeydhkeyi = 0;
 	opts->tkeydomain = NULL;
-	
+
 	opts->also_notify = NULL;
 
 	opts->check_names[dns_trans_primary] = NULL;
@@ -1521,7 +1521,7 @@ dns_c_ctx_optionsnew(isc_mem_t *mem, dns_c_options_t **options)
 	opts->check_names[dns_trans_response] = NULL;
 
 	opts->transfer_format = NULL;
-	
+
 	opts->queryacl = NULL;
 	opts->transferacl = NULL;
 	opts->recursionacl = NULL;
@@ -1529,16 +1529,16 @@ dns_c_ctx_optionsnew(isc_mem_t *mem, dns_c_options_t **options)
 	opts->topology = NULL;
 	opts->sortlist = NULL;
 	opts->allowupdateforwarding = NULL;
-	
+
 	opts->listens = NULL;
 	opts->v6listens = NULL;
-	
+
 	opts->ordering = NULL;
 
 	opts->forwarders = NULL;
 
 	*options = opts;
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -1548,14 +1548,14 @@ dns_c_ctx_optionsdelete(dns_c_options_t **opts)
 {
 	dns_c_options_t *options;
 	isc_result_t r, result;
-	
+
 	REQUIRE(opts != NULL);
 
 	options = *opts;
 	if (options == NULL) {
 		return (ISC_R_SUCCESS);
 	}
-	
+
 	REQUIRE(DNS_C_CONFOPT_VALID(options));
 
 
@@ -1575,8 +1575,8 @@ dns_c_ctx_optionsdelete(dns_c_options_t **opts)
 	do { if (options->FIELD != NULL) {				\
 		(void)dns_c_ipmatchlist_detach(&options->FIELD);	\
 	} } while (0)
-	
-	
+
+
 
 	FREESTRING(directory);
 	FREESTRING(version);
@@ -1588,7 +1588,7 @@ dns_c_ctx_optionsdelete(dns_c_options_t **opts)
 	FREESTRING(random_device);
 	FREESTRING(random_seed_file);
 
-	
+
 	FREEFIELD(expert_mode);
 	FREEFIELD(fake_iquery);
 	FREEFIELD(recursion);
@@ -1609,9 +1609,9 @@ dns_c_ctx_optionsdelete(dns_c_options_t **opts)
 	FREEFIELD(treat_cr_as_space);
 	FREEFIELD(additional_from_cache);
 	FREEFIELD(additional_from_auth);
-	
+
 	FREEFIELD(port);
-	
+
 	FREEFIELD(transfers_in);
 	FREEFIELD(transfers_per_ns);
 	FREEFIELD(transfers_out);
@@ -1647,10 +1647,10 @@ dns_c_ctx_optionsdelete(dns_c_options_t **opts)
 
 	FREEFIELD(additional_data);
 	FREEFIELD(forward);
-	
+
 	FREESTRING(tkeydomain);
 	FREESTRING(tkeydhkeycp);
-	
+
 	if (options->also_notify != NULL) {
 		dns_c_iplist_detach(&options->also_notify);
 	}
@@ -1668,7 +1668,7 @@ dns_c_ctx_optionsdelete(dns_c_options_t **opts)
 	FREEIPMLIST(topology);
 	FREEIPMLIST(sortlist);
 	FREEIPMLIST(allowupdateforwarding);
-	
+
 	result = ISC_R_SUCCESS;
 
 	if (options->listens != NULL) {
@@ -1676,30 +1676,30 @@ dns_c_ctx_optionsdelete(dns_c_options_t **opts)
 		if (r != ISC_R_SUCCESS)
 			result = r;
 	}
-	
+
 	if (options->v6listens != NULL) {
 		r = dns_c_lstnlist_delete(&options->v6listens);
 		if (r != ISC_R_SUCCESS)
 			result = r;
 	}
-	
+
 	if (options->ordering != NULL) {
 		r = dns_c_rrsolist_delete(&options->ordering);
 		if (r != ISC_R_SUCCESS)
 			result = r;
 	}
-	
+
 	if (options->forwarders != NULL) {
 		r = dns_c_iplist_detach(&options->forwarders);
 		if (r != ISC_R_SUCCESS)
 			result = r;
 	}
-	
+
 	*opts = NULL;
 	options->magic = 0;
-	
+
 	isc_mem_put(options->mem, options, sizeof *options);
-	
+
 	return (result);
 
 #undef FREEFIELD
@@ -1979,12 +1979,12 @@ GETBOOL(additionalfromauth, additional_from_auth)
 SETBOOL(additionalfromauth, additional_from_auth)
 UNSETBOOL(additionalfromauth, additional_from_auth)
 
-	
+
 GETBOOL(additionalfromcache, additional_from_cache)
 SETBOOL(additionalfromcache, additional_from_cache)
 UNSETBOOL(additionalfromcache, additional_from_cache)
 
-	
+
 GETSOCKADDR(transfersource, transfer_source)
 SETSOCKADDR(transfersource, transfer_source)
 UNSETSOCKADDR(transfersource, transfer_source)
@@ -2021,7 +2021,7 @@ UNSETBYTYPE(dns_c_addata_t, additionaldata, additional_data)
 
 
 
-	
+
 
 
 /*
@@ -2035,14 +2035,14 @@ isc_result_t
 dns_c_ctx_settkeydomain(dns_c_ctx_t *cfg, const char *newval)
 {
 	isc_result_t res;
-	
+
 	REQUIRE(DNS_C_CONFCTX_VALID(cfg));
 
 	res = make_options(cfg);
 	if (res != ISC_R_SUCCESS) {
 		return (res);
 	}
-	
+
 	return (cfg_set_string(cfg->options,
 			       &cfg->options->tkeydomain,
 			       newval));
@@ -2054,7 +2054,7 @@ dns_c_ctx_settkeydhkey(dns_c_ctx_t *cfg,
 		       const char *charval, isc_uint32_t uintval)
 {
 	isc_result_t res;
-	
+
 	REQUIRE(DNS_C_CONFCTX_VALID(cfg));
 
 	res = make_options(cfg);
@@ -2081,7 +2081,7 @@ dns_c_ctx_setchecknames(dns_c_ctx_t *cfg,
 	isc_boolean_t existed = ISC_FALSE;
 	isc_result_t res;
 	dns_severity_t **ptr = NULL;
-	
+
 	REQUIRE(DNS_C_CONFCTX_VALID(cfg));
 
 	res = make_options(cfg);
@@ -2110,7 +2110,7 @@ dns_c_ctx_setchecknames(dns_c_ctx_t *cfg,
 	}
 
 	**ptr = newval;
-	
+
 	return (existed ? ISC_R_EXISTS : ISC_R_SUCCESS);
 }
 
@@ -2121,13 +2121,13 @@ dns_c_ctx_getchecknames(dns_c_ctx_t *cfg,
 			dns_severity_t *retval)
 {
 	isc_result_t result;
-	dns_severity_t **ptr = NULL;	
+	dns_severity_t **ptr = NULL;
 	REQUIRE(DNS_C_CONFCTX_VALID(cfg));
 
 	if (cfg->options == NULL) {
 		return (ISC_R_NOTFOUND);
 	}
-	
+
 	REQUIRE(retval != NULL);
 
 	switch (transtype) {
@@ -2136,7 +2136,7 @@ dns_c_ctx_getchecknames(dns_c_ctx_t *cfg,
 	case dns_trans_response:
 		ptr = &cfg->options->check_names[transtype];
 		break;
-		
+
 	default:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -2161,7 +2161,7 @@ dns_c_ctx_unsetchecknames(dns_c_ctx_t *cfg,
 {
 	isc_result_t res;
 	dns_severity_t **ptr = NULL;
-	
+
 	REQUIRE(DNS_C_CONFCTX_VALID(cfg));
 
 	res = make_options(cfg);
@@ -2186,7 +2186,7 @@ dns_c_ctx_unsetchecknames(dns_c_ctx_t *cfg,
 	if (*ptr == NULL) {
 		return (ISC_R_NOTFOUND);
 	}
-	
+
 	isc_mem_put(cfg->options->mem, *ptr, sizeof (**ptr));
 
 	return (ISC_R_SUCCESS);
@@ -2265,7 +2265,7 @@ SETIPMLIST(allowquery, queryacl)
 UNSETIPMLIST(allowquery, queryacl)
 GETIPMLIST(allowquery, queryacl)
 
-	
+
 SETIPMLIST(allowtransfer, transferacl)
 UNSETIPMLIST(allowtransfer, transferacl)
 GETIPMLIST(allowtransfer, transferacl)
@@ -2275,12 +2275,12 @@ SETIPMLIST(allowrecursion, recursionacl)
 UNSETIPMLIST(allowrecursion, recursionacl)
 GETIPMLIST(allowrecursion, recursionacl)
 
-	
+
 SETIPMLIST(blackhole, blackhole)
 UNSETIPMLIST(blackhole, blackhole)
 GETIPMLIST(blackhole, blackhole)
 
-	
+
 SETIPMLIST(topology, topology)
 UNSETIPMLIST(topology, topology)
 GETIPMLIST(topology, topology)
@@ -2295,7 +2295,7 @@ SETIPMLIST(allowupdateforwarding, allowupdateforwarding)
 UNSETIPMLIST(allowupdateforwarding, allowupdateforwarding)
 GETIPMLIST(allowupdateforwarding, allowupdateforwarding)
 
-	
+
 
 
 isc_result_t
@@ -2312,11 +2312,11 @@ dns_c_ctx_setrrsetorderlist(dns_c_ctx_t *cfg, isc_boolean_t copy,
 	if (res != ISC_R_SUCCESS) {
 		return (res);
 	}
-	
+
 	opts = cfg->options;
 
 	existed = (opts->ordering == NULL ? ISC_FALSE : ISC_TRUE);
-	
+
 	if (copy) {
 		if (opts->ordering == NULL) {
 			res = dns_c_rrsolist_new(opts->mem,
@@ -2327,13 +2327,13 @@ dns_c_ctx_setrrsetorderlist(dns_c_ctx_t *cfg, isc_boolean_t copy,
 		} else {
 			dns_c_rrsolist_clear(opts->ordering);
 		}
-		
+
 		res = dns_c_rrsolist_append(opts->ordering, olist);
 	} else {
 		if (opts->ordering != NULL) {
 			dns_c_rrsolist_delete(&opts->ordering);
 		}
-		
+
 		opts->ordering = olist;
 		res = ISC_R_SUCCESS;
 	}
@@ -2341,7 +2341,7 @@ dns_c_ctx_setrrsetorderlist(dns_c_ctx_t *cfg, isc_boolean_t copy,
 	if (res == ISC_R_SUCCESS && existed) {
 		res = ISC_R_EXISTS;
 	}
-	
+
 	return (res);
 }
 
@@ -2353,7 +2353,7 @@ dns_c_ctx_settrustedkeys(dns_c_ctx_t *cfg, dns_c_tkeylist_t *list,
 	isc_boolean_t existed;
 	dns_c_tkeylist_t *newl;
 	isc_result_t res;
-	
+
 	REQUIRE(DNS_C_CONFCTX_VALID(cfg));
 
 	existed = (cfg->trusted_keys == NULL ? ISC_FALSE : ISC_TRUE);
@@ -2364,7 +2364,7 @@ dns_c_ctx_settrustedkeys(dns_c_ctx_t *cfg, dns_c_tkeylist_t *list,
 			return (res);
 		}
 	}
-	
+
 	if (copy) {
 		res = dns_c_tkeylist_copy(cfg->mem, &newl, list);
 		if (res != ISC_R_SUCCESS) {
@@ -2394,7 +2394,7 @@ dns_c_ctx_gettkeydomain(dns_c_ctx_t *cfg, char **retval)
 	if (cfg->options == NULL) {
 		return (ISC_R_NOTFOUND);
 	}
-	
+
 	REQUIRE(DNS_C_CONFOPT_VALID(cfg->options));
 
 	*retval = cfg->options->tkeydomain;
@@ -2416,7 +2416,7 @@ dns_c_ctx_gettkeydhkey(dns_c_ctx_t *cfg,
 	if (cfg->options == NULL) {
 		return (ISC_R_NOTFOUND);
 	}
-	
+
 	REQUIRE(DNS_C_CONFOPT_VALID(cfg->options));
 
 	if (cfg->options->tkeydhkeycp == NULL) {
@@ -2447,7 +2447,7 @@ dns_c_ctx_addlisten_on(dns_c_ctx_t *cfg, in_port_t port,
 	if (res != ISC_R_SUCCESS) {
 		return (res);
 	}
-	
+
 	opts = cfg->options;
 
 	if (opts->listens == NULL) {
@@ -2457,7 +2457,7 @@ dns_c_ctx_addlisten_on(dns_c_ctx_t *cfg, in_port_t port,
 		}
 	}
 
-#if 0	
+#if 0
 	lo = ISC_LIST_HEAD(opts->listens->elements);
 	while (lo != NULL) {
 		/* XXX we should probably check that a listen on statement
@@ -2469,13 +2469,13 @@ dns_c_ctx_addlisten_on(dns_c_ctx_t *cfg, in_port_t port,
 		}
 		lo = ISC_LIST_NEXT(lo, next);
 	}
-#endif	
+#endif
 
 	res = dns_c_lstnon_new(cfg->mem, &lo);
 	if (res != ISC_R_SUCCESS) {
 		return (res);
 	}
-	
+
 	lo->port = port;
 	res = dns_c_lstnon_setiml(lo, ml, copy);
 
@@ -2494,7 +2494,7 @@ dns_c_ctx_getlistenlist(dns_c_ctx_t *cfg, dns_c_lstnlist_t **ll)
 	if (cfg->options == NULL) {
 		return (ISC_R_NOTFOUND);
 	}
-	
+
 	REQUIRE(ll != NULL);
 
 	*ll = NULL;
@@ -2523,7 +2523,7 @@ dns_c_ctx_addv6listen_on(dns_c_ctx_t *cfg, in_port_t port,
 	if (res != ISC_R_SUCCESS) {
 		return (res);
 	}
-	
+
 	opts = cfg->options;
 
 	if (opts->v6listens == NULL) {
@@ -2533,7 +2533,7 @@ dns_c_ctx_addv6listen_on(dns_c_ctx_t *cfg, in_port_t port,
 		}
 	}
 
-#if 0	
+#if 0
 	lo = ISC_LIST_HEAD(opts->v6listens->elements);
 	while (lo != NULL) {
 		/* XXX we should probably check that a listen on statement
@@ -2545,13 +2545,13 @@ dns_c_ctx_addv6listen_on(dns_c_ctx_t *cfg, in_port_t port,
 		}
 		lo = ISC_LIST_NEXT(lo, next);
 	}
-#endif	
+#endif
 
 	res = dns_c_lstnon_new(cfg->mem, &lo);
 	if (res != ISC_R_SUCCESS) {
 		return (res);
 	}
-	
+
 	lo->port = port;
 	res = dns_c_lstnon_setiml(lo, ml, copy);
 
@@ -2570,7 +2570,7 @@ dns_c_ctx_getv6listenlist(dns_c_ctx_t *cfg, dns_c_lstnlist_t **ll)
 	if (cfg->options == NULL) {
 		return (ISC_R_NOTFOUND);
 	}
-	
+
 	REQUIRE(ll != NULL);
 
 	*ll = NULL;
@@ -2592,14 +2592,14 @@ dns_c_ctx_setforwarders(dns_c_ctx_t *cfg, isc_boolean_t copy,
 			dns_c_iplist_t *ipl)
 {
 	isc_result_t res;
-	
+
 	REQUIRE(DNS_C_CONFCTX_VALID(cfg));
 
 	res = make_options(cfg);
 	if (res != ISC_R_SUCCESS) {
 		return (res);
 	}
-	
+
 	res = cfg_set_iplist(cfg->options, &cfg->options->forwarders,
 			     ipl, copy);
 
@@ -2615,7 +2615,7 @@ dns_c_ctx_getforwarders(dns_c_ctx_t *cfg, dns_c_iplist_t **list)
 	if (cfg->options == NULL) {
 		return (ISC_R_NOTFOUND);
 	}
-	
+
 	REQUIRE(list != NULL);
 
 	return (cfg_get_iplist(cfg->options,
@@ -2680,14 +2680,14 @@ dns_c_ctx_setalsonotify(dns_c_ctx_t *cfg,
 			dns_c_iplist_t *iml)
 {
 	isc_result_t result;
-	
+
 	REQUIRE(DNS_C_CONFCTX_VALID(cfg));
 
 	result = make_options(cfg);
 	if (result != ISC_R_SUCCESS) {
 		return (result);
 	}
-	
+
 	REQUIRE(iml != NULL);
 
 	if (cfg->options->also_notify != NULL)
@@ -2697,7 +2697,7 @@ dns_c_ctx_setalsonotify(dns_c_ctx_t *cfg,
 
 	return (ISC_R_SUCCESS);
 }
-	
+
 
 isc_result_t
 dns_c_ctx_getalsonotify(dns_c_ctx_t *cfg, dns_c_iplist_t **ret)
@@ -2707,7 +2707,7 @@ dns_c_ctx_getalsonotify(dns_c_ctx_t *cfg, dns_c_iplist_t **ret)
 	if (cfg->options == NULL || cfg->options->also_notify == NULL) {
 		return (ISC_R_NOTFOUND);
 	}
-	
+
 	REQUIRE(ret != NULL);
 
 	dns_c_iplist_attach(cfg->options->also_notify, ret);
@@ -2727,7 +2727,7 @@ dns_c_ctx_unsetalsonotify(dns_c_ctx_t *cfg)
 	}
 
 	REQUIRE(DNS_C_CONFOPT_VALID(cfg->options));
-	
+
 	if (cfg->options->also_notify != NULL) {
 		dns_c_iplist_detach(&cfg->options->also_notify);
 		return (ISC_R_SUCCESS);
@@ -2752,7 +2752,7 @@ dns_c_ctx_keydefinedp(dns_c_ctx_t *cfg, const char *keyname)
 	REQUIRE(DNS_C_CONFCTX_VALID(cfg));
 	REQUIRE(keyname != NULL);
 	REQUIRE(*keyname != '\0');
-	
+
 	if (cfg->keydefs != NULL) {
 		res = dns_c_kdeflist_find(cfg->keydefs, keyname, &keyid);
 		if (res == ISC_R_SUCCESS) {
@@ -2785,7 +2785,7 @@ cfg_set_string(dns_c_options_t *options, char **field, const char *newval)
 	if (p != NULL) {
 		existed = ISC_TRUE;
 	}
-	
+
 	if (newval == NULL) {
 		if (p != NULL) {
 			isc_mem_free(options->mem, p);
@@ -2820,14 +2820,14 @@ cfg_set_iplist(dns_c_options_t *options,
 {
 	isc_result_t res;
 	isc_boolean_t existed = ISC_FALSE;
-	
+
 	REQUIRE(DNS_C_CONFOPT_VALID(options));
 	REQUIRE(fieldaddr != NULL);
 
 	if (*fieldaddr != NULL) {
 		existed = ISC_TRUE;
 	}
-	
+
 	if (newval == NULL) {
 		res = dns_c_iplist_new(options->mem,
 				       newval->size,
@@ -2836,7 +2836,7 @@ cfg_set_iplist(dns_c_options_t *options,
 		if (*fieldaddr != NULL) {
 			dns_c_iplist_detach(fieldaddr);
 		}
-		
+
 		res = dns_c_iplist_copy(options->mem, fieldaddr,
 					newval);
 	} else {
@@ -2845,17 +2845,17 @@ cfg_set_iplist(dns_c_options_t *options,
 			if (res != ISC_R_SUCCESS) {
 				return (res);
 			}
-		} 
+		}
 
 		res = ISC_R_SUCCESS;
-		
+
 		*fieldaddr = newval;
 	}
 
 	if (res == ISC_R_SUCCESS && existed) {
 		res = ISC_R_EXISTS;
 	}
-	
+
 	return (res);
 }
 
@@ -2873,7 +2873,7 @@ cfg_get_iplist(dns_c_options_t *options,
 	isc_result_t res;
 
 	UNUSED(options);
-	
+
 	REQUIRE(DNS_C_CONFOPT_VALID(options));
 	REQUIRE(resval != NULL);
 
@@ -2909,7 +2909,7 @@ static isc_result_t
 logging_init (dns_c_ctx_t *cfg)
 {
 	isc_result_t res;
-	
+
 	REQUIRE(DNS_C_CONFCTX_VALID(cfg));
 	REQUIRE(cfg->logging == NULL);
 
@@ -2935,7 +2935,7 @@ make_options(dns_c_ctx_t *cfg)
 			return (res);
 		}
 	}
-	
+
 	REQUIRE(DNS_C_CONFOPT_VALID(cfg->options));
 
 	return (res);
diff --git a/lib/dns/config/confip.c b/lib/dns/config/confip.c
index dceaf700b1..bd07633927 100644
--- a/lib/dns/config/confip.c
+++ b/lib/dns/config/confip.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: confip.c,v 1.31 2000/07/27 09:47:02 tale Exp $ */
+/* $Id: confip.c,v 1.32 2000/08/01 01:23:20 tale Exp $ */
 
 #include 
 
@@ -65,7 +65,7 @@ isc_boolean_t
 dns_c_ipmatchelement_isneg(dns_c_ipmatchelement_t *elem) {
 
 	REQUIRE(DNS_C_IPMELEM_VALID(elem));
-	
+
 	return (ISC_TF((elem->flags & DNS_C_IPMATCH_NEGATE) ==
 			DNS_C_IPMATCH_NEGATE));
 }
@@ -73,15 +73,15 @@ dns_c_ipmatchelement_isneg(dns_c_ipmatchelement_t *elem) {
 isc_result_t
 dns_c_ipmatchelement_delete(isc_mem_t *mem, dns_c_ipmatchelement_t **ipme) {
 	dns_c_ipmatchelement_t *elem;
-	
+
 	REQUIRE(mem != NULL);
 	REQUIRE(ipme != NULL);
 	REQUIRE(*ipme != NULL);
-	
+
 	elem = *ipme;
 
 	REQUIRE(DNS_C_IPMELEM_VALID(elem));
-	
+
 	switch (elem->type) {
 	case dns_c_ipmatch_localhost:
 	case dns_c_ipmatch_localnets:
@@ -124,7 +124,7 @@ dns_c_ipmatchelement_delete(isc_mem_t *mem, dns_c_ipmatchelement_t **ipme) {
 	isc_mem_put(mem, elem, sizeof *elem);
 
 	*ipme = NULL;
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -139,7 +139,7 @@ dns_c_ipmatchelement_copy(isc_mem_t *mem,
 	REQUIRE(mem != NULL);
 	REQUIRE(dest != NULL);
 	REQUIRE(DNS_C_IPMELEM_VALID(src));
-		
+
 	result = dns_c_ipmatchelement_new(mem, &newel);
 	if (result != ISC_R_SUCCESS) {
 		return (result);
@@ -147,7 +147,7 @@ dns_c_ipmatchelement_copy(isc_mem_t *mem,
 
 	newel->type = src->type;
 	newel->flags = src->flags;
-	
+
 	switch(src->type) {
 	case dns_c_ipmatch_pattern:
 		newel->u.direct.address = src->u.direct.address;
@@ -158,7 +158,7 @@ dns_c_ipmatchelement_copy(isc_mem_t *mem,
 		result = dns_c_ipmatchlist_copy(mem,
 						&newel->u.indirect.list,
 						src->u.indirect.list);
-		break;	
+		break;
 
 	case dns_c_ipmatch_localhost:
 		break;
@@ -173,7 +173,7 @@ dns_c_ipmatchelement_copy(isc_mem_t *mem,
 	case dns_c_ipmatch_acl:
 		newel->u.aclname = isc_mem_strdup(mem, src->u.aclname);
 		break;
-		
+
 	case dns_c_ipmatch_any:
 		break;
 
@@ -185,7 +185,7 @@ dns_c_ipmatchelement_copy(isc_mem_t *mem,
 	}
 
 	*dest = newel;
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -327,7 +327,7 @@ dns_c_ipmatchindirect_new(isc_mem_t *mem,
 	} else {
 		dns_c_ipmatchlist_detach(&iml_copy);
 	}
-	
+
 	*result = ime;
 
 	return (res);
@@ -450,7 +450,7 @@ dns_c_ipmatchlist_new(isc_mem_t *mem, dns_c_ipmatchlist_t **ptr) {
 	newlist->magic = DNS_C_IPMLIST_MAGIC;
 	newlist->mem = mem;
 	newlist->refcount = 1;
-	
+
 	ISC_LIST_INIT(newlist->elements);
 
 	*ptr = newlist;
@@ -467,7 +467,7 @@ dns_c_ipmatchlist_detach(dns_c_ipmatchlist_t **ml) {
 
 	REQUIRE(ml != NULL);
 	REQUIRE(*ml != NULL);
-	
+
 	iml = *ml;
 	*ml = NULL;
 
@@ -478,7 +478,7 @@ dns_c_ipmatchlist_detach(dns_c_ipmatchlist_t **ml) {
 	if (iml->refcount > 0) {
 		return (ISC_R_SUCCESS);
 	}
-	
+
 	mem = iml->mem;
 	INSIST(mem != NULL);
 
@@ -486,7 +486,7 @@ dns_c_ipmatchlist_detach(dns_c_ipmatchlist_t **ml) {
 	while (ime != NULL) {
 		iptr = ISC_LIST_NEXT(ime, next);
 		dns_c_ipmatchelement_delete(mem, &ime);
-		
+
 		ime = iptr;
 	}
 
@@ -501,7 +501,7 @@ dns_c_ipmatchlist_attach(dns_c_ipmatchlist_t *source,
 {
 
 	REQUIRE(DNS_C_IPMLIST_VALID(source));
-	
+
 	INSIST(source->refcount > 0);
 
 	source->refcount++;
@@ -515,7 +515,7 @@ dns_c_ipmatchlist_empty(dns_c_ipmatchlist_t *ipml) {
 	isc_result_t res = ISC_R_SUCCESS;
 
 	REQUIRE(DNS_C_IPMLIST_VALID(ipml));
-	
+
 	ime = ISC_LIST_HEAD(ipml->elements);
 	while (ime != NULL) {
 		imptmp = ISC_LIST_NEXT(ime, next);
@@ -525,7 +525,7 @@ dns_c_ipmatchlist_empty(dns_c_ipmatchlist_t *ipml) {
 		}
 		ime = imptmp;
 	}
-	
+
 	return (res);
 }
 
@@ -556,7 +556,7 @@ dns_c_ipmatchlist_copy(isc_mem_t *mem,
 			dns_c_ipmatchlist_detach(&newlist);
 			return (result);
 		}
-		
+
 		ISC_LIST_APPEND(newlist->elements, ptr, next);
 
 		ime = ISC_LIST_NEXT(ime, next);
@@ -573,7 +573,7 @@ dns_c_ipmatchlist_equal(dns_c_ipmatchlist_t *l1, dns_c_ipmatchlist_t *l2) {
 
 	REQUIRE(l1 == NULL || DNS_C_IPMLIST_VALID(l1));
 	REQUIRE(l2 == NULL || DNS_C_IPMLIST_VALID(l2));
-	
+
 	if (l1 == NULL && l2 == NULL)
 		return (ISC_TRUE);
 	if (l1 != NULL || l2 != NULL)
@@ -617,7 +617,7 @@ dns_c_ipmatchlist_append(dns_c_ipmatchlist_t *dest,
 		if (negate) {
 			dns_c_ipmatch_negate(ime_copy);
 		}
-		
+
 		ISC_LIST_APPEND(dest->elements, ime_copy, next);
 
 		ime = ISC_LIST_NEXT(ime, next);
@@ -645,7 +645,7 @@ dns_c_ipmatchelement_print(FILE *fp, int indent, dns_c_ipmatchelement_t *ipme)
 	switch (ipme->type) {
 	case dns_c_ipmatch_pattern:
 		dns_c_print_ipaddr(fp, &ipme->u.direct.address);
-		
+
 		bits = ipme->u.direct.mask;
 		if (bits > 0) {
 			isc_uint32_t fam =
@@ -719,11 +719,11 @@ dns_c_ipmatchlist_print(FILE *fp, int indent, dns_c_ipmatchlist_t *ml) {
 			dns_c_printtabs(fp, indent);
 			dns_c_ipmatchelement_print(fp, indent + 1, ipme);
 			fprintf(fp, ";\n");
-			
+
 			ipme = ISC_LIST_NEXT(ipme, next);
 		}
 	}
-	
+
 	dns_c_printtabs(fp, indent - 1);
 	fprintf(fp, "}");
 
@@ -764,7 +764,7 @@ dns_c_ipmatchlist_walk(dns_c_ipmatchlist_t *list, dns_c_ipmlwalker func)
 
 		ipme = ISC_LIST_NEXT(ipme, next);
 	}
-	
+
 	return (retval);
 }
 
@@ -815,7 +815,7 @@ dns_c_iplist_new(isc_mem_t *mem, int length, dns_c_iplist_t **newlist) {
 	list->refcount = 1;
 
 	*newlist = list;
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -825,11 +825,11 @@ dns_c_iplist_detach(dns_c_iplist_t **list) {
 #ifndef NOMINUM_PUBLIC
 	unsigned int i;
 #endif /* NOMINUM_PUBLIC */
-	
+
 
 	REQUIRE(list != NULL);
 	REQUIRE(*list != NULL);
-	
+
 	l = *list;
 
 	REQUIRE(DNS_C_IPLIST_VALID(l));
@@ -867,7 +867,7 @@ dns_c_iplist_haskeys(dns_c_iplist_t *list)
 	if (list->keys == NULL) {
 		return (ISC_FALSE);
 	}
-	
+
 	for (i = 0 ; i < list->nextidx ; i++) {
 		if (list->keys[i] != NULL) {
 			return (ISC_TRUE);
@@ -877,7 +877,7 @@ dns_c_iplist_haskeys(dns_c_iplist_t *list)
 	return (ISC_FALSE);
 }
 #endif /* NOMINUM_PUBLIC */
-	
+
 void
 dns_c_iplist_attach(dns_c_iplist_t *source, dns_c_iplist_t **target) {
 	REQUIRE(DNS_C_IPLIST_VALID(source));
@@ -920,7 +920,7 @@ dns_c_iplist_copy(isc_mem_t *mem, dns_c_iplist_t **dest, dns_c_iplist_t *src) {
 		}
 #endif /* NOMINUM_PUBLIC */
 	}
-	
+
 	newl->nextidx = src->nextidx;
 
 	*dest = newl;
@@ -966,18 +966,18 @@ dns_c_iplist_printfully(FILE *fp, int indent, isc_boolean_t porttoo,
 	isc_boolean_t athead = ISC_TRUE;
 
 	REQUIRE(DNS_C_IPLIST_VALID(list));
-		
+
 	if (list->nextidx == 0) {
 		fputc('{', fp);
 		fputc('\n', fp);
 		dns_c_printtabs(fp, indent);
 		fprintf(fp, "/* no ip addresses defined */\n");
-		dns_c_printtabs(fp, indent - 1); 
+		dns_c_printtabs(fp, indent - 1);
 		fputc('}', fp);
 	} else {
 		if (porttoo) {
 			port = isc_sockaddr_getport(&list->ips[0]);
-			
+
 			for (i = 0 ; i < list->nextidx ; i++) {
 				tmpport = isc_sockaddr_getport(&list->ips[i]);
 				if (tmpport != port) {
@@ -1085,21 +1085,21 @@ dns_c_iplist_append(dns_c_iplist_t *list, isc_sockaddr_t newaddr) {
 		list->size = newsize;
 	}
 
-	
+
 	list->ips[i] = newaddr;
 	list->nextidx++;
 
 	res = ISC_R_SUCCESS;
-	
+
 #ifndef NOMINUM_PUBLIC
 	if (key != NULL) {
 		if (list->keys[i] != NULL) {
 			dns_name_free(list->keys[i], list->mem);
-			isc_mem_put(list->mem, list->keys, 
+			isc_mem_put(list->mem, list->keys,
 				    sizeof (dns_name_t));
 			list->keys[i] = NULL;
 		}
-		
+
 		res = dns_c_charptoname(list->mem, key, &list->keys[i]);
 	}
 #endif /* NOMINUM_PUBLIC */
@@ -1114,7 +1114,7 @@ dns_c_iplist_remove(dns_c_iplist_t *list, isc_sockaddr_t newaddr) {
 	isc_uint32_t i;
 
 	REQUIRE(DNS_C_IPLIST_VALID(list));
-	
+
 	for (i = 0 ; i < list->nextidx ; i++) {
 		if (memcmp(&list->ips[i], &newaddr, sizeof newaddr) == 0) {
 			break;
@@ -1153,13 +1153,13 @@ checkmask(isc_sockaddr_t *address, isc_uint32_t bits) {
 	if (bits > 0) {
 		if (address->type.sa.sa_family == AF_INET) {
 			isc_uint32_t mask;
-			
+
 			if (bits > 32) {
 				return (ISC_R_FAILURE);
 			}
-			
+
 			mask = ntohl(0xffffffffU << (32 - bits));
-			
+
 			if ((mask & address->type.sin.sin_addr.s_addr) !=
 			    address->type.sin.sin_addr.s_addr) {
 				return (ISC_R_FAILURE);
@@ -1169,15 +1169,15 @@ checkmask(isc_sockaddr_t *address, isc_uint32_t bits) {
 			unsigned char *maskp;
 			unsigned char *addrp;
 			int i;
-			
+
 			if (bits > 128) {
 				return (ISC_R_FAILURE);
 			}
-					
+
 			if (bits2v6mask(&iaddr, bits) != ISC_R_SUCCESS) {
 				return (ISC_R_FAILURE);
 			}
-			
+
 			addrp = (unsigned char *)&address->type.sin6.sin6_addr;
 			maskp = (unsigned char *)&iaddr;
 			for (i = 0 ; i < 16 ; i++) {
@@ -1187,7 +1187,7 @@ checkmask(isc_sockaddr_t *address, isc_uint32_t bits) {
 			}
 		}
 	}
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -1203,10 +1203,10 @@ bits2v6mask(struct in6_addr *addr, isc_uint32_t bits) {
 	char addrbuff [ sizeof "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff" + 1 ];
 
 	INSIST(bits <= 128);
-	
+
 	/* Break the 128 bits up into 32-bit sections */
 	bitmask[0] = bitmask[1] = bitmask[2] = bitmask[3] = 0U;
-	
+
 	if (bits >= 32) {
 		bitmask[0] = 0xffffffffU;
 	} else if (bits > 0) {
@@ -1225,9 +1225,9 @@ bits2v6mask(struct in6_addr *addr, isc_uint32_t bits) {
 	} else if (bits > 64) {
 		bitmask[2] = 0xffffffffU << (96 - bits);
 	}
-      
+
 	memset(addr, 0x0, sizeof *addr);
-	
+
 	sprintf(addrbuff, "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x",
 		(((bitmask[0] & 0xffff0000U) >> 16) & 0xffffU),
 		(bitmask[0] & 0xffff),
@@ -1243,5 +1243,5 @@ bits2v6mask(struct in6_addr *addr, isc_uint32_t bits) {
 	return (i == 1 ? ISC_R_SUCCESS : ISC_R_FAILURE);
 }
 
-	
+
 
diff --git a/lib/dns/config/confkeys.c b/lib/dns/config/confkeys.c
index e1d23ce137..08aa10add1 100644
--- a/lib/dns/config/confkeys.c
+++ b/lib/dns/config/confkeys.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: confkeys.c,v 1.26 2000/07/27 09:47:04 tale Exp $ */
+/* $Id: confkeys.c,v 1.27 2000/08/01 01:23:21 tale Exp $ */
 
 #include 
 
@@ -43,7 +43,7 @@ dns_c_kdeflist_new(isc_mem_t *mem, dns_c_kdeflist_t **list) {
 
 	newlist->mem = mem;
 	newlist->magic = DNS_C_KDEFLIST_MAGIC;
-	
+
 	ISC_LIST_INIT(newlist->keydefs);
 
 	*list = newlist;
@@ -59,7 +59,7 @@ dns_c_kdeflist_delete(dns_c_kdeflist_t **list)
 	dns_c_kdef_t *kd;
 	dns_c_kdef_t *tmpkd;
 	isc_result_t res;
-	
+
 	REQUIRE(list != NULL);
 	REQUIRE(DNS_C_KDEFLIST_VALID(*list));
 
@@ -80,7 +80,7 @@ dns_c_kdeflist_delete(dns_c_kdeflist_t **list)
 	isc_mem_put(l->mem, l, sizeof *l);
 
 	*list = NULL;
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -95,12 +95,12 @@ dns_c_kdeflist_copy(isc_mem_t *mem, dns_c_kdeflist_t **dest,
 
 	REQUIRE(dest != NULL);
 	REQUIRE(DNS_C_KDEFLIST_VALID(src));
-	
+
 	res = dns_c_kdeflist_new(mem, &newlist);
 	if (res != ISC_R_SUCCESS) {
 		return (res);
 	}
-	
+
 	key = ISC_LIST_HEAD(src->keydefs);
 	while (key != NULL) {
 		res = dns_c_kdeflist_append(newlist, key, ISC_TRUE);
@@ -108,7 +108,7 @@ dns_c_kdeflist_copy(isc_mem_t *mem, dns_c_kdeflist_t **dest,
 			dns_c_kdeflist_delete(&newlist);
 			return (res);
 		}
-		
+
 		key = ISC_LIST_NEXT(key, next);
 	}
 
@@ -124,7 +124,7 @@ dns_c_kdeflist_append(dns_c_kdeflist_t *list,
 {
 	dns_c_kdef_t *newe;
 	isc_result_t res;
-	
+
 	REQUIRE(DNS_C_KDEFLIST_VALID(list));
 	REQUIRE(DNS_C_KDEF_VALID(key));
 
@@ -217,7 +217,7 @@ dns_c_kdeflist_print(FILE *fp, int indent, dns_c_kdeflist_t *list)
 	if (list == NULL) {
 		return;
 	}
-	
+
 	kd = ISC_LIST_HEAD(list->keydefs);
 	while (kd != NULL) {
 		dns_c_kdef_print(fp, indent, kd);
@@ -235,7 +235,7 @@ dns_c_kdef_new(isc_mem_t *mem, const char *name, dns_c_kdef_t **keyid)
 	REQUIRE(keyid != NULL);
 	REQUIRE(name != NULL);
 	REQUIRE(*name != '\0');
-	
+
 	kd = isc_mem_get(mem, sizeof *kd);
 	if (kd == NULL) {
 		return (ISC_R_NOMEMORY);
@@ -248,12 +248,12 @@ dns_c_kdef_new(isc_mem_t *mem, const char *name, dns_c_kdef_t **keyid)
 
 	kd->magic = DNS_C_KDEF_MAGIC;
 	kd->mem = mem;
-	
+
 	kd->algorithm = NULL;
 	kd->secret = NULL;
 
 	*keyid = kd;
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -270,7 +270,7 @@ dns_c_kdef_delete(dns_c_kdef_t **keydef)
 	kd = *keydef;
 
 	mem = kd->mem;
-	
+
 	isc_mem_free(mem, kd->keyid);
 
 	if (kd->algorithm != NULL) {
@@ -304,26 +304,26 @@ dns_c_kdef_copy(isc_mem_t *mem,
 
 	REQUIRE(dest != NULL);
 	REQUIRE(DNS_C_KDEF_VALID(src));
-	
+
 	newk = isc_mem_get(mem, sizeof *newk);
 	if (newk == NULL) {
 		return (ISC_R_NOMEMORY);
 	}
 	newk->magic = DNS_C_KDEF_MAGIC;
 	newk->secret = newk->algorithm = newk->keyid = NULL;
-	
+
 	newk->keyid = isc_mem_strdup(mem, src->keyid);
 	if (newk->keyid == NULL) {
 		dns_c_kdef_delete(&newk);
 		return (ISC_R_NOMEMORY);
 	}
-	
+
 	newk->algorithm = isc_mem_strdup(mem, src->algorithm);
 	if (newk->algorithm == NULL) {
 		dns_c_kdef_delete(&newk);
 		return (ISC_R_NOMEMORY);
 	}
-		
+
 	newk->secret = isc_mem_strdup(mem, src->secret);
 	if (newk->secret == NULL) {
 		dns_c_kdef_delete(&newk);
@@ -335,7 +335,7 @@ dns_c_kdef_copy(isc_mem_t *mem,
 	return (ISC_R_SUCCESS);
 }
 
-		
+
 
 void
 dns_c_kdef_print(FILE *fp, int indent, dns_c_kdef_t *keydef)
@@ -367,7 +367,7 @@ dns_c_kdef_setalgorithm(dns_c_kdef_t *keydef, const char *algorithm)
 	if (keydef->algorithm != NULL) {
 		isc_mem_free(keydef->mem, keydef->algorithm);
 	}
-	
+
 	keydef->algorithm = isc_mem_strdup(keydef->mem, algorithm);
 	if (keydef->algorithm == NULL) {
 		return (ISC_R_NOMEMORY);
@@ -383,11 +383,11 @@ dns_c_kdef_setsecret(dns_c_kdef_t *keydef, const char *secret)
 	REQUIRE(DNS_C_KDEF_VALID(keydef));
 	REQUIRE(secret != NULL);
 	REQUIRE(*secret != '\0');
-	
+
 	if (keydef->secret != NULL) {
 		isc_mem_free(keydef->mem, keydef->secret);
 	}
-	
+
 	keydef->secret = isc_mem_strdup(keydef->mem, secret);
 	if (keydef->secret == NULL) {
 		return (ISC_R_NOMEMORY);
@@ -411,7 +411,7 @@ dns_c_kidlist_new(isc_mem_t *mem, dns_c_kidlist_t **list)
 	l->magic = DNS_C_KEYIDLIST_MAGIC;
 	l->mem = mem;
 	*list = l;
-	
+
 	ISC_LIST_INIT(l->keyids);
 
 	return (ISC_R_SUCCESS);
@@ -427,7 +427,7 @@ dns_c_kidlist_delete(dns_c_kidlist_t **list)
 
 	REQUIRE(list != NULL);
 	REQUIRE(DNS_C_KEYIDLIST_VALID(*list));
-	
+
 	l = *list;
 
 	ki = ISC_LIST_HEAD(l->keyids);
@@ -445,7 +445,7 @@ dns_c_kidlist_delete(dns_c_kidlist_t **list)
 	isc_mem_put(l->mem, l, sizeof *l);
 
 	*list = NULL;
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -467,7 +467,7 @@ dns_c_kidlist_keycount(dns_c_kidlist_t *list)
 	return (count);
 }
 
-       
+
 
 
 
@@ -478,7 +478,7 @@ keyid_delete(dns_c_kid_t **keyid)
 
 	REQUIRE(keyid != NULL);
 	REQUIRE(DNS_C_KEYID_VALID(*keyid));
-	
+
 	ki = *keyid;
 
 	isc_mem_free(ki->mem, ki->keyid);
@@ -487,7 +487,7 @@ keyid_delete(dns_c_kid_t **keyid)
 	isc_mem_put(ki->mem, ki, sizeof *ki);
 
 	*keyid = NULL;
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -501,9 +501,9 @@ dns_c_kidlist_undef(dns_c_kidlist_t *list, const char *keyid)
 	REQUIRE(DNS_C_KEYIDLIST_VALID(list));
 	REQUIRE(keyid != NULL);
 	REQUIRE(*keyid != '\0');
-	
+
 	dns_c_kidlist_find(list, keyid, &ki);
-	
+
 	if (ki != NULL) {
 		ISC_LIST_UNLINK(list->keyids, ki, next);
 		r = keyid_delete(&ki);
@@ -525,7 +525,7 @@ dns_c_kidlist_find(dns_c_kidlist_t *list, const char *keyid,
 	REQUIRE(keyid != NULL);
 	REQUIRE(*keyid != '\0');
 	REQUIRE(retval != NULL);
-	
+
 	iter = ISC_LIST_HEAD(list->keyids);
 	while (iter != NULL) {
 		if (strcmp(keyid, iter->keyid) == 0) {
@@ -577,7 +577,7 @@ dns_c_kidlist_print(FILE *fp, int indent,
 			iter = ISC_LIST_NEXT(iter, next);
 		}
 	}
-	
+
 	dns_c_printtabs(fp, indent);
 	fprintf(fp, "}");
 }
@@ -591,7 +591,7 @@ dns_c_kid_new(isc_mem_t *mem, const char *name, dns_c_kid_t **keyid)
 	REQUIRE(name != NULL);
 	REQUIRE(*name != '\0');
 	REQUIRE(keyid != NULL);
-	
+
 	ki = isc_mem_get(mem, sizeof *ki);
 	if (ki == NULL) {
 		return (ISC_R_NOMEMORY);
@@ -626,11 +626,11 @@ dns_c_pklist_new(isc_mem_t *mem, dns_c_pklist_t **pklist)
 	ISC_LIST_INIT(newl->keylist);
 
 	*pklist = newl;
-	
+
 	return (ISC_R_SUCCESS);
 }
 
-	
+
 isc_result_t
 dns_c_pklist_delete(dns_c_pklist_t **list)
 {
@@ -677,7 +677,7 @@ dns_c_pklist_print(FILE *fp, int indent, dns_c_pklist_t *list)
 	}
 
 	REQUIRE(DNS_C_PKLIST_VALID(list));
-	
+
 	pk = ISC_LIST_HEAD(list->keylist);
 	while (pk != NULL) {
 		dns_c_pubkey_print(fp, indent, pk);
@@ -796,7 +796,7 @@ dns_c_pubkey_new(isc_mem_t *mem, isc_uint32_t flags,
 		isc_mem_put(mem, pkey, sizeof *pkey);
 		return (ISC_R_NOMEMORY);
 	}
-	
+
 	*pubkey = pkey;
 
 	return (ISC_R_SUCCESS);
@@ -832,7 +832,7 @@ dns_c_pubkey_copy(isc_mem_t *mem, dns_c_pubkey_t **dest, dns_c_pubkey_t *src)
 
 	REQUIRE(DNS_C_PUBKEY_VALID(src));
 	REQUIRE(dest != NULL);
-	
+
 	res = dns_c_pubkey_new(mem, src->flags, src->protocol,
 			       src->algorithm, src->key, &k);
 	if (res != ISC_R_SUCCESS) {
@@ -902,7 +902,7 @@ dns_c_tkeylist_delete(dns_c_tkeylist_t **list)
 	REQUIRE(DNS_C_TKEYLIST_VALID(*list));
 
 	l = *list;
-		
+
 	tkey = ISC_LIST_HEAD(l->tkeylist);
 	while (tkey != NULL) {
 		tmptkey = ISC_LIST_NEXT(tkey, next);
@@ -912,7 +912,7 @@ dns_c_tkeylist_delete(dns_c_tkeylist_t **list)
 		if (res != ISC_R_SUCCESS) {
 			return (res);
 		}
-		
+
 		tkey = tmptkey;
 	}
 
@@ -920,7 +920,7 @@ dns_c_tkeylist_delete(dns_c_tkeylist_t **list)
 	isc_mem_put(l->mem, l, sizeof *l);
 
 	*list = NULL;
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -935,12 +935,12 @@ dns_c_tkeylist_copy(isc_mem_t *mem, dns_c_tkeylist_t **dest,
 
 	REQUIRE(dest != NULL);
 	REQUIRE(DNS_C_TKEYLIST_VALID(src));
-	
+
 	res = dns_c_tkeylist_new(mem, &newlist);
 	if (res != ISC_R_SUCCESS) {
 		return (res);
 	}
-	
+
 	tkey = ISC_LIST_HEAD(src->tkeylist);
 	while (tkey != NULL) {
 		res = dns_c_tkey_copy(mem, &tmptkey, tkey);
@@ -955,7 +955,7 @@ dns_c_tkeylist_copy(isc_mem_t *mem, dns_c_tkeylist_t **dest,
 			dns_c_tkeylist_delete(&newlist);
 			return (res);
 		}
-		
+
 		tkey = ISC_LIST_NEXT(tkey, next);
 	}
 
@@ -969,10 +969,10 @@ void
 dns_c_tkeylist_print(FILE *fp, int indent, dns_c_tkeylist_t *list)
 {
 	dns_c_tkey_t *tkey;
-	
+
 	REQUIRE(fp != NULL);
 	REQUIRE(DNS_C_TKEYLIST_VALID(list));
-	
+
 	dns_c_printtabs(fp, indent);
 	fprintf(fp, "trusted-keys {\n");
 	tkey = ISC_LIST_HEAD(list->tkeylist);
@@ -996,7 +996,7 @@ dns_c_tkeylist_append(dns_c_tkeylist_t *list, dns_c_tkey_t *element,
 {
 	dns_c_tkey_t *newe;
 	isc_result_t res;
-	
+
 	REQUIRE(DNS_C_TKEYLIST_VALID(list));
 	REQUIRE(DNS_C_TKEY_VALID(element));
 
@@ -1052,7 +1052,7 @@ dns_c_tkey_new(isc_mem_t *mem, const char *domain, isc_uint32_t flags,
 		isc_mem_put(mem, newk, sizeof *newk);
 		return (ISC_R_NOMEMORY);
 	}
-	
+
 	newk->pubkey = pk;
 
 	ISC_LINK_INIT(newk, next);
@@ -1083,9 +1083,9 @@ dns_c_tkey_delete(dns_c_tkey_t **tkey)
 
 	tk->magic = 0;
 	isc_mem_put(tk->mem, tk, sizeof *tk);
-	
+
 	*tkey = NULL;
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -1165,7 +1165,7 @@ dns_c_tkey_getkey(dns_c_tkey_t *tkey, const char **key)
 {
 	REQUIRE(key != NULL);
 	REQUIRE(DNS_C_TKEY_VALID(tkey));
-	
+
 	*key = tkey->pubkey->key;
 
 	return (ISC_R_SUCCESS);
diff --git a/lib/dns/config/conflog.c b/lib/dns/config/conflog.c
index f4fe188f51..45244db9ef 100644
--- a/lib/dns/config/conflog.c
+++ b/lib/dns/config/conflog.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: conflog.c,v 1.17 2000/07/27 09:47:05 tale Exp $ */
+/* $Id: conflog.c,v 1.18 2000/08/01 01:23:22 tale Exp $ */
 
 #include 
 
@@ -83,7 +83,7 @@ dns_c_logginglist_delete(dns_c_logginglist_t **list) {
 
 	REQUIRE(list != NULL);
 	REQUIRE(DNS_C_LOGLIST_VALID(*list));
-	
+
 	l = *list;
 
 	chan = ISC_LIST_HEAD(l->channels);
@@ -180,10 +180,10 @@ logginglist_empty(dns_c_logginglist_t *ll) {
 		if (!logchan->predefined) {
 			return ISC_FALSE;
 		}
-		
+
 		logchan = ISC_LIST_NEXT(logchan, next);
 	}
-	
+
 	logcat = ISC_LIST_HEAD(ll->categories);
 	while (logcat != NULL) {
 		if (!logcat->predefined) {
@@ -195,7 +195,7 @@ logginglist_empty(dns_c_logginglist_t *ll) {
 	return ISC_TRUE;
 }
 
-	
+
 void
 dns_c_logginglist_print(FILE *fp, int indent, dns_c_logginglist_t *ll,
 			isc_boolean_t if_predef_too)
@@ -212,21 +212,21 @@ dns_c_logginglist_print(FILE *fp, int indent, dns_c_logginglist_t *ll,
 
 	dns_c_printtabs(fp, indent);
 	fprintf(fp, "logging {\n");
-	
+
 	logchan = ISC_LIST_HEAD(ll->channels);
 	while (logchan != NULL) {
 		dns_c_logchan_print(fp, indent + 1, logchan,
 				    if_predef_too);
 		logchan = ISC_LIST_NEXT(logchan, next);
 	}
-	
+
 	logcat = ISC_LIST_HEAD(ll->categories);
 	while (logcat != NULL) {
 		dns_c_logcat_print(fp, indent + 1, logcat,
 				   if_predef_too);
 		logcat = ISC_LIST_NEXT(logcat, next);
 	}
-	
+
 	dns_c_printtabs(fp, indent);
 	fprintf(fp, "};\n");
 }
@@ -253,7 +253,7 @@ dns_c_logginglist_addchannel(dns_c_logginglist_t *list,
 	} else {
 		newc = newchan;
 	}
-		
+
 	tmpchan = ISC_LIST_HEAD(list->channels);
 	while (tmpchan != NULL) {
 		if (strcmp(newchan->name, tmpchan->name) == 0) {
@@ -293,7 +293,7 @@ dns_c_logginglist_addcategory(dns_c_logginglist_t *list,
 
 	REQUIRE(DNS_C_LOGLIST_VALID(list));
 	REQUIRE(DNS_C_LOGCAT_VALID(newcat));
-	
+
 
 	if (deepcopy) {
 		res = dns_c_logcat_copy(list->mem, &newc, newcat);
@@ -310,7 +310,7 @@ dns_c_logginglist_addcategory(dns_c_logginglist_t *list,
 		if (strcmp(newcat->catname,tmpcat->catname) == 0) {
 			existed = ISC_TRUE;
 			predefined = tmpcat->predefined;
-			
+
 			ISC_LIST_UNLINK(list->categories, tmpcat, next);
 			res = dns_c_logcat_delete(&tmpcat);
 			if (res != ISC_R_SUCCESS) {
@@ -501,13 +501,13 @@ dns_c_logchan_new(isc_mem_t *mem, const char *name,
 	memset(&newc->setflags, 0x0, sizeof newc->setflags);
 
 	ISC_LINK_INIT(newc, next);
-	
+
 	newc->name = isc_mem_strdup(mem, name);
 	if (newc->name == NULL) {
 		isc_mem_put(mem, newc, sizeof *newc);
 		return (ISC_R_NOMEMORY);
 	}
-	
+
 	switch (ctype) {
 	case dns_c_logchan_file:
 		newc->u.filec.path = NULL;
@@ -518,7 +518,7 @@ dns_c_logchan_new(isc_mem_t *mem, const char *name,
 	case dns_c_logchan_stderr:
 		break;
 	}
-	
+
 	*newchan = newc;
 
 	return (ISC_R_SUCCESS);
@@ -579,7 +579,7 @@ dns_c_logchan_copy(isc_mem_t *mem, dns_c_logchan_t **dest,
 	logc->print_severity = src->print_severity;
 	logc->print_time = src->print_time;
 	logc->setflags = src->setflags;
-	
+
 	switch (logc->ctype) {
 	case dns_c_logchan_file:
 		logc->u.filec.path = isc_mem_strdup(mem, src->u.filec.path);
@@ -597,7 +597,7 @@ dns_c_logchan_copy(isc_mem_t *mem, dns_c_logchan_t **dest,
 	}
 
 	*dest = logc;
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -612,7 +612,7 @@ dns_c_logchan_print(FILE *fp, int indent, dns_c_logchan_t *logchan,
 	if (logchan->predefined && !if_predef_too) {
 		return;
 	}
-	
+
 	dns_c_printtabs(fp, indent);
 	fprintf(fp, "channel %s {\n", logchan->name) ;
 
@@ -669,13 +669,13 @@ dns_c_logchan_print(FILE *fp, int indent, dns_c_logchan_t *logchan,
 		fprintf(fp, "print-severity %s;\n",
 			(logchan->print_severity ? "true" : "false"));
 	}
-	
+
 	if (DNS_C_CHECKBIT(CHAN_PCAT_BIT, &logchan->setflags)) {
 		dns_c_printtabs(fp, indent + 1);
 		fprintf(fp, "print-category %s;\n",
 			(logchan->print_category ? "true" : "false"));
 	}
-	
+
 	if (DNS_C_CHECKBIT(CHAN_PTIME_BIT, &logchan->setflags)) {
 		dns_c_printtabs(fp, indent + 1);
 		fprintf(fp, "print-time %s;\n",
@@ -777,7 +777,7 @@ dns_c_logchan_setfacility(dns_c_logchan_t *channel, int facility) {
 		return (ISC_R_FAILURE);
 	}
 
-	
+
 	if (dns_c_facility2string(facility, ISC_FALSE) == NULL) {
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -785,7 +785,7 @@ dns_c_logchan_setfacility(dns_c_logchan_t *channel, int facility) {
 			      facility);
 		return (ISC_R_FAILURE);
 	}
-	
+
 
 	existed = DNS_C_CHECKBIT(CHAN_FACILITY_BIT, &channel->setflags);
 
@@ -822,10 +822,10 @@ dns_c_logchan_setdebuglevel(dns_c_logchan_t *channel, isc_int32_t level) {
 	if (channel->severity == dns_c_log_debug) {
 		existed = DNS_C_CHECKBIT(CHAN_DEBUG_LEVEL_BIT,
 					 &channel->setflags);
-		
+
 		DNS_C_SETBIT(CHAN_DEBUG_LEVEL_BIT, &channel->setflags);
 		channel->debug_level = level;
-		
+
 		return (existed ? ISC_R_EXISTS : ISC_R_SUCCESS);
 	} else {
 		return (ISC_R_FAILURE);
@@ -1181,14 +1181,14 @@ dns_c_logcat_print(FILE *fp, int indent, dns_c_logcat_t *logcat,
 		   isc_boolean_t if_predef_too)
 {
 	unsigned int i;
-	
+
 	REQUIRE(fp != NULL);
 	REQUIRE(DNS_C_LOGCAT_VALID(logcat));
 
 	if (logcat->predefined && !if_predef_too) {
 		return;
 	}
-	
+
 	dns_c_printtabs(fp, indent);
 	fprintf(fp, "category %s {\n", logcat->catname);
 
@@ -1308,7 +1308,7 @@ dns_c_logcat_getpredef(dns_c_logcat_t *logcat, isc_boolean_t *retval) {
 static void
 print_log_facility(FILE *fp, int value) {
 	REQUIRE(fp != NULL);
-	
+
 	fputs(dns_c_facility2string(value, ISC_TRUE), fp);
 }
 
@@ -1316,7 +1316,7 @@ print_log_facility(FILE *fp, int value) {
 static void
 print_log_severity(FILE *fp, dns_c_logseverity_t severity) {
 	REQUIRE(fp != NULL);
-	
+
 	fputs(dns_c_logseverity2string(severity, ISC_TRUE), fp);
 }
 
diff --git a/lib/dns/config/conflsn.c b/lib/dns/config/conflsn.c
index f976557699..234b6ba5a7 100644
--- a/lib/dns/config/conflsn.c
+++ b/lib/dns/config/conflsn.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: conflsn.c,v 1.17 2000/07/27 09:47:06 tale Exp $ */
+/* $Id: conflsn.c,v 1.18 2000/08/01 01:23:24 tale Exp $ */
 
 #include 
 
@@ -35,7 +35,7 @@ dns_c_lstnon_new(isc_mem_t *mem, dns_c_lstnon_t **listen) {
 	REQUIRE(listen != NULL);
 
 	*listen = NULL;
-	
+
 	ll = isc_mem_get(mem, sizeof *ll);
 	ll->mem = mem;
 	ll->port = 0;
@@ -46,11 +46,11 @@ dns_c_lstnon_new(isc_mem_t *mem, dns_c_lstnon_t **listen) {
 		isc_mem_put(mem, ll, sizeof *ll);
 		return (result);
 	}
-	
+
 	ISC_LINK_INIT(ll, next);
 
 	*listen = ll;
-		
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -74,7 +74,7 @@ dns_c_lstnon_delete(dns_c_lstnon_t **listen) {
 	isc_mem_put(lo->mem, lo, sizeof *lo);
 
 	*listen = NULL;
-	
+
 	return (r);
 }
 
@@ -95,7 +95,7 @@ dns_c_lstnon_setiml(dns_c_lstnon_t *listen,
 	} else {
 		result = ISC_R_SUCCESS;
 	}
-	
+
 
 	if (deepcopy) {
 		result = dns_c_ipmatchlist_copy(listen->mem,
@@ -114,7 +114,7 @@ dns_c_lstnlist_new(isc_mem_t *mem, dns_c_lstnlist_t **llist) {
 	REQUIRE(llist != NULL);
 
 	*llist = NULL;
-	
+
 	ll = isc_mem_get(mem, sizeof *ll);
 	if (ll == NULL) {
 		/* XXXJAB logwrite */
@@ -126,7 +126,7 @@ dns_c_lstnlist_new(isc_mem_t *mem, dns_c_lstnlist_t **llist) {
 	ISC_LIST_INIT(ll->elements);
 
 	*llist = ll;
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -157,7 +157,7 @@ dns_c_lstnlist_delete(dns_c_lstnlist_t **llist) {
 	isc_mem_put(ll->mem, ll, sizeof *ll);
 
 	*llist = NULL;
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -204,7 +204,7 @@ dns_c_lstnon_print(FILE *fp, int indent, dns_c_lstnon_t *lo,
 		   in_port_t default_port) {
 	REQUIRE(lo != NULL);
 	REQUIRE(DNS_C_LISTEN_VALID(lo));
-	
+
 	fprintf(fp, "listen-on ");
 	if (lo->port != default_port) {
 		fprintf(fp, "port %d ", lo->port);
@@ -222,7 +222,7 @@ dns_c_lstnonv6_print(FILE *fp, int indent, dns_c_lstnon_t *lo,
 		   in_port_t default_port) {
 	REQUIRE(lo != NULL);
 	REQUIRE(DNS_C_LISTEN_VALID(lo));
-	
+
 	fprintf(fp, "listen-on-v6 ");
 	if (lo->port != default_port) {
 		fprintf(fp, "port %d ", lo->port);
@@ -254,7 +254,7 @@ checklisten_element(dns_c_ipmatchelement_t *element)
 	case dns_c_ipmatch_localnets:
 		ok = ISC_FALSE;
 		break;
-		
+
 	case dns_c_ipmatch_any:
 	case dns_c_ipmatch_none:
 		ok = ISC_TRUE;
@@ -263,7 +263,7 @@ checklisten_element(dns_c_ipmatchelement_t *element)
 	case dns_c_ipmatch_indirect:
 		/* XXX shouldn't be reached */
 		break;
-		
+
 	case dns_c_ipmatch_acl:
 		/* XXX handle this. */
 		break;
@@ -277,11 +277,11 @@ checkv6listen_element(dns_c_ipmatchelement_t *element)
 {
 	int pf;
 	isc_boolean_t ok = ISC_FALSE;
-	
+
 	switch (element->type) {
 	case dns_c_ipmatch_pattern:
 		pf = isc_sockaddr_pf(&element->u.direct.address);
-		
+
 		ok = ISC_TF(pf == AF_INET6);
 		break;
 
@@ -290,7 +290,7 @@ checkv6listen_element(dns_c_ipmatchelement_t *element)
 	case dns_c_ipmatch_localnets:
 		ok = ISC_FALSE;
 		break;
-		
+
 	case dns_c_ipmatch_any:
 	case dns_c_ipmatch_none:
 		ok = ISC_TRUE;
@@ -299,7 +299,7 @@ checkv6listen_element(dns_c_ipmatchelement_t *element)
 	case dns_c_ipmatch_indirect:
 		/* XXX shouldn't be reached */
 		break;
-		
+
 	case dns_c_ipmatch_acl:
 		/* XXX handle this. */
 		break;
@@ -317,7 +317,7 @@ isc_result_t
 dns_c_lstnlist_validate(dns_c_lstnlist_t *ll)
 {
 #if 0
-	
+
 	dns_c_lstnon_t *lo;
 	isc_boolean_t checkval;
 
@@ -334,18 +334,18 @@ dns_c_lstnlist_validate(dns_c_lstnlist_t *ll)
 				      "addresses only.");
 			return (ISC_R_FAILURE);
 		}
-		
+
 		lo = ISC_LIST_NEXT(lo, next);
 	}
 
 	return (ISC_R_SUCCESS);
 
-#else	
+#else
 
 	UNUSED(ll);
 	return (ISC_R_SUCCESS);
 
-#endif	
+#endif
 }
 
 
@@ -370,18 +370,18 @@ dns_c_lstnlistv6_validate(dns_c_lstnlist_t *ll)
 				      "addresses only.");
 			return (ISC_R_FAILURE);
 		}
-		
+
 		lo = ISC_LIST_NEXT(lo, next);
 	}
 
 	return (ISC_R_SUCCESS);
 
 #else
-	
+
 	UNUSED(ll);
 	return (ISC_R_SUCCESS);
-	
-#endif	
+
+#endif
 }
 
 
diff --git a/lib/dns/config/confndc.c b/lib/dns/config/confndc.c
index 0dc849d567..f38453f4af 100644
--- a/lib/dns/config/confndc.c
+++ b/lib/dns/config/confndc.c
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,24 +15,24 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: confndc.c,v 1.24 2000/07/28 19:33:29 gson Exp $ */
+/* $Id: confndc.c,v 1.25 2000/08/01 01:23:25 tale Exp $ */
 
 /*
 **	options {
 **	  [ default-server server_name; ]
 **	  [ default-key key_name; ]
 **	};
-**	
+**
 **	server server_name {
 **	  key key_name;
 **	  [ host name_or_addr; ]
 **	};
-**	
+**
 **	key key_name {
 **	  algorithm string;
 **	  secret  string;
 **	};
-**	
+**
 */
 
 
@@ -52,7 +52,7 @@
 
 #include 
 #include 
- 
+
 /*
  * Type keys for symtab lookup.
  */
@@ -87,7 +87,7 @@ struct keywordtoken {
 };
 
 
-/* 
+/*
  * DATA
  */
 
@@ -192,7 +192,7 @@ dns_c_ndcctx_new(isc_mem_t *mem, dns_c_ndcctx_t **ctx) {
 	newctx = isc_mem_get(mem, sizeof *newctx);
 	if (newctx == NULL)
 		return (ISC_R_NOMEMORY);
-	
+
 	newctx->mem = mem;
 	newctx->magic = DNS_C_NDCCTX_MAGIC;
 	newctx->opts = NULL;
@@ -207,11 +207,11 @@ void
 dns_c_ndcctx_destroy(dns_c_ndcctx_t **ndcctx) {
 	dns_c_ndcctx_t *ctx;
 	isc_mem_t *mem;
-	
+
 	REQUIRE(ndcctx != NULL);
 
 	ctx = *ndcctx;
-	
+
 	REQUIRE(DNS_C_NDCCTX_VALID(ctx));
 
 	mem = ctx->mem;
@@ -268,7 +268,7 @@ dns_c_ndcopts_print(FILE *fp, dns_c_ndcopts_t *opts) {
 void
 dns_c_ndcserverlist_print(FILE *fp, dns_c_ndcserverlist_t *servers) {
 	dns_c_ndcserver_t *server;
-	
+
 	REQUIRE(DNS_C_NDCSERVERLIST_VALID(servers));
 	REQUIRE(fp != NULL);
 
@@ -296,12 +296,12 @@ dns_c_ndcserver_print(FILE *fp, dns_c_ndcserver_t *server) {
 isc_result_t
 dns_c_ndcctx_setoptions(dns_c_ndcctx_t *ctx, dns_c_ndcopts_t *opts) {
 	isc_boolean_t existed;
-	
+
 	REQUIRE(DNS_C_NDCCTX_VALID(ctx));
 	REQUIRE(opts == NULL || DNS_C_NDCOPTIONS_VALID(opts));
 
 	existed = ISC_TF(ctx->opts != NULL);
-	
+
 	ctx->opts = opts;
 
 	if (existed)
@@ -315,7 +315,7 @@ dns_c_ndcctx_getoptions(dns_c_ndcctx_t *ctx, dns_c_ndcopts_t **opts) {
 	REQUIRE(DNS_C_NDCCTX_VALID(ctx));
 	REQUIRE(opts != NULL);
 	REQUIRE(*opts == NULL);
-	
+
 	*opts = ctx->opts;
 
 	if (ctx->opts == NULL)
@@ -332,7 +332,7 @@ dns_c_ndcctx_setservers(dns_c_ndcctx_t *ctx, dns_c_ndcserverlist_t *servers) {
 	REQUIRE(servers == NULL || DNS_C_NDCSERVERLIST_VALID(servers));
 
 	existed = ISC_TF(ctx->servers != NULL);
-	
+
 	ctx->servers = servers;
 
 	if (existed)
@@ -346,7 +346,7 @@ dns_c_ndcctx_getservers(dns_c_ndcctx_t *ctx, dns_c_ndcserverlist_t **servers) {
 	REQUIRE(DNS_C_NDCCTX_VALID(ctx));
 	REQUIRE(servers != NULL);
 	REQUIRE(*servers == NULL);
-	
+
 	*servers = ctx->servers;
 
 	if (ctx->servers == NULL)
@@ -358,11 +358,11 @@ dns_c_ndcctx_getservers(dns_c_ndcctx_t *ctx, dns_c_ndcserverlist_t **servers) {
 isc_result_t
 dns_c_ndcctx_addserver(dns_c_ndcctx_t *ctx, dns_c_ndcserver_t **server) {
 	isc_result_t result;
-	
+
 	REQUIRE(DNS_C_NDCCTX_VALID(ctx));
 	REQUIRE(server != NULL);
 	REQUIRE(DNS_C_NDCSERVER_VALID(*server));
-	
+
 	if (ctx->servers == NULL) {
 		result = dns_c_ndcserverlist_new(ctx->mem, &ctx->servers);
 		if (result != ISC_R_SUCCESS)
@@ -416,12 +416,12 @@ dns_c_ndcctx_getkeys(dns_c_ndcctx_t *ctx, dns_c_kdeflist_t **keys) {
 isc_result_t
 dns_c_ndcctx_setkeys(dns_c_ndcctx_t *ctx, dns_c_kdeflist_t *keys) {
 	isc_boolean_t existed;
-	
+
 	REQUIRE(DNS_C_NDCCTX_VALID(ctx));
 	REQUIRE(DNS_C_KDEFLIST_VALID(keys));
 
 	existed = ISC_TF(ctx->keys != NULL);
-	
+
 	ctx->keys = keys;
 
 	if (existed)
@@ -436,7 +436,7 @@ dns_c_ndcserverlist_new(isc_mem_t *mem, dns_c_ndcserverlist_t **servers) {
 
 	REQUIRE(servers != NULL);
 	REQUIRE(*servers == NULL);
-	
+
 	newlist = isc_mem_get(mem, sizeof *newlist);
 	if (newlist == NULL)
 		return (ISC_R_NOMEMORY);
@@ -446,7 +446,7 @@ dns_c_ndcserverlist_new(isc_mem_t *mem, dns_c_ndcserverlist_t **servers) {
 	ISC_LIST_INIT(newlist->list);
 
 	*servers = newlist;
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -482,7 +482,7 @@ dns_c_ndcserverlist_destroy(dns_c_ndcserverlist_t **servers) {
 dns_c_ndcserver_t *
 dns_c_ndcserverlist_first(dns_c_ndcserverlist_t *servers) {
 	REQUIRE(DNS_C_NDCSERVERLIST_VALID(servers));
-	
+
 	return (ISC_LIST_HEAD(servers->list));
 }
 
@@ -497,7 +497,7 @@ dns_c_ndcserverlist_next(dns_c_ndcserver_t *server) {
 isc_result_t
 dns_c_ndcopts_new(isc_mem_t *mem, dns_c_ndcopts_t **opts) {
 	dns_c_ndcopts_t *newo;
-	
+
 	REQUIRE(opts != NULL);
 	REQUIRE(*opts == NULL);
 
@@ -511,7 +511,7 @@ dns_c_ndcopts_new(isc_mem_t *mem, dns_c_ndcopts_t **opts) {
 	newo->defkey = NULL;
 
 	*opts = newo;
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -519,11 +519,11 @@ isc_result_t
 dns_c_ndcopts_destroy(dns_c_ndcopts_t **opts) {
 	dns_c_ndcopts_t *o;
 	isc_mem_t *mem;
-	
+
 	REQUIRE(opts != NULL);
 
 	o = *opts;
-	
+
 	REQUIRE(DNS_C_NDCOPTIONS_VALID(o));
 
 	if (o->defserver != NULL)
@@ -540,8 +540,8 @@ dns_c_ndcopts_destroy(dns_c_ndcopts_t **opts) {
 
 	return (ISC_R_SUCCESS);
 }
-	
-		
+
+
 isc_result_t
 dns_c_ndcopts_getdefserver(dns_c_ndcopts_t *opts, const char **retval) {
 	REQUIRE(DNS_C_NDCOPTIONS_VALID(opts));
@@ -601,7 +601,7 @@ dns_c_ndcopts_setdefkey(dns_c_ndcopts_t *opts, const char *newval) {
 	REQUIRE(newval == NULL || *newval != '\0');
 
 	existed = ISC_TF(opts->defkey != NULL);
-	
+
 	if (newval != NULL) {
 		opts->defkey = isc_mem_strdup(opts->mem, newval);
 		if (opts->defkey == NULL)
@@ -621,7 +621,7 @@ dns_c_ndcopts_setdefkey(dns_c_ndcopts_t *opts, const char *newval) {
 isc_result_t
 dns_c_ndcserver_new(isc_mem_t *mem, dns_c_ndcserver_t **server) {
 	dns_c_ndcserver_t *serv = NULL;
-	
+
 	REQUIRE(server != NULL);
 	REQUIRE(*server == NULL);
 
@@ -640,12 +640,12 @@ dns_c_ndcserver_new(isc_mem_t *mem, dns_c_ndcserver_t **server) {
 
 	return (ISC_R_SUCCESS);
 }
-	
+
 isc_result_t
 dns_c_ndcserver_destroy(dns_c_ndcserver_t **server) {
 	dns_c_ndcserver_t *serv;
 	isc_mem_t *mem;
-	
+
 	REQUIRE(server != NULL);
 
 	serv = *server ;
@@ -653,10 +653,10 @@ dns_c_ndcserver_destroy(dns_c_ndcserver_t **server) {
 
 	if (serv->name != NULL)
 		isc_mem_free(serv->mem, serv->name);
-	
+
 	if (serv->key != NULL)
 		isc_mem_free(serv->mem, serv->key);
-	
+
 	if (serv->host != NULL)
 		isc_mem_free(serv->mem, serv->host);
 
@@ -669,11 +669,11 @@ dns_c_ndcserver_destroy(dns_c_ndcserver_t **server) {
 	return (ISC_R_SUCCESS);
 }
 
-	
+
 isc_result_t
 dns_c_ndcserver_setkey(dns_c_ndcserver_t *server, const char *val) {
 	isc_boolean_t existed;
-	
+
 	REQUIRE(DNS_C_NDCSERVER_VALID(server));
 
 	existed = ISC_TF(server->key != NULL);
@@ -695,7 +695,7 @@ dns_c_ndcserver_setkey(dns_c_ndcserver_t *server, const char *val) {
 isc_result_t
 dns_c_ndcserver_setname(dns_c_ndcserver_t *server, const char *val) {
 	isc_boolean_t existed;
-	
+
 	REQUIRE(DNS_C_NDCSERVER_VALID(server));
 
 	existed = ISC_TF(server->name != NULL);
@@ -717,7 +717,7 @@ dns_c_ndcserver_setname(dns_c_ndcserver_t *server, const char *val) {
 isc_result_t
 dns_c_ndcserver_sethost(dns_c_ndcserver_t *server, const char *val) {
 	isc_boolean_t existed;
-	
+
 	REQUIRE(DNS_C_NDCSERVER_VALID(server));
 
 	existed = ISC_TF(server->host != NULL);
@@ -735,7 +735,7 @@ dns_c_ndcserver_sethost(dns_c_ndcserver_t *server, const char *val) {
 	else
 		return (ISC_R_SUCCESS);
 }
-	
+
 isc_result_t
 dns_c_ndcserver_getkey(dns_c_ndcserver_t *server, const char **val) {
 	REQUIRE(DNS_C_NDCSERVER_VALID(server));
@@ -790,11 +790,11 @@ dns_c_ndcparseconf(const char *filename, isc_mem_t *mem,
 	ndcpcontext pctx;
 	isc_result_t result;
 	dns_c_ndcctx_t *aConfig = NULL;
-	
+
 	result = parser_setup(&pctx, mem, filename);
 	if (result != ISC_R_SUCCESS)
 		goto done;
-	
+
 	result = parse_file(&pctx, &aConfig);
 	if (result != ISC_R_SUCCESS && aConfig != NULL)
 		dns_c_ndcctx_destroy(&aConfig);
@@ -802,12 +802,12 @@ dns_c_ndcparseconf(const char *filename, isc_mem_t *mem,
  done:
 	if (pctx.thelexer != NULL)
 		isc_lex_destroy(&pctx.thelexer);
-	
+
 	if (pctx.thekeywords != NULL)
 		isc_symtab_destroy(&pctx.thekeywords);
 
 	*ndcctx = aConfig;
-	
+
 	return (result);
 }
 
@@ -828,7 +828,7 @@ parse_file(ndcpcontext *pctx, dns_c_ndcctx_t **context) {
 
 	result = getnexttoken(pctx);
 	done = ISC_TF(result != ISC_R_SUCCESS);
-	
+
 	while (!done) {
 		switch (pctx->currtok) {
 		case L_END_INPUT:
@@ -856,7 +856,7 @@ parse_statement(ndcpcontext *pctx) {
 	dns_c_ndcopts_t *tmpopts = NULL;
 	dns_c_ndcserver_t  *server = NULL;
 	dns_c_kdeflist_t *keys = NULL;
-	
+
 	switch (pctx->currtok) {
 	case L_OPTIONS:
 		result = parse_options(pctx, &opts);
@@ -892,7 +892,7 @@ parse_statement(ndcpcontext *pctx) {
 
 		result = parse_keystmt(pctx, keys);
 		break;
-		
+
 	default:
 		syntax_error(pctx, pctx->currtok);
 		result = ISC_R_FAILURE;
@@ -908,7 +908,7 @@ parse_statement(ndcpcontext *pctx) {
 
 	if (opts != NULL)
 		dns_c_ndcopts_destroy(&opts);
-							
+
 	return (result);
 }
 
@@ -920,21 +920,21 @@ parse_options(ndcpcontext *pctx, dns_c_ndcopts_t **opts) {
 	dns_c_ndcctx_t *cfgctx = pctx->thecontext;
 
 	REQUIRE(DNS_C_NDCCTX_VALID(cfgctx));
-	
+
 	if (!eat(pctx, L_OPTIONS) || !eat_lbrace(pctx))
 		return (ISC_R_FAILURE);
 
 	result = dns_c_ndcopts_new(cfgctx->mem, &newopts);
 	if (result != ISC_R_SUCCESS)
 		return (result);
-	
+
 	result = ISC_R_SUCCESS;
 	while (result == ISC_R_SUCCESS && pctx->currtok != L_RBRACE) {
 		option = pctx->currtok;
 
 		if (!eat(pctx, pctx->currtok))
 			return (ISC_R_FAILURE);
-		
+
 		switch (option) {
 		case L_DEFAULT_SERVER:
 			if (!looking_at_stringoripaddr(pctx))
@@ -944,22 +944,22 @@ parse_options(ndcpcontext *pctx, dns_c_ndcopts_t **opts) {
 							    pctx->tokstr);
 			if (result == ISC_R_SUCCESS)
 				result = getnexttoken(pctx);
-			
+
 			if (result != ISC_R_SUCCESS)
 				return (result);
 
 			break;
-				
+
 		case L_DEFAULT_KEY:
 			if (!looking_at_anystring(pctx))
 				return (result);
-			
+
 			result = dns_c_ndcopts_setdefkey(newopts,
 							 pctx->tokstr);
 
 			if (result == ISC_R_SUCCESS)
 				result = getnexttoken(pctx);
-			
+
 			if (result != ISC_R_SUCCESS)
 				return (result);
 			break;
@@ -986,7 +986,7 @@ parse_options(ndcpcontext *pctx, dns_c_ndcopts_t **opts) {
 		*opts = newopts;
 	else
 		dns_c_ndcopts_destroy(&newopts);
-	
+
 	return (result);
 }
 
@@ -998,7 +998,7 @@ parse_serverstmt(ndcpcontext *pctx, dns_c_ndcserver_t **server) {
 	char *keyname = NULL;
 	char *hostname = NULL;
 	dns_c_ndcserver_t *serv = NULL;
-		
+
 	if (!eat(pctx, L_SERVER))
 		return (ISC_R_FAILURE);
 
@@ -1030,7 +1030,7 @@ parse_serverstmt(ndcpcontext *pctx, dns_c_ndcserver_t **server) {
 			result = ISC_R_FAILURE;
 			goto done;
 		}
-		
+
 		switch (field) {
 		case L_KEY:
 			if (!looking_at_anystring(pctx)) {
@@ -1047,10 +1047,10 @@ parse_serverstmt(ndcpcontext *pctx, dns_c_ndcserver_t **server) {
 			keyname = isc_mem_strdup(pctx->themem, pctx->tokstr);
 			if (keyname == NULL)
 				result = ISC_R_NOMEMORY;
-			
+
 			if (result == ISC_R_SUCCESS)
 				result = getnexttoken(pctx);
-			
+
 			break;
 
 		case L_HOST:
@@ -1068,10 +1068,10 @@ parse_serverstmt(ndcpcontext *pctx, dns_c_ndcserver_t **server) {
 			hostname = isc_mem_strdup(pctx->themem, pctx->tokstr);
 			if (hostname == NULL)
 				result = ISC_R_NOMEMORY;
-			
+
 			if (result == ISC_R_SUCCESS)
 				result = getnexttoken(pctx);
-			
+
 			break;
 
 		default:
@@ -1082,7 +1082,7 @@ parse_serverstmt(ndcpcontext *pctx, dns_c_ndcserver_t **server) {
 
 		if (result != ISC_R_SUCCESS)
 			goto done;
-		
+
 		if (!eat_eos(pctx)) {
 			result = ISC_R_FAILURE;
 			goto done;
@@ -1110,7 +1110,7 @@ parse_serverstmt(ndcpcontext *pctx, dns_c_ndcserver_t **server) {
 	result = dns_c_ndcserver_setname(serv, servername);
 	if (result != ISC_R_SUCCESS)
 		goto done;
-	
+
 	result = dns_c_ndcserver_setkey(serv, keyname);
 	if (result != ISC_R_SUCCESS)
 		goto done;
@@ -1125,7 +1125,7 @@ parse_serverstmt(ndcpcontext *pctx, dns_c_ndcserver_t **server) {
 done:
 	if (serv != NULL)
 		dns_c_ndcserver_destroy(&serv);
-	
+
 	if (servername != NULL)
 		isc_mem_free(pctx->themem, servername);
 
@@ -1147,7 +1147,7 @@ parse_keystmt(ndcpcontext *pctx, dns_c_kdeflist_t *keys) {
 	char *keyname = NULL;
 	char *algorithm = NULL;
 	char *secret = NULL;
-	
+
 	REQUIRE(DNS_C_NDCCTX_VALID(ctx));
 	REQUIRE(DNS_C_KDEFLIST_VALID(keys));
 
@@ -1189,7 +1189,7 @@ parse_keystmt(ndcpcontext *pctx, dns_c_kdeflist_t *keys) {
 				result = ISC_R_FAILURE;
 				goto done;
 			}
-			
+
 			if (algorithm != NULL) {
 				parser_warn(pctx, ISC_FALSE,
 					    "multiple 'algorithm' values");
@@ -1208,7 +1208,7 @@ parse_keystmt(ndcpcontext *pctx, dns_c_kdeflist_t *keys) {
 				result = ISC_R_FAILURE;
 				goto done;
 			}
-			
+
 			if (secret != NULL) {
 				parser_warn(pctx, ISC_FALSE,
 					    "multiple 'secret' values");
@@ -1249,7 +1249,7 @@ parse_keystmt(ndcpcontext *pctx, dns_c_kdeflist_t *keys) {
 		parser_error(pctx, ISC_FALSE, "zero length 'algorithm'");
 		result = ISC_R_FAILURE;
 	}
-	
+
 	if (secret == NULL) {
 		parser_error(pctx, ISC_FALSE, "missing 'secret'");
 		result = ISC_R_FAILURE;
@@ -1260,7 +1260,7 @@ parse_keystmt(ndcpcontext *pctx, dns_c_kdeflist_t *keys) {
 
 	if (result != ISC_R_SUCCESS)
 		goto done;
-	
+
 	result = dns_c_kdef_new(keys->mem, keyname, &key);
 	if (result != ISC_R_SUCCESS)
 		goto done;
@@ -1284,7 +1284,7 @@ done:
 
 	return (result);
 }
-	
+
 static const char *
 keyword2str(isc_int32_t val) {
 	int i;
@@ -1303,7 +1303,7 @@ keyword2str(isc_int32_t val) {
 static isc_boolean_t
 eat(ndcpcontext *pctx, isc_uint32_t token) {
 	isc_boolean_t rval = ISC_FALSE;
-	
+
 	if (looking_at(pctx, token))
 		if (getnexttoken(pctx) == ISC_R_SUCCESS)
 			rval = ISC_TRUE;
@@ -1314,7 +1314,7 @@ eat(ndcpcontext *pctx, isc_uint32_t token) {
 static isc_boolean_t
 looking_at(ndcpcontext *pctx, isc_uint32_t token) {
 	isc_boolean_t rval = ISC_TRUE;
-	
+
 	if (pctx->currtok != token) {
 		parser_error(pctx, ISC_TRUE, "expected a '%s'",
 			     keyword2str(token));
@@ -1346,7 +1346,7 @@ looking_at_stringoripaddr(ndcpcontext *pctx) {
 
 	return (ISC_TRUE);
 }
-		
+
 
 static isc_boolean_t
 eat_lbrace(ndcpcontext *pctx) {
@@ -1400,13 +1400,13 @@ parser_setup(ndcpcontext *pctx, isc_mem_t *mem, const char *filename) {
 	}
 
 	memset(specials, 0x0, sizeof specials);
-	
+
         specials['{'] = 1;
         specials['}'] = 1;
         specials[';'] = 1;
         specials['"'] = 1;
         isc_lex_setspecials(pctx->thelexer, specials);
-	
+
         isc_lex_setcomments(pctx->thelexer, (ISC_LEXCOMMENT_C |
 					     ISC_LEXCOMMENT_CPLUSPLUS |
 					     ISC_LEXCOMMENT_SHELL));
@@ -1582,7 +1582,7 @@ is_ip4addr(const char *string, struct in_addr *addr) {
 
         else
                 return (ISC_FALSE);
-        
+
         if (inet_pton(AF_INET, addrbuf, addr) != 1)
                 return (ISC_FALSE);
 
@@ -1601,7 +1601,7 @@ getnexttoken(ndcpcontext *pctx) {
 
 	pctx->prevtok = pctx->currtok;
 	strcpy(pctx->prevtokstr, pctx->tokstr);
-	
+
         result = isc_lex_gettoken(pctx->thelexer, options, &token);
 
         switch(result) {
@@ -1614,7 +1614,7 @@ getnexttoken(ndcpcontext *pctx) {
 		case isc_tokentype_special:
 		case isc_tokentype_string: {
 			char *tokstr = &pctx->tokstr[0];
-			
+
 			if (token.type == isc_tokentype_special) {
 				tokstr[0] = token.value.as_char;
 				tokstr[1] = '\0';
@@ -1638,7 +1638,7 @@ getnexttoken(ndcpcontext *pctx) {
 
 			} else
 				pctx->currtok = keywordtok.as_integer;
-				
+
 			result = ISC_R_SUCCESS;
 			break;
 		}
@@ -1716,7 +1716,7 @@ getnexttoken(ndcpcontext *pctx) {
 		result = ISC_R_FAILURE;
 		break;
 	}
-		
+
 	return (result);
 }
 
diff --git a/lib/dns/config/confparser.y.dirty b/lib/dns/config/confparser.y.dirty
index 8048b4e304..178348425d 100644
--- a/lib/dns/config/confparser.y.dirty
+++ b/lib/dns/config/confparser.y.dirty
@@ -1,11 +1,11 @@
 %{
 /*
  * Copyright (C) 1996-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
  * 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
@@ -16,7 +16,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: confparser.y.dirty,v 1.5 2000/07/31 21:07:02 explorer Exp $ */
+/* $Id: confparser.y.dirty,v 1.6 2000/08/01 01:23:26 tale Exp $ */
 
 #include 
 
@@ -97,9 +97,9 @@ static isc_lexspecials_t	specials;
  * XXXJAB The #define for the default OMAPI port is not available
  * to us, so we make our own.
  */
- 
+
 #define OMAPI_DEFAULT_PORT 953
- 
+
 #define CONF_MAX_IDENT 1024
 
 /* This should be sufficient to permit multiple parsers and lexers if needed */
@@ -513,7 +513,7 @@ options_stmt: L_OPTIONS
 				     "zones and views");
 			YYABORT;
 		}
-		
+
 		tmpres = dns_c_ctx_getoptions(currcfg, &options);
 		if (tmpres == ISC_R_SUCCESS) {
 			parser_error(ISC_FALSE, "cannot redefine options");
@@ -1561,8 +1561,8 @@ control_keys: /* nothing */
 		$$ = $3;
 	};
 
-		
-			
+
+
 control_port: /* nothing */
 	{
 		$$ = OMAPI_DEFAULT_PORT;
@@ -1816,7 +1816,7 @@ ip_and_port_list: ip_and_port_element L_EOS
 			isc_mem_free(memctx, $2);
 		}
 #endif /* NOMINUM_PUBLIC */
-		
+
 		$$ = list;
 	}
 #ifndef NOMINUM_PUBLIC
@@ -1966,7 +1966,7 @@ notify_setting: yea_or_nay
 			$$ = dns_notifytype_yes;
 		else
 			$$ = dns_notifytype_no;
-			
+
 	}
 	| L_EXPLICIT
 	{
@@ -2074,7 +2074,7 @@ size_clause: L_DATASIZE size_spec
 				     "'max-cache-size'");
 			YYABORT;
 		}
-		
+
 		tmpres = dns_c_ctx_setmaxcachesize(currcfg, $2);
 		if (tmpres == ISC_R_EXISTS) {
 			parser_error(ISC_FALSE,
@@ -2112,7 +2112,7 @@ size_spec: any_string
 				       isc_result_totext(tmpres));
 			$$ = DNS_C_SIZE_SPEC_DEFAULT;
 		}
-			
+
 		isc_mem_free(memctx, $1);
 	}
 	| L_INTEGER
@@ -2973,11 +2973,11 @@ keyid_list: /* nothing */
 		}
 
 		isc_mem_free(memctx, $2);
-			
+
 		dns_c_kidlist_append($$, kid);
 	};
 
-	
+
 /*
  * Address Matching
  */
@@ -4041,7 +4041,7 @@ view_option: L_FORWARD zone_forward_opt
 				     "'max-cache-size'");
 			YYABORT;
 		}
-		
+
 		tmpres = dns_c_view_setmaxcachesize(view, $2);
 		if (tmpres == ISC_R_EXISTS) {
 			parser_error(ISC_FALSE,
@@ -4369,7 +4369,7 @@ zone_stmt: L_ZONE domain_name optional_class L_LBRACE L_TYPE zone_type L_EOS
 			if (tmpres != ISC_R_SUCCESS) {
 				YYABORT;
 			}
-			
+
 			tmpres = callbacks->zonecbk(currcfg,
 						    zone,
 						    view,
@@ -5121,7 +5121,7 @@ trusted_keys_stmt: L_TRUSTED_KEYS
 		} else {
 			tmpres = dns_c_view_gettrustedkeys(view, &newlist);
 		}
-		
+
 		if (tmpres == ISC_R_NOTFOUND) {
 			tmpres = dns_c_tkeylist_new(currcfg->mem, &newlist);
 			if (tmpres != ISC_R_SUCCESS) {
@@ -5142,7 +5142,7 @@ trusted_keys_stmt: L_TRUSTED_KEYS
 								   newlist,
 								   ISC_FALSE);
 			}
-			
+
 			if (tmpres != ISC_R_SUCCESS) {
 				isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 					      DNS_LOGMODULE_CONFIG,
@@ -5173,7 +5173,7 @@ trusted_key: any_string L_INTEGER L_INTEGER L_INTEGER L_QSTRING
 			tmpres = dns_c_view_gettrustedkeys(view, &list);
 			mem = view->mem;
 		}
-		
+
 		if (tmpres != ISC_R_SUCCESS) {
 			isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 				      DNS_LOGMODULE_CONFIG,
diff --git a/lib/dns/config/confpvt.h b/lib/dns/config/confpvt.h
index 4e3d889af7..12ee6945b7 100644
--- a/lib/dns/config/confpvt.h
+++ b/lib/dns/config/confpvt.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: confpvt.h,v 1.9 2000/07/27 09:47:10 tale Exp $ */
+/* $Id: confpvt.h,v 1.10 2000/08/01 01:23:27 tale Exp $ */
 
 #ifndef CONFIG_CONFPVT_H
 #define CONFIG_CONFPVT_H 1
diff --git a/lib/dns/config/confresolv.c b/lib/dns/config/confresolv.c
index a4bb24e52e..1667cfd3e2 100644
--- a/lib/dns/config/confresolv.c
+++ b/lib/dns/config/confresolv.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: confresolv.c,v 1.8 2000/07/27 09:47:11 tale Exp $ */
+/* $Id: confresolv.c,v 1.9 2000/08/01 01:23:28 tale Exp $ */
 
 #include 
 
@@ -29,7 +29,7 @@ isc_result_t
 dns_c_resolv_new(isc_mem_t *mem, dns_c_resolv_t **cfgres) {
 	UNUSED(mem);
 	UNUSED(cfgres);
-	
+
 	/* XXX nothing yet */
 
 	return (ISC_R_SUCCESS);
@@ -45,5 +45,5 @@ dns_c_resolv_delete(dns_c_resolv_t **cfgres) {
 	return (ISC_R_SUCCESS);
 }
 
-		
+
 
diff --git a/lib/dns/config/confrrset.c b/lib/dns/config/confrrset.c
index 97c27ec706..c511455c0c 100644
--- a/lib/dns/config/confrrset.c
+++ b/lib/dns/config/confrrset.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: confrrset.c,v 1.15 2000/07/27 09:47:12 tale Exp $ */
+/* $Id: confrrset.c,v 1.16 2000/08/01 01:23:29 tale Exp $ */
 
 #include 
 
@@ -27,7 +27,7 @@
 isc_result_t
 dns_c_rrsolist_clear(dns_c_rrsolist_t *olist) {
 	dns_c_rrso_t *elem;
-	
+
 	REQUIRE(DNS_C_RRSOLIST_VALID(olist));
 
 	elem = ISC_LIST_HEAD(olist->elements);
@@ -71,13 +71,13 @@ dns_c_rrsolist_new(isc_mem_t *mem, dns_c_rrsolist_t **rval) {
 	if (ro == NULL) {
 		return (ISC_R_NOMEMORY);
 	}
-	
+
 	ISC_LIST_INIT(ro->elements);
 	ro->mem = mem;
 	ro->magic = DNS_C_RRSOLIST_MAGIC;
 
 	*rval = ro;
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -90,11 +90,11 @@ dns_c_rrso_new(isc_mem_t *mem, dns_c_rrso_t **res, dns_rdataclass_t oclass,
 
 	REQUIRE(mem != NULL);
 	REQUIRE(res != NULL);
-	
+
 	if (name == NULL) {
 		name = "*";
 	}
-	
+
 	newo = isc_mem_get(mem, sizeof *newo);
 	if (newo == NULL) {
 		return (ISC_R_NOMEMORY);
@@ -138,7 +138,7 @@ dns_c_rrsolist_delete(dns_c_rrsolist_t **list) {
 		if (r != ISC_R_SUCCESS) {
 			return (r);
 		}
-		
+
 		elem = q;
 	}
 
@@ -166,7 +166,7 @@ dns_c_rrso_delete(dns_c_rrso_t **order) {
 	isc_mem_put(oldo->mem, oldo, sizeof *oldo);
 
 	*order = NULL;
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -186,7 +186,7 @@ dns_c_rrso_copy(isc_mem_t *mem, dns_c_rrso_t **dest, dns_c_rrso_t *source) {
 	} else {
 		*dest = NULL;
 	}
-	
+
 	return (res);
 }
 
@@ -202,12 +202,12 @@ dns_c_rrsolist_copy(isc_mem_t *mem, dns_c_rrsolist_t **dest,
 
 	REQUIRE(DNS_C_RRSOLIST_VALID(source));
 	REQUIRE(dest != NULL);
-	
+
 	res = dns_c_rrsolist_new(mem, &nlist);
 	if (res != ISC_R_SUCCESS) {
 		return (res);
 	}
-	
+
 	elem = ISC_LIST_HEAD(source->elements);
 	while (elem != NULL) {
 		res = dns_c_rrso_copy(mem, &newe, elem);
@@ -217,7 +217,7 @@ dns_c_rrsolist_copy(isc_mem_t *mem, dns_c_rrsolist_t **dest,
 		}
 
 		ISC_LIST_APPEND(nlist->elements, newe, next);
-		
+
 		elem = ISC_LIST_NEXT(elem, next);
 	}
 
@@ -231,11 +231,11 @@ dns_c_rrsolist_print(FILE *fp, int indent, dns_c_rrsolist_t *rrlist) {
 	dns_c_rrso_t *or;
 
 	REQUIRE(DNS_C_RRSOLIST_VALID(rrlist));
-	
+
 	if (ISC_LIST_EMPTY(rrlist->elements)) {
 		return;
 	}
-	
+
 	dns_c_printtabs(fp, indent);
 	fprintf(fp, "rrset-order {\n");
 
@@ -247,22 +247,22 @@ dns_c_rrsolist_print(FILE *fp, int indent, dns_c_rrsolist_t *rrlist) {
 
 	dns_c_printtabs(fp, indent);
 	fprintf(fp, "};\n");
-	
+
 }
 
 void
 dns_c_rrso_print(FILE *fp, int indent, dns_c_rrso_t *order) {
 	REQUIRE(DNS_C_RRSO_VALID(order));
-	
+
 	dns_c_printtabs(fp, indent);
-	
+
 	fputs("class ", fp);
 	if (order->oclass == dns_rdataclass_any) {
 		fputc('*', fp);
 	} else {
 		dns_c_dataclass_tostream(fp, order->oclass);
 	}
-	
+
 
 	fputs(" type ", fp);
 	if (order->otype == dns_rdatatype_any) {
@@ -275,6 +275,6 @@ dns_c_rrso_print(FILE *fp, int indent, dns_c_rrso_t *order) {
 
 	fprintf(fp, " order %s",
 		dns_c_ordering2string(order->ordering, ISC_TRUE));
-	
+
 	fputs(";\n", fp);
 }
diff --git a/lib/dns/config/confview.c b/lib/dns/config/confview.c
index a551b5b540..d917db6296 100644
--- a/lib/dns/config/confview.c
+++ b/lib/dns/config/confview.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: confview.c,v 1.41 2000/07/31 21:07:03 explorer Exp $ */
+/* $Id: confview.c,v 1.42 2000/08/01 01:23:30 tale Exp $ */
 
 #include 
 
@@ -152,7 +152,7 @@ PVT_CONCAT(dns_c_view_unset, FUNCNAME)(dns_c_view_t *view) {	\
 		return (ISC_R_NOTFOUND);			\
 	}							\
 }
-	
+
 
 #define GETIPMLIST(FUNCNAME, FIELDNAME)					\
 isc_result_t								\
@@ -175,7 +175,7 @@ PVT_CONCAT(dns_c_view_get, FUNCNAME)(dns_c_view_t *view,		\
 isc_result_t
 dns_c_viewtable_new(isc_mem_t *mem, dns_c_viewtable_t **viewtable) {
 	dns_c_viewtable_t *table;
-	
+
 	REQUIRE(viewtable != NULL);
 
 	table = isc_mem_get(mem, sizeof *table);
@@ -200,13 +200,13 @@ dns_c_viewtable_new(isc_mem_t *mem, dns_c_viewtable_t **viewtable) {
 isc_result_t
 dns_c_viewtable_delete(dns_c_viewtable_t **viewtable) {
 	dns_c_viewtable_t *table;
-	
+
 	REQUIRE(viewtable != NULL);
 	REQUIRE(DNS_C_VIEWTABLE_VALID(*viewtable));
 
 	table = *viewtable;
 	*viewtable = NULL;
-	
+
 	dns_c_viewtable_clear(table);
 
 	table->magic = 0;
@@ -241,7 +241,7 @@ void
 dns_c_viewtable_addview(dns_c_viewtable_t *viewtable, dns_c_view_t *view) {
 	REQUIRE(DNS_C_VIEWTABLE_VALID(viewtable));
 	REQUIRE(DNS_C_VIEW_VALID(view));
-	
+
 	ISC_LIST_APPEND(viewtable->views, view, next);
 }
 
@@ -251,7 +251,7 @@ void
 dns_c_viewtable_rmview(dns_c_viewtable_t *viewtable, dns_c_view_t *view) {
 	REQUIRE(DNS_C_VIEWTABLE_VALID(viewtable));
 	REQUIRE(DNS_C_VIEW_VALID(view));
-	
+
 	ISC_LIST_UNLINK(viewtable->views, view, next);
 }
 
@@ -262,14 +262,14 @@ dns_c_viewtable_clear(dns_c_viewtable_t *table) {
 	dns_c_view_t *elem;
 	dns_c_view_t *tmpelem;
 	isc_result_t r;
-	
+
 	REQUIRE(DNS_C_VIEWTABLE_VALID(table));
-	
+
 	elem = ISC_LIST_HEAD(table->views);
 	while (elem != NULL) {
 		tmpelem = ISC_LIST_NEXT(elem, next);
 		ISC_LIST_UNLINK(table->views, elem, next);
-		
+
 		r = dns_c_view_delete(&elem);
 		if (r != ISC_R_SUCCESS) {
 			isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
@@ -307,7 +307,7 @@ dns_c_viewtable_viewbyname(dns_c_viewtable_t *viewtable,
 
 		elem = ISC_LIST_NEXT(elem, next);
 	}
-	
+
 	if (elem != NULL) {
 		*retval = elem;
 	}
@@ -325,7 +325,7 @@ dns_c_viewtable_rmviewbyname(dns_c_viewtable_t *viewtable,
 	isc_result_t res;
 
 	REQUIRE(DNS_C_VIEWTABLE_VALID(viewtable));
-	
+
 	res = dns_c_viewtable_viewbyname(viewtable, name, &view);
 	if (res == ISC_R_SUCCESS) {
 		ISC_LIST_UNLINK(viewtable->views, view, next);
@@ -335,7 +335,7 @@ dns_c_viewtable_rmviewbyname(dns_c_viewtable_t *viewtable,
 	return (res);
 }
 
-	
+
 isc_result_t
 dns_c_viewtable_checkviews(dns_c_viewtable_t *viewtable) {
 	dns_c_view_t *elem;
@@ -344,7 +344,7 @@ dns_c_viewtable_checkviews(dns_c_viewtable_t *viewtable) {
 	isc_uint32_t buival;
 	isc_result_t result = ISC_R_SUCCESS;
 	dns_c_rrsolist_t *boval;
-	
+
 	REQUIRE(DNS_C_VIEWTABLE_VALID(viewtable));
 
 	elem = ISC_LIST_HEAD(viewtable->views);
@@ -405,11 +405,11 @@ dns_c_viewtable_checkviews(dns_c_viewtable_t *viewtable) {
 				      DNS_LOGMODULE_CONFIG, ISC_LOG_WARNING,
 				      "view 'rrset-order' is not yet "
 				      "implemented");
-		
+
 
 		elem = ISC_LIST_NEXT(elem, next);
 	}
-	
+
 	return (result);
 }
 
@@ -476,7 +476,7 @@ dns_c_view_new(isc_mem_t *mem, const char *name, dns_rdataclass_t viewclass,
 	view->rfc2308_type1 = NULL;
 	view->additional_from_cache = NULL;
 	view->additional_from_auth = NULL;
-	
+
 	view->transfer_source = NULL;
 	view->transfer_source_v6 = NULL;
 	view->query_source = NULL;
@@ -498,7 +498,7 @@ dns_c_view_new(isc_mem_t *mem, const char *name, dns_rdataclass_t viewclass,
 	view->peerlist = NULL;
 
 	view->trusted_keys = NULL;
-	
+
 #if 0
 	view->max_transfer_time_in = NULL;
 	view->max_transfer_idle_in = NULL;
@@ -507,7 +507,7 @@ dns_c_view_new(isc_mem_t *mem, const char *name, dns_rdataclass_t viewclass,
 #endif
 
 	ISC_LINK_INIT(view, next);
-	
+
 	*newview = view;
 
 	return (ISC_R_SUCCESS);
@@ -520,7 +520,7 @@ dns_c_view_print(FILE *fp, int indent, dns_c_view_t *view) {
 	in_port_t port;
 
 	REQUIRE(DNS_C_VIEW_VALID(view));
-	
+
 	dns_c_printtabs(fp, indent);
 	fprintf(fp, "view \"%s\"", view->name);
 
@@ -578,7 +578,7 @@ dns_c_view_print(FILE *fp, int indent, dns_c_view_t *view) {
 		dns_c_printtabs(fp, indent + 1);		\
 		fprintf(fp, "%s %d;\n",NAME,(int)*view->FIELD);	\
 	}
-		
+
 #define PRINT_AS_MINUTES(FIELD, NAME)				\
 	if (view->FIELD != NULL) {				\
 		dns_c_printtabs(fp, indent + 1);		\
@@ -598,7 +598,7 @@ dns_c_view_print(FILE *fp, int indent, dns_c_view_t *view) {
 		fprintf(fp, ";\n");					\
 	}
 
-	
+
 	if (view->forward != NULL) {
 		dns_c_printtabs(fp, indent + 1);
 		fprintf(fp, "forward %s;\n",
@@ -642,7 +642,7 @@ dns_c_view_print(FILE *fp, int indent, dns_c_view_t *view) {
 			dns_c_transport2string(dns_trans_primary, ISC_TRUE),
 			dns_c_nameseverity2string(nameseverity, ISC_TRUE));
 	}
-		
+
 	if (view->check_names[dns_trans_secondary] != NULL) {
 		nameseverity = *view->check_names[dns_trans_secondary];
 		dns_c_printtabs(fp, indent + 1);
@@ -650,7 +650,7 @@ dns_c_view_print(FILE *fp, int indent, dns_c_view_t *view) {
 			dns_c_transport2string(dns_trans_secondary, ISC_TRUE),
 			dns_c_nameseverity2string(nameseverity, ISC_TRUE));
 	}
-		
+
 	if (view->check_names[dns_trans_response] != NULL) {
 		nameseverity = *view->check_names[dns_trans_response];
 		dns_c_printtabs(fp, indent + 1);
@@ -673,7 +673,7 @@ dns_c_view_print(FILE *fp, int indent, dns_c_view_t *view) {
 
 	PRINT_IP(transfer_source, "transfer-source");
 	PRINT_IP(transfer_source_v6, "transfer-source-v6");
-	
+
 	PRINT_IPANDPORT(query_source, "query-source");
 	PRINT_IPANDPORT(query_source_v6, "query-source-v6");
 
@@ -694,14 +694,14 @@ dns_c_view_print(FILE *fp, int indent, dns_c_view_t *view) {
 		fprintf(fp, "additional-data %s;\n",
 			dns_c_addata2string(*view->additional_data, ISC_TRUE));
 	}
-	
+
 	if (view->transfer_format != NULL) {
 		dns_c_printtabs(fp, indent + 1);
 		fprintf(fp, "transfer-format %s;\n",
 			dns_c_transformat2string(*view->transfer_format,
 						 ISC_TRUE));
 	}
-	
+
 
 	if (view->keydefs != NULL) {
 		dns_c_kdeflist_print(fp, indent + 1, view->keydefs);
@@ -718,13 +718,13 @@ dns_c_view_print(FILE *fp, int indent, dns_c_view_t *view) {
 	}
 
 
-#if 0	
+#if 0
 	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");
 
 	if (view->zonelist != NULL) {
@@ -739,7 +739,7 @@ dns_c_view_print(FILE *fp, int indent, dns_c_view_t *view) {
 #undef PRINT_INT32
 #undef PRINT_IP
 #undef PRINT_IPANDPORT
-	
+
 }
 
 
@@ -760,14 +760,14 @@ dns_c_view_delete(dns_c_view_t **viewptr) {
 		isc_mem_put(view->mem, view->FIELD, sizeof (*view->FIELD)); \
 		view->FIELD = NULL;					   \
 	} } while (0)
-	
+
 	REQUIRE(viewptr != NULL);
 	REQUIRE(DNS_C_VIEW_VALID(*viewptr));
 
 	view = *viewptr;
 
 	isc_mem_free(view->mem, view->name);
-	
+
 	if (view->zonelist != NULL) {
 		dns_c_zonelist_delete(&view->zonelist);
 	}
@@ -777,11 +777,11 @@ dns_c_view_delete(dns_c_view_t **viewptr) {
 	if (view->forwarders != NULL) {
 		dns_c_iplist_detach(&view->forwarders);
 	}
-		
+
 	if (view->also_notify != NULL) {
 		dns_c_iplist_detach(&view->also_notify);
 	}
-		
+
 	FREEIPMLIST(allowquery);
 	FREEIPMLIST(allowupdateforwarding);
 	FREEIPMLIST(transferacl);
@@ -831,18 +831,18 @@ dns_c_view_delete(dns_c_view_t **viewptr) {
 	dns_c_view_unsetpeerlist(view);
 
 	dns_c_view_unsettrustedkeys(view);
-	
-#if 0	
+
+#if 0
 	FREEFIELD(max_transfer_time_in);
 	FREEFIELD(max_transfer_idle_in);
 	FREEFIELD(transfers_per_ns);
 	FREEFIELD(serial_queries);
 #endif
-	
-	
+
+
 	view->magic = 0;
 	isc_mem_put(view->mem, view, sizeof *view);
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -856,7 +856,7 @@ dns_c_view_keydefinedp(dns_c_view_t *view, const char *keyname) {
 	REQUIRE(DNS_C_VIEW_VALID(view));
 	REQUIRE(keyname != NULL);
 	REQUIRE(*keyname != '\0');
-	
+
 	if (view->keydefs != NULL) {
 		res = dns_c_kdeflist_find(view->keydefs, keyname, &keyid);
 		if (res == ISC_R_SUCCESS) {
@@ -899,19 +899,19 @@ isc_result_t
 dns_c_view_addzone(dns_c_view_t *view, dns_c_zone_t *zone) {
 	isc_result_t res;
 	dns_c_zone_t *attached;
-	
+
 	REQUIRE(DNS_C_VIEW_VALID(view));
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 
 	dns_c_zone_attach(zone, &attached);
-	
+
 	if (view->zonelist == NULL) {
 		res = dns_c_zonelist_new(view->mem, &view->zonelist);
 		if (res != ISC_R_SUCCESS) {
 			return (res);
 		}
 	}
-	
+
 	return (dns_c_zonelist_addzone(view->zonelist, attached));
 }
 
@@ -922,7 +922,7 @@ dns_c_view_getzonelist(dns_c_view_t *view, dns_c_zonelist_t **zonelist) {
 	REQUIRE(zonelist != NULL);
 
 	*zonelist = view->zonelist;
-	
+
 	if (view->zonelist == NULL) {
 		return (ISC_R_NOTFOUND);
 	} else {
@@ -953,7 +953,7 @@ SETBYTYPE(dns_c_forw_t, forward, forward)
 UNSETBYTYPE(dns_c_forw_t, forward, forward)
 GETBYTYPE(dns_c_forw_t, forward, forward)
 
-	
+
 /*
 **
 */
@@ -965,7 +965,7 @@ dns_c_view_setforwarders(dns_c_view_t *view,
 {
 	isc_boolean_t existed = ISC_FALSE;
 	isc_result_t res;
-	
+
 	REQUIRE(DNS_C_VIEW_VALID(view));
 	REQUIRE(DNS_C_IPLIST_VALID(ipl));
 
@@ -987,7 +987,7 @@ dns_c_view_setforwarders(dns_c_view_t *view,
 		return (res);
 	}
 }
-		
+
 
 
 isc_result_t
@@ -1001,8 +1001,8 @@ dns_c_view_unsetforwarders(dns_c_view_t *view) {
 		return (ISC_R_NOTFOUND);
 	}
 }
-		
-	
+
+
 
 isc_result_t
 dns_c_view_getforwarders(dns_c_view_t *view,
@@ -1010,7 +1010,7 @@ dns_c_view_getforwarders(dns_c_view_t *view,
 {
 	REQUIRE(DNS_C_VIEW_VALID(view));
 	REQUIRE(ipl != NULL);
-	
+
 	*ipl = view->forwarders;
 
 	return (*ipl == NULL ? ISC_R_NOTFOUND : ISC_R_SUCCESS);
@@ -1027,7 +1027,7 @@ dns_c_view_setalsonotify(dns_c_view_t *view,
 			 dns_c_iplist_t *ipl)
 {
 	isc_boolean_t existed = ISC_FALSE;
-	
+
 	REQUIRE(DNS_C_VIEW_VALID(view));
 	REQUIRE(DNS_C_IPLIST_VALID(ipl));
 
@@ -1040,7 +1040,7 @@ dns_c_view_setalsonotify(dns_c_view_t *view,
 
 	return (existed ? ISC_R_EXISTS : ISC_R_SUCCESS);
 }
-		
+
 
 
 isc_result_t
@@ -1054,8 +1054,8 @@ dns_c_view_unsetalsonotify(dns_c_view_t *view) {
 		return (ISC_R_NOTFOUND);
 	}
 }
-		
-	
+
+
 
 isc_result_t
 dns_c_view_getalsonotify(dns_c_view_t *view,
@@ -1098,13 +1098,13 @@ dns_c_view_setordering(dns_c_view_t *view,
 		} else {
 			dns_c_rrsolist_clear(view->ordering);
 		}
-		
+
 		res = dns_c_rrsolist_append(view->ordering, olist);
 	} else {
 		if (view->ordering != NULL) {
 			dns_c_rrsolist_delete(&view->ordering);
 		}
-		
+
 		view->ordering = olist;
 		res = ISC_R_SUCCESS;
 	}
@@ -1112,11 +1112,11 @@ dns_c_view_setordering(dns_c_view_t *view,
 	if (res == ISC_R_SUCCESS && existed) {
 		res = ISC_R_EXISTS;
 	}
-	
+
 	return (res);
 }
 
-					  
+
 
 
 isc_result_t
@@ -1159,7 +1159,7 @@ dns_c_view_setchecknames(dns_c_view_t *view,
 {
 	isc_boolean_t existed = ISC_FALSE;
 	dns_severity_t **ptr = NULL;
-	
+
 	REQUIRE(DNS_C_VIEW_VALID(view));
 
 	switch(transtype) {
@@ -1182,7 +1182,7 @@ dns_c_view_setchecknames(dns_c_view_t *view,
 	}
 
 	**ptr = newval;
-	
+
 	return (existed ? ISC_R_EXISTS : ISC_R_SUCCESS);
 }
 
@@ -1193,7 +1193,7 @@ dns_c_view_getchecknames(dns_c_view_t *view,
 			dns_severity_t *retval)
 {
 	isc_result_t result;
-	dns_severity_t **ptr = NULL;	
+	dns_severity_t **ptr = NULL;
 	REQUIRE(DNS_C_VIEW_VALID(view));
 
 	switch (transtype) {
@@ -1202,7 +1202,7 @@ dns_c_view_getchecknames(dns_c_view_t *view,
 	case dns_trans_response:
 		ptr = &view->check_names[transtype];
 		break;
-		
+
 	default:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -1226,7 +1226,7 @@ dns_c_view_unsetchecknames(dns_c_view_t *view,
 			  dns_c_trans_t transtype)
 {
 	dns_severity_t **ptr = NULL;
-	
+
 	REQUIRE(DNS_C_VIEW_VALID(view));
 
 	switch(transtype) {
@@ -1246,7 +1246,7 @@ dns_c_view_unsetchecknames(dns_c_view_t *view,
 	if (*ptr == NULL) {
 		return (ISC_R_NOTFOUND);
 	}
-	
+
 	isc_mem_put(view->mem, *ptr, sizeof (**ptr));
 
 	return (ISC_R_SUCCESS);
@@ -1259,7 +1259,7 @@ dns_c_view_getkeydefs(dns_c_view_t *view, dns_c_kdeflist_t **retval) {
 	REQUIRE(retval != NULL);
 
 	*retval = view->keydefs;
-	
+
 	if (view->keydefs == NULL) {
 		return (ISC_R_NOTFOUND);
 	} else {
@@ -1305,7 +1305,7 @@ isc_result_t
 dns_c_view_getpeerlist(dns_c_view_t *view, dns_peerlist_t **retval) {
 	REQUIRE(DNS_C_VIEW_VALID(view));
 	REQUIRE(retval != NULL);
-	
+
 	if (view->peerlist == NULL) {
 		*retval = NULL;
 		return (ISC_R_NOTFOUND);
@@ -1327,7 +1327,7 @@ dns_c_view_unsetpeerlist(dns_c_view_t *view) {
 		return (ISC_R_FAILURE);
 	}
 }
-	
+
 
 isc_result_t
 dns_c_view_setpeerlist(dns_c_view_t *view, dns_peerlist_t *newval) {
@@ -1351,7 +1351,7 @@ isc_result_t
 dns_c_view_gettrustedkeys(dns_c_view_t *view, dns_c_tkeylist_t **retval) {
 	REQUIRE(DNS_C_VIEW_VALID(view));
 	REQUIRE(retval != NULL);
-	
+
 	if (view->trusted_keys == NULL) {
 		*retval = NULL;
 		return (ISC_R_NOTFOUND);
@@ -1379,7 +1379,7 @@ dns_c_view_unsettrustedkeys(dns_c_view_t *view) {
 		return (ISC_R_FAILURE);
 	}
 }
-	
+
 
 isc_result_t
 dns_c_view_settrustedkeys(dns_c_view_t *view, dns_c_tkeylist_t *newval,
@@ -1388,11 +1388,11 @@ dns_c_view_settrustedkeys(dns_c_view_t *view, dns_c_tkeylist_t *newval,
 	isc_boolean_t existed;
 	dns_c_tkeylist_t *newl;
 	isc_result_t res;
-	
+
 	REQUIRE(DNS_C_VIEW_VALID(view));
 
 	existed = ISC_TF(view->trusted_keys != NULL);
-	
+
 	if (view->trusted_keys != NULL) {
 		dns_c_view_unsettrustedkeys(view);
 	}
@@ -1534,12 +1534,12 @@ SETUINT32(sigvalidityinterval, sig_valid_interval)
 GETUINT32(sigvalidityinterval, sig_valid_interval)
 UNSETUINT32(sigvalidityinterval, sig_valid_interval)
 
-	
+
 GETUINT32(maxcachesize, max_cache_size)
 SETUINT32(maxcachesize, max_cache_size)
 UNSETUINT32(maxcachesize, max_cache_size)
 
-	
+
 GETBYTYPE(dns_c_addata_t, additionaldata, additional_data)
 SETBYTYPE(dns_c_addata_t, additionaldata, additional_data)
 UNSETBYTYPE(dns_c_addata_t, additionaldata, additional_data)
diff --git a/lib/dns/config/confzone.c b/lib/dns/config/confzone.c
index c58e33b018..4196be2ff4 100644
--- a/lib/dns/config/confzone.c
+++ b/lib/dns/config/confzone.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: confzone.c,v 1.51 2000/07/27 09:47:14 tale Exp $ */
+/* $Id: confzone.c,v 1.52 2000/08/01 01:23:32 tale Exp $ */
 
 #include 
 
@@ -228,7 +228,7 @@ dns_c_zonelist_find(dns_c_zonelist_t *zlist, const char *name,
 	zoneelem = ISC_LIST_HEAD(zlist->zones);
 	while (zoneelem != NULL) {
 		REQUIRE(zoneelem->thezone != NULL);
-		
+
 		if (strcmp(name, zoneelem->thezone->name) == 0) {
 			break;
 		}
@@ -256,7 +256,7 @@ dns_c_zonelist_rmbyname(dns_c_zonelist_t *zlist, const char *name) {
 	zoneelem = ISC_LIST_HEAD(zlist->zones);
 	while (zoneelem != NULL) {
 		REQUIRE(zoneelem->thezone != NULL);
-		
+
 		if (strcmp(name, zoneelem->thezone->name) == 0) {
 			break;
 		}
@@ -285,7 +285,7 @@ dns_c_zonelist_addzone(dns_c_zonelist_t *zlist, dns_c_zone_t *zone) {
 	if (zoneelem == NULL) {
 		return (ISC_R_NOMEMORY);
 	}
-	
+
 	zoneelem->thezone = zone;
 	ISC_LINK_INIT(zoneelem, next);
 
@@ -299,14 +299,14 @@ isc_result_t
 dns_c_zonelist_rmzone(dns_c_zonelist_t *zlist, dns_c_zone_t *zone) {
 	dns_c_zonelem_t *zoneelem;
 	isc_result_t res;
-	
+
 	REQUIRE(zlist != NULL);
 	REQUIRE(zone != NULL);
 
 	zoneelem = ISC_LIST_HEAD(zlist->zones);
 	while (zoneelem != NULL) {
 		REQUIRE(zoneelem->thezone != NULL);
-		
+
 		if (zone == zoneelem->thezone) {
 			break;
 		}
@@ -347,7 +347,7 @@ dns_c_zonelist_print(FILE *fp, int indent, dns_c_zonelist_t *list,
 				fprintf(fp, "\n");
 			}
 		}
-		
+
 		zoneelem = ISC_LIST_NEXT(zoneelem, next);
 	}
 
@@ -372,7 +372,7 @@ dns_c_zonelist_firstzone(dns_c_zonelist_t *list) {
 dns_c_zone_t *
 dns_c_zonelist_nextzone(dns_c_zonelist_t *list, dns_c_zone_t *zone) {
 	dns_c_zonelem_t *zoneelem;
-	
+
 	REQUIRE(DNS_C_ZONELIST_VALID(list));
 
 	zoneelem = ISC_LIST_HEAD(list->zones);
@@ -428,7 +428,7 @@ dns_c_zone_new(isc_mem_t *mem,
 				 isc_mem_strdup(mem, name) :
 				 isc_mem_strdup(mem, internalname));
 	newzone->database = NULL;
-	
+
 	switch (ztype) {
 	case dns_c_zone_master:
 		master_zone_init(&newzone->u.mzone);
@@ -450,7 +450,7 @@ dns_c_zone_new(isc_mem_t *mem,
 		forward_zone_init(&newzone->u.fzone);
 		break;
 	}
-	
+
 	*zone = newzone;
 
 	return (ISC_R_SUCCESS);
@@ -515,14 +515,14 @@ dns_c_zone_print(FILE *fp, int indent, dns_c_zone_t *zone) {
 	}
 
 	fprintf(fp, " {\n");
-		
+
 	switch (zone->ztype) {
 	case dns_c_zone_master:
 		dns_c_printtabs(fp, indent + 1);
 		fprintf(fp, "type master;\n");
 		master_zone_print(fp, indent + 1, &zone->u.mzone);
 		break;
-		
+
 	case dns_c_zone_slave:
 		dns_c_printtabs(fp, indent + 1);
 		fprintf(fp, "type slave;\n");
@@ -534,7 +534,7 @@ dns_c_zone_print(FILE *fp, int indent, dns_c_zone_t *zone) {
 		fprintf(fp, "type stub;\n");
 		stub_zone_print(fp, indent + 1, &zone->u.tzone);
 		break;
-		
+
 	case dns_c_zone_hint:
 		dns_c_printtabs(fp, indent + 1);
 		fprintf(fp, "type hint;\n");
@@ -558,7 +558,7 @@ dns_c_zone_print(FILE *fp, int indent, dns_c_zone_t *zone) {
 		fprintf(fp, "enable-zone %s;\n",
 			(*zone->enabled ? "true" : "false"));
 	}
-	
+
 	dns_c_printtabs(fp, indent);
 	fprintf(fp, "};\n");
 }
@@ -581,7 +581,7 @@ dns_c_zone_validate(dns_c_zone_t *zone)
 	const char *nomasterserr = "zone '%s': missing 'masters' entry";
 	const char *emptymasterserr = "zone '%s': 'masters' value is empty";
 	const char *disabledzone = "zone '%s': is disabled";
-	
+
 	/*
 	 * Check if zone is diabled. This isn't really a validation, just a
 	 * place to issue a warning.
@@ -593,8 +593,8 @@ dns_c_zone_validate(dns_c_zone_t *zone)
 			      ISC_LOG_WARNING, disabledzone,
 			      zone->name);
 	}
-	
-		
+
+
 	/*
 	 * Check for allow-update and update-policy together
 	 */
@@ -635,8 +635,8 @@ dns_c_zone_validate(dns_c_zone_t *zone)
 
 
 	/* XXX TODO make sure no 'key' clauses were given on any iplist
-	   except for masters{}; */ 
-		
+	   except for masters{}; */
+
 
 	return (result);
 }
@@ -680,7 +680,7 @@ isc_result_t
 dns_c_zone_getpubkeylist(dns_c_zone_t *zone, dns_c_pklist_t **retval) {
 	dns_c_pklist_t *p = NULL;
 	isc_result_t res;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 	REQUIRE(retval != NULL);
 
@@ -688,25 +688,25 @@ dns_c_zone_getpubkeylist(dns_c_zone_t *zone, dns_c_pklist_t **retval) {
 	case dns_c_zone_master:
 		p = zone->u.mzone.pubkeylist;
 		break;
-			
+
 	case dns_c_zone_slave:
 		p = zone->u.szone.pubkeylist;
 		break;
-		
+
 	case dns_c_zone_stub:
 		p = zone->u.tzone.pubkeylist;
 		break;
-		
+
 	case dns_c_zone_hint:
 #if 1
 		p = zone->u.hzone.pubkeylist;
-#else	
+#else
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
 			      "Hint zones do not have a pubkey field");
-#endif	
+#endif
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -733,7 +733,7 @@ isc_result_t
 dns_c_zone_setfile(dns_c_zone_t *zone, const char *newfile) {
 	char **p = NULL;
 	isc_result_t res;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 	REQUIRE(newfile != NULL);
 	REQUIRE(*newfile != '\0');
@@ -746,7 +746,7 @@ dns_c_zone_setfile(dns_c_zone_t *zone, const char *newfile) {
 	case dns_c_zone_slave:
 		p = &zone->u.szone.file;
 		break;
-		
+
 	case dns_c_zone_stub:
 		p = &zone->u.tzone.file;
 		break;
@@ -754,7 +754,7 @@ dns_c_zone_setfile(dns_c_zone_t *zone, const char *newfile) {
 	case dns_c_zone_hint:
 		p = &zone->u.hzone.file;
 		break;
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -786,7 +786,7 @@ isc_result_t
 dns_c_zone_getfile(dns_c_zone_t *zone, const char **retval) {
 	const char *p = NULL;
 	isc_result_t res;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 	REQUIRE(retval != NULL);
 
@@ -798,15 +798,15 @@ dns_c_zone_getfile(dns_c_zone_t *zone, const char **retval) {
 	case dns_c_zone_slave:
 		p = zone->u.szone.file;
 		break;
-		
+
 	case dns_c_zone_stub:
 		p = zone->u.tzone.file;
 		break;
-		
+
 	case dns_c_zone_hint:
 		p = zone->u.hzone.file;
 		break;
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -844,25 +844,25 @@ dns_c_zone_setchecknames(dns_c_zone_t *zone, dns_severity_t severity) {
 		bits = &zone->u.mzone.setflags;
 		bit = MZ_CHECK_NAME_BIT;
 		break;
-			
+
 	case dns_c_zone_slave:
 		p = &zone->u.szone.check_names;
 		bits = &zone->u.szone.setflags;
 		bit = SZ_CHECK_NAME_BIT;
 		break;
-		
+
 	case dns_c_zone_stub:
 		p = &zone->u.tzone.check_names;
 		bits = &zone->u.tzone.setflags;
 		bit = TZ_CHECK_NAME_BIT;
 		break;
-		
+
 	case dns_c_zone_hint:
 		p = &zone->u.hzone.check_names;
 		bits = &zone->u.hzone.setflags;
 		bit = HZ_CHECK_NAME_BIT;
 		break;
-			
+
 	case dns_c_zone_forward:
 		p = &zone->u.fzone.check_names;
 		bits = &zone->u.fzone.setflags;
@@ -875,7 +875,7 @@ dns_c_zone_setchecknames(dns_c_zone_t *zone, dns_severity_t severity) {
 	} else {
 		res = ISC_R_SUCCESS;
 	}
-	
+
 	*p = severity;
 	DNS_C_SETBIT(bit, bits);
 
@@ -903,25 +903,25 @@ dns_c_zone_getchecknames(dns_c_zone_t *zone, dns_severity_t *retval) {
 		bits = &zone->u.mzone.setflags;
 		bit = MZ_CHECK_NAME_BIT;
 		break;
-			
+
 	case dns_c_zone_slave:
 		p = &zone->u.szone.check_names;
 		bits = &zone->u.szone.setflags;
 		bit = SZ_CHECK_NAME_BIT;
 		break;
-		
+
 	case dns_c_zone_stub:
 		p = &zone->u.tzone.check_names;
 		bits = &zone->u.tzone.setflags;
 		bit = TZ_CHECK_NAME_BIT;
 		break;
-		
+
 	case dns_c_zone_hint:
 		p = &zone->u.hzone.check_names;
 		bits = &zone->u.hzone.setflags;
 		bit = HZ_CHECK_NAME_BIT;
 		break;
-			
+
 	case dns_c_zone_forward:
 		p = &zone->u.fzone.check_names;
 		bits = &zone->u.fzone.setflags;
@@ -935,7 +935,7 @@ dns_c_zone_getchecknames(dns_c_zone_t *zone, dns_severity_t *retval) {
 	} else {
 		res = ISC_R_NOTFOUND;
 	}
-	
+
 	return (res);
 }
 
@@ -952,7 +952,7 @@ dns_c_zone_setallowupdateforwarding(dns_c_zone_t *zone,
 	dns_c_ipmatchlist_t **p = NULL;
 	isc_result_t res;
 	isc_boolean_t existed;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 	REQUIRE(DNS_C_IPMLIST_VALID(ipml));
 
@@ -960,22 +960,22 @@ dns_c_zone_setallowupdateforwarding(dns_c_zone_t *zone,
 	case dns_c_zone_master:
 		p = &zone->u.mzone.allow_update_forwarding;
 		break;
-			
+
 	case dns_c_zone_slave:
 		p = &zone->u.szone.allow_update_forwarding;
 		break;
-		
+
 	case dns_c_zone_stub:
 		p = &zone->u.tzone.allow_update_forwarding;
 		break;
-		
+
 	case dns_c_zone_hint:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
 			      "Hint zones do not have "
 			      "an allow_update_forwarding field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -985,7 +985,7 @@ dns_c_zone_setallowupdateforwarding(dns_c_zone_t *zone,
 	}
 
 	existed = (*p != NULL ? ISC_TRUE : ISC_FALSE);
-	
+
 	res = set_ipmatch_list_field(zone->mem, p,
 				     ipml, deepcopy);
 	if (res == ISC_R_SUCCESS && existed) {
@@ -1006,7 +1006,7 @@ dns_c_zone_getallowupdateforwarding(dns_c_zone_t *zone,
 {
 	dns_c_ipmatchlist_t *p = NULL;
 	isc_result_t res;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 	REQUIRE(retval != NULL);
 
@@ -1014,22 +1014,22 @@ dns_c_zone_getallowupdateforwarding(dns_c_zone_t *zone,
 	case dns_c_zone_master:
 		p = zone->u.mzone.allow_update_forwarding;
 		break;
-			
+
 	case dns_c_zone_slave:
 		p = zone->u.szone.allow_update_forwarding;
 		break;
-		
+
 	case dns_c_zone_stub:
 		p = zone->u.tzone.allow_update_forwarding;
 		break;
-		
+
 	case dns_c_zone_hint:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
 			      "Hint zones do not have an "
 			      "allow_update_forwarding field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -1057,32 +1057,32 @@ isc_result_t
 dns_c_zone_setssuauth(dns_c_zone_t *zone, dns_ssutable_t *ssu) {
 	dns_ssutable_t **p = NULL;
 	isc_boolean_t existed;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 
 	switch (zone->ztype) {
 	case dns_c_zone_master:
 		p = &zone->u.mzone.ssuauth;
 		break;
-			
+
 	case dns_c_zone_slave:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
 			      "Slave zones do not have an ssuauth field");
 		break;
-		
+
 	case dns_c_zone_stub:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
 			      "Stub zones do not have an ssuauth field");
 		break;
-		
+
 	case dns_c_zone_hint:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
 			      "Hint zones do not have an ssuauth field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -1092,7 +1092,7 @@ dns_c_zone_setssuauth(dns_c_zone_t *zone, dns_ssutable_t *ssu) {
 	}
 
 	existed = (*p != NULL ? ISC_TRUE : ISC_FALSE);
-	
+
 	*p = ssu;
 
 	return (existed ? ISC_R_EXISTS : ISC_R_SUCCESS);
@@ -1107,7 +1107,7 @@ isc_result_t
 dns_c_zone_getssuauth(dns_c_zone_t *zone, dns_ssutable_t **retval) {
 	dns_ssutable_t *p = NULL;
 	isc_result_t res;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 	REQUIRE(retval != NULL);
 
@@ -1115,25 +1115,25 @@ dns_c_zone_getssuauth(dns_c_zone_t *zone, dns_ssutable_t **retval) {
 	case dns_c_zone_master:
 		p = zone->u.mzone.ssuauth;
 		break;
-			
+
 	case dns_c_zone_slave:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
 			      "Slave zones do not have an ssuauth field");
 		break;
-		
+
 	case dns_c_zone_stub:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
 			      "Stub zones do not have an ssuauth field");
 		break;
-		
+
 	case dns_c_zone_hint:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
 			      "Hint zones do not have an ssuauth field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -1165,7 +1165,7 @@ dns_c_zone_setallowquery(dns_c_zone_t *zone,
 	dns_c_ipmatchlist_t **p = NULL;
 	isc_boolean_t existed;
 	isc_result_t res;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 	REQUIRE(DNS_C_IPMLIST_VALID(ipml));
 
@@ -1173,21 +1173,21 @@ dns_c_zone_setallowquery(dns_c_zone_t *zone,
 	case dns_c_zone_master:
 		p = &zone->u.mzone.allow_query;
 		break;
-			
+
 	case dns_c_zone_slave:
 		p = &zone->u.szone.allow_query;
 		break;
-		
+
 	case dns_c_zone_stub:
 		p = &zone->u.tzone.allow_query;
 		break;
-		
+
 	case dns_c_zone_hint:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
 			      "Hint zones do not have an allow_query field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -1197,7 +1197,7 @@ dns_c_zone_setallowquery(dns_c_zone_t *zone,
 	}
 
 	existed = (*p != NULL ? ISC_TRUE : ISC_FALSE);
-	
+
 	res = set_ipmatch_list_field(zone->mem, p,
 				     ipml, deepcopy);
 	if (res == ISC_R_SUCCESS && existed) {
@@ -1216,7 +1216,7 @@ isc_result_t
 dns_c_zone_getallowquery(dns_c_zone_t *zone, dns_c_ipmatchlist_t **retval) {
 	dns_c_ipmatchlist_t *p = NULL;
 	isc_result_t res;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 	REQUIRE(retval != NULL);
 
@@ -1224,21 +1224,21 @@ dns_c_zone_getallowquery(dns_c_zone_t *zone, dns_c_ipmatchlist_t **retval) {
 	case dns_c_zone_master:
 		p = zone->u.mzone.allow_query;
 		break;
-			
+
 	case dns_c_zone_slave:
 		p = zone->u.szone.allow_query;
 		break;
-		
+
 	case dns_c_zone_stub:
 		p = zone->u.tzone.allow_query;
 		break;
-		
+
 	case dns_c_zone_hint:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
 			      "Hint zones do not have an allow_query field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -1270,7 +1270,7 @@ dns_c_zone_setallowtransfer(dns_c_zone_t *zone,
 	dns_c_ipmatchlist_t **p = NULL;
 	isc_boolean_t existed;
 	isc_result_t res;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 	REQUIRE(DNS_C_IPMLIST_VALID(ipml));
 
@@ -1278,22 +1278,22 @@ dns_c_zone_setallowtransfer(dns_c_zone_t *zone,
 	case dns_c_zone_master:
 		p = &zone->u.mzone.allow_transfer;
 		break;
-			
+
 	case dns_c_zone_slave:
 		p = &zone->u.szone.allow_transfer;
 		break;
-		
+
 	case dns_c_zone_stub:
 		p = &zone->u.tzone.allow_transfer;
 		break;
-		
+
 	case dns_c_zone_hint:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
 			      "Hint zones do not have an "
 			      "allow_transfer field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -1322,7 +1322,7 @@ isc_result_t
 dns_c_zone_getallowtransfer(dns_c_zone_t *zone, dns_c_ipmatchlist_t **retval) {
 	dns_c_ipmatchlist_t *p = NULL;
 	isc_result_t res;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 	REQUIRE(retval != NULL);
 
@@ -1330,22 +1330,22 @@ dns_c_zone_getallowtransfer(dns_c_zone_t *zone, dns_c_ipmatchlist_t **retval) {
 	case dns_c_zone_master:
 		p = zone->u.mzone.allow_transfer;
 		break;
-			
+
 	case dns_c_zone_slave:
 		p = zone->u.szone.allow_transfer;
 		break;
-		
+
 	case dns_c_zone_stub:
 		p = zone->u.tzone.allow_transfer;
 		break;
-		
+
 	case dns_c_zone_hint:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
 			      "Hint zones do not have an "
 			      "allow_transfer field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -1402,7 +1402,7 @@ dns_c_zone_setdialup(dns_c_zone_t *zone, isc_boolean_t newval) {
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
 			      "Hint zones do not have a dialup field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -1421,7 +1421,7 @@ dns_c_zone_setdialup(dns_c_zone_t *zone, isc_boolean_t newval) {
 isc_result_t
 dns_c_zone_getdialup(dns_c_zone_t *zone, isc_boolean_t *retval) {
 	isc_result_t res = ISC_R_SUCCESS;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 	REQUIRE(retval != NULL);
 
@@ -1434,7 +1434,7 @@ dns_c_zone_getdialup(dns_c_zone_t *zone, isc_boolean_t *retval) {
 			res = ISC_R_NOTFOUND;
 		}
 		break;
-		
+
 	case dns_c_zone_slave:
 		if (DNS_C_CHECKBIT(SZ_DIALUP_BIT, &zone->u.szone.setflags)) {
 			*retval = zone->u.szone.dialup;
@@ -1443,7 +1443,7 @@ dns_c_zone_getdialup(dns_c_zone_t *zone, isc_boolean_t *retval) {
 			res = ISC_R_NOTFOUND;
 		}
 		break;
-		
+
 	case dns_c_zone_stub:
 		if (DNS_C_CHECKBIT(TZ_DIALUP_BIT, &zone->u.tzone.setflags)) {
 			*retval = zone->u.tzone.dialup;
@@ -1452,13 +1452,13 @@ dns_c_zone_getdialup(dns_c_zone_t *zone, isc_boolean_t *retval) {
 			res = ISC_R_NOTFOUND;
 		}
 		break;
-		
+
 	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 dialup field");
 		return (ISC_R_FAILURE);
-		
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -1477,7 +1477,7 @@ dns_c_zone_getdialup(dns_c_zone_t *zone, isc_boolean_t *retval) {
 isc_result_t
 dns_c_zone_setnotify(dns_c_zone_t *zone, dns_notifytype_t newval) {
 	isc_boolean_t existed = ISC_FALSE;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 
 	switch (zone->ztype) {
@@ -1487,14 +1487,14 @@ dns_c_zone_setnotify(dns_c_zone_t *zone, dns_notifytype_t newval) {
 					 &zone->u.mzone.setflags);
 		DNS_C_SETBIT(MZ_NOTIFY_BIT, &zone->u.mzone.setflags);
 		break;
-			
+
 	case dns_c_zone_slave:
 		zone->u.szone.notify = newval;
 		existed = DNS_C_CHECKBIT(SZ_NOTIFY_BIT,
 					 &zone->u.szone.setflags);
 		DNS_C_SETBIT(SZ_NOTIFY_BIT, &zone->u.szone.setflags);
 		break;
-		
+
 	case dns_c_zone_stub:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -1506,7 +1506,7 @@ dns_c_zone_setnotify(dns_c_zone_t *zone, dns_notifytype_t newval) {
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
 			      "Hint zones do not have a notify field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -1590,28 +1590,28 @@ dns_c_zone_setalsonotify(dns_c_zone_t *zone,
 
 	REQUIRE(zone != NULL);
 	REQUIRE(DNS_C_IPLIST_VALID(newval));
-	
+
 	switch (zone->ztype) {
 	case dns_c_zone_master:
 		p = &zone->u.mzone.also_notify ;
 		break;
-			
+
 	case dns_c_zone_slave:
 		p = &zone->u.szone.also_notify ;
 		break;
-		
+
 	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 also_notify 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 also_notify field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -1640,28 +1640,28 @@ dns_c_zone_getalsonotify(dns_c_zone_t *zone, dns_c_iplist_t **retval) {
 
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 	REQUIRE(retval != NULL);
-	
+
 	switch (zone->ztype) {
 	case dns_c_zone_master:
 		p = zone->u.mzone.also_notify ;
 		break;
-			
+
 	case dns_c_zone_slave:
 		p = zone->u.szone.also_notify ;
 		break;
-		
+
 	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 also_notify 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 also_notify field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -1687,7 +1687,7 @@ dns_c_zone_getalsonotify(dns_c_zone_t *zone, dns_c_iplist_t **retval) {
 isc_result_t
 dns_c_zone_setmaintixfrbase(dns_c_zone_t *zone, isc_boolean_t newval) {
 	isc_boolean_t existed = ISC_FALSE;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 
 	switch (zone->ztype) {
@@ -1697,14 +1697,14 @@ dns_c_zone_setmaintixfrbase(dns_c_zone_t *zone, isc_boolean_t newval) {
 					 &zone->u.mzone.setflags);
 		DNS_C_SETBIT(MZ_MAINT_IXFR_BASE_BIT, &zone->u.mzone.setflags);
 		break;
-			
+
 	case dns_c_zone_slave:
 		zone->u.szone.maint_ixfr_base = newval;
 		existed = DNS_C_CHECKBIT(SZ_MAINT_IXFR_BASE_BIT,
 					 &zone->u.szone.setflags);
 		DNS_C_SETBIT(SZ_MAINT_IXFR_BASE_BIT, &zone->u.szone.setflags);
 		break;
-		
+
 	case dns_c_zone_stub:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -1718,7 +1718,7 @@ dns_c_zone_setmaintixfrbase(dns_c_zone_t *zone, isc_boolean_t newval) {
 			      "Hint zones do not have a "
 			      "maintain-xfer-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,
@@ -1741,7 +1741,7 @@ dns_c_zone_getmaintixfrbase(dns_c_zone_t *zone, isc_boolean_t *retval) {
 	dns_c_setbits_t *bits = NULL;
 	isc_boolean_t val = ISC_FALSE;
 	int bit = 0;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 	REQUIRE(retval != NULL);
 
@@ -1751,25 +1751,25 @@ dns_c_zone_getmaintixfrbase(dns_c_zone_t *zone, isc_boolean_t *retval) {
 		bit = MZ_MAINT_IXFR_BASE_BIT;
 		bits = &zone->u.mzone.setflags;
 		break;
-			
+
 	case dns_c_zone_slave:
 		val = zone->u.szone.maint_ixfr_base;
 		bit = SZ_MAINT_IXFR_BASE_BIT;
 		bits = &zone->u.szone.setflags;
 		break;
-		
+
 	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");
 		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");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -1783,7 +1783,7 @@ dns_c_zone_getmaintixfrbase(dns_c_zone_t *zone, isc_boolean_t *retval) {
 	} else {
 		res = ISC_R_NOTFOUND;
 	}
-	
+
 	return (res);
 }
 
@@ -1796,7 +1796,7 @@ isc_result_t
 dns_c_zone_setixfrbase(dns_c_zone_t *zone, const char *newval) {
 	isc_boolean_t existed ;
 	char **p = NULL;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 	REQUIRE(newval != NULL);
 	REQUIRE(*newval != '\0');
@@ -1805,11 +1805,11 @@ dns_c_zone_setixfrbase(dns_c_zone_t *zone, const char *newval) {
 	case dns_c_zone_master:
 		p = &zone->u.mzone.ixfr_base;
 		break;
-			
+
 	case dns_c_zone_slave:
 		p = &zone->u.szone.ixfr_base;
 		break;
-		
+
 	case dns_c_zone_stub:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -1821,7 +1821,7 @@ dns_c_zone_setixfrbase(dns_c_zone_t *zone, const char *newval) {
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
 			      "Hint zones do not have a 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,
@@ -1853,7 +1853,7 @@ isc_result_t
 dns_c_zone_getixfrbase(dns_c_zone_t *zone, const char **retval) {
 	char *p = NULL;
 	isc_result_t res;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 	REQUIRE(retval != NULL);
 
@@ -1861,23 +1861,23 @@ dns_c_zone_getixfrbase(dns_c_zone_t *zone, const char **retval) {
 	case dns_c_zone_master:
 		p = zone->u.mzone.ixfr_base;
 		break;
-			
+
 	case dns_c_zone_slave:
 		p = zone->u.szone.ixfr_base;
 		break;
-		
+
 	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 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 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,
@@ -1913,11 +1913,11 @@ dns_c_zone_setixfrtmp(dns_c_zone_t *zone, const char *newval) {
 	case dns_c_zone_master:
 		p = &zone->u.mzone.ixfr_tmp;
 		break;
-			
+
 	case dns_c_zone_slave:
 		p = &zone->u.szone.ixfr_tmp;
 		break;
-		
+
 	case dns_c_zone_stub:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -1929,7 +1929,7 @@ dns_c_zone_setixfrtmp(dns_c_zone_t *zone, const char *newval) {
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
 			      "Hint zones do not have a ixfr_tmp field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -1961,7 +1961,7 @@ isc_result_t
 dns_c_zone_getixfrtmp(dns_c_zone_t *zone, const char **retval) {
 	char *p = NULL;
 	isc_result_t res;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 	REQUIRE(retval != NULL);
 
@@ -1969,23 +1969,23 @@ dns_c_zone_getixfrtmp(dns_c_zone_t *zone, const char **retval) {
 	case dns_c_zone_master:
 		p = zone->u.mzone.ixfr_tmp;
 		break;
-			
+
 	case dns_c_zone_slave:
 		p = zone->u.szone.ixfr_tmp;
 		break;
-		
+
 	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 ixfr_tmp 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 ixfr_tmp field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -2015,7 +2015,7 @@ dns_c_zone_addpubkey(dns_c_zone_t *zone,
 {
 	dns_c_pklist_t **p = NULL;
 	isc_result_t res;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 	REQUIRE(DNS_C_PUBKEY_VALID(pubkey));
 
@@ -2023,15 +2023,15 @@ dns_c_zone_addpubkey(dns_c_zone_t *zone,
 	case dns_c_zone_master:
 		p = &zone->u.mzone.pubkeylist;
 		break;
-			
+
 	case dns_c_zone_slave:
 		p = &zone->u.szone.pubkeylist;
 		break;
-		
+
 	case dns_c_zone_stub:
 		p = &zone->u.tzone.pubkeylist;
 		break;
-		
+
 	case dns_c_zone_hint:
 #if 1
 		p = &zone->u.hzone.pubkeylist;
@@ -2039,9 +2039,9 @@ dns_c_zone_addpubkey(dns_c_zone_t *zone,
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
 			      "Hint zones do not have a pubkey field");
-#endif 
+#endif
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -2055,7 +2055,7 @@ dns_c_zone_addpubkey(dns_c_zone_t *zone,
 			return (res);
 		}
 	}
-	
+
 	res = dns_c_pklist_addpubkey(*p, pubkey, deepcopy);
 
 	return (res);
@@ -2069,7 +2069,7 @@ dns_c_zone_addpubkey(dns_c_zone_t *zone,
 isc_result_t
 dns_c_zone_setmasterport(dns_c_zone_t *zone, in_port_t port) {
 	isc_boolean_t existed = ISC_FALSE;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 
 	switch(zone->ztype) {
@@ -2079,27 +2079,27 @@ dns_c_zone_setmasterport(dns_c_zone_t *zone, in_port_t port) {
 			      "Forward zones do not have a "
 			      "master_port field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_slave:
 		zone->u.szone.master_port = port;
 		existed = DNS_C_CHECKBIT(SZ_MASTER_PORT_BIT,
 					 &zone->u.szone.setflags);
 		DNS_C_SETBIT(SZ_MASTER_PORT_BIT, &zone->u.szone.setflags);
 		break;
-		
+
 	case dns_c_zone_stub:
 		zone->u.tzone.master_port = port;
 		existed = DNS_C_CHECKBIT(TZ_MASTER_PORT_BIT,
 					 &zone->u.tzone.setflags);
 		DNS_C_SETBIT(TZ_MASTER_PORT_BIT, &zone->u.tzone.setflags);
 		break;
-		
+
 	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 master_port field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -2107,7 +2107,7 @@ dns_c_zone_setmasterport(dns_c_zone_t *zone, in_port_t port) {
 			      "master_port field");
 		return (ISC_R_FAILURE);
 	}
-		
+
 	return (existed ? ISC_R_EXISTS : ISC_R_SUCCESS);
 }
 
@@ -2119,7 +2119,7 @@ dns_c_zone_setmasterport(dns_c_zone_t *zone, in_port_t port) {
 isc_result_t
 dns_c_zone_getmasterport(dns_c_zone_t *zone, in_port_t *retval) {
 	isc_result_t res = ISC_R_SUCCESS;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 	REQUIRE(retval != NULL);
 
@@ -2130,7 +2130,7 @@ dns_c_zone_getmasterport(dns_c_zone_t *zone, in_port_t *retval) {
 			      "Forward zones do not have a "
 			      "master_port field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_slave:
 		if (DNS_C_CHECKBIT(SZ_MASTER_PORT_BIT,
 				   &zone->u.szone.setflags)) {
@@ -2156,7 +2156,7 @@ dns_c_zone_getmasterport(dns_c_zone_t *zone, in_port_t *retval) {
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
 			      "Hint zones do not have a master_port field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -2184,14 +2184,14 @@ dns_c_zone_setmasterips(dns_c_zone_t *zone,
 
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 	REQUIRE(DNS_C_IPLIST_VALID(newval));
-	
+
 	switch (zone->ztype) {
 	case dns_c_zone_master:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
 			      "Master zones do not have a master_ips field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_slave:
 	case dns_c_zone_stub:
 		if (zone->ztype == dns_c_zone_slave) {
@@ -2199,7 +2199,7 @@ dns_c_zone_setmasterips(dns_c_zone_t *zone,
 		} else {
 			p = &zone->u.tzone.master_ips ;
 		}
-		
+
 		existed = (*p != NULL ? ISC_TRUE : ISC_FALSE);
 		res = set_iplist_field(zone->mem, p,
 				       newval, deepcopy);
@@ -2213,7 +2213,7 @@ dns_c_zone_setmasterips(dns_c_zone_t *zone,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
 			      "Hint zones do not have a master_ips field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -2235,14 +2235,14 @@ dns_c_zone_getmasterips(dns_c_zone_t *zone, dns_c_iplist_t **retval) {
 
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 	REQUIRE(retval != NULL);
-	
+
 	switch (zone->ztype) {
 	case dns_c_zone_master:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
 			      "Master zones do not have a master_ips field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_slave:
 		if (zone->u.szone.master_ips != NULL) {
 			*retval = zone->u.szone.master_ips;
@@ -2251,7 +2251,7 @@ dns_c_zone_getmasterips(dns_c_zone_t *zone, dns_c_iplist_t **retval) {
 			res = ISC_R_NOTFOUND;
 		}
 		break;
-		
+
 	case dns_c_zone_stub:
 		if (zone->u.tzone.master_ips != NULL) {
 			*retval = zone->u.tzone.master_ips;
@@ -2260,13 +2260,13 @@ dns_c_zone_getmasterips(dns_c_zone_t *zone, dns_c_iplist_t **retval) {
 			res = ISC_R_NOTFOUND;
 		}
 		break;
-		
+
 	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 master_ips field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -2285,7 +2285,7 @@ dns_c_zone_getmasterips(dns_c_zone_t *zone, dns_c_iplist_t **retval) {
 isc_result_t
 dns_c_zone_settransfersource(dns_c_zone_t *zone, isc_sockaddr_t newval) {
 	isc_boolean_t existed = ISC_FALSE;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 
 	switch (zone->ztype) {
@@ -2295,28 +2295,28 @@ dns_c_zone_settransfersource(dns_c_zone_t *zone, isc_sockaddr_t newval) {
 			      "Master zones do not have a "
 			      "transfer_source field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_slave:
 		zone->u.szone.transfer_source = newval ;
 		existed = DNS_C_CHECKBIT(SZ_TRANSFER_SOURCE_BIT,
 					 &zone->u.szone.setflags);
 		DNS_C_SETBIT(SZ_TRANSFER_SOURCE_BIT, &zone->u.szone.setflags);
 		break;
-		
+
 	case dns_c_zone_stub:
 		zone->u.tzone.transfer_source = newval ;
 		existed = DNS_C_CHECKBIT(TZ_TRANSFER_SOURCE_BIT,
 					 &zone->u.tzone.setflags);
 		DNS_C_SETBIT(TZ_TRANSFER_SOURCE_BIT, &zone->u.tzone.setflags);
 		break;
-		
+
 	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 "
 			      "transfer_source field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -2347,7 +2347,7 @@ dns_c_zone_gettransfersource(dns_c_zone_t *zone, isc_sockaddr_t *retval) {
 			      "Master zones do not have a "
 			      "transfer_source field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_slave:
 		if (DNS_C_CHECKBIT(SZ_TRANSFER_SOURCE_BIT,
 				   &zone->u.szone.setflags)) {
@@ -2356,9 +2356,9 @@ dns_c_zone_gettransfersource(dns_c_zone_t *zone, isc_sockaddr_t *retval) {
 		} else {
 			res = ISC_R_NOTFOUND;
 		}
-		
+
 		break;
-		
+
 	case dns_c_zone_stub:
 		if (DNS_C_CHECKBIT(TZ_TRANSFER_SOURCE_BIT,
 				   &zone->u.tzone.setflags)) {
@@ -2367,7 +2367,7 @@ dns_c_zone_gettransfersource(dns_c_zone_t *zone, isc_sockaddr_t *retval) {
 		} else {
 			res = ISC_R_NOTFOUND;
 		}
-		
+
 		break;
 
 	case dns_c_zone_hint:
@@ -2376,7 +2376,7 @@ dns_c_zone_gettransfersource(dns_c_zone_t *zone, isc_sockaddr_t *retval) {
 			      "Hint zones do not have a "
 			      "transfer_source field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -2396,7 +2396,7 @@ dns_c_zone_gettransfersource(dns_c_zone_t *zone, isc_sockaddr_t *retval) {
 isc_result_t
 dns_c_zone_settransfersourcev6(dns_c_zone_t *zone, isc_sockaddr_t newval) {
 	isc_boolean_t existed = ISC_FALSE;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 
 	switch (zone->ztype) {
@@ -2406,7 +2406,7 @@ dns_c_zone_settransfersourcev6(dns_c_zone_t *zone, isc_sockaddr_t newval) {
 			      "Master zones do not have a "
 			      "transfer_source_v6 field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_slave:
 		zone->u.szone.transfer_source_v6 = newval ;
 		existed = DNS_C_CHECKBIT(SZ_TRANSFER_SOURCE_V6_BIT,
@@ -2414,7 +2414,7 @@ dns_c_zone_settransfersourcev6(dns_c_zone_t *zone, isc_sockaddr_t newval) {
 		DNS_C_SETBIT(SZ_TRANSFER_SOURCE_V6_BIT,
 			     &zone->u.szone.setflags);
 		break;
-		
+
 	case dns_c_zone_stub:
 		zone->u.tzone.transfer_source_v6 = newval ;
 		existed = DNS_C_CHECKBIT(TZ_TRANSFER_SOURCE_V6_BIT,
@@ -2422,14 +2422,14 @@ dns_c_zone_settransfersourcev6(dns_c_zone_t *zone, isc_sockaddr_t newval) {
 		DNS_C_SETBIT(TZ_TRANSFER_SOURCE_V6_BIT,
 			     &zone->u.tzone.setflags);
 		break;
-		
+
 	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 "
 			      "transfer_source_v6 field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -2460,7 +2460,7 @@ dns_c_zone_gettransfersourcev6(dns_c_zone_t *zone, isc_sockaddr_t *retval) {
 			      "Master zones do not have a "
 			      "transfer_source_v6 field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_slave:
 		if (DNS_C_CHECKBIT(SZ_TRANSFER_SOURCE_V6_BIT,
 				   &zone->u.szone.setflags)) {
@@ -2469,9 +2469,9 @@ dns_c_zone_gettransfersourcev6(dns_c_zone_t *zone, isc_sockaddr_t *retval) {
 		} else {
 			res = ISC_R_NOTFOUND;
 		}
-		
+
 		break;
-		
+
 	case dns_c_zone_stub:
 		if (DNS_C_CHECKBIT(TZ_TRANSFER_SOURCE_V6_BIT,
 				   &zone->u.tzone.setflags)) {
@@ -2480,7 +2480,7 @@ dns_c_zone_gettransfersourcev6(dns_c_zone_t *zone, isc_sockaddr_t *retval) {
 		} else {
 			res = ISC_R_NOTFOUND;
 		}
-		
+
 		break;
 
 	case dns_c_zone_hint:
@@ -2489,7 +2489,7 @@ dns_c_zone_gettransfersourcev6(dns_c_zone_t *zone, isc_sockaddr_t *retval) {
 			      "Hint zones do not have a "
 			      "transfer_source_v6 field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -2509,7 +2509,7 @@ dns_c_zone_gettransfersourcev6(dns_c_zone_t *zone, isc_sockaddr_t *retval) {
 isc_result_t
 dns_c_zone_setmaxtranstimein(dns_c_zone_t *zone, isc_uint32_t newval) {
 	isc_boolean_t existed = ISC_FALSE;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 
 	switch (zone->ztype) {
@@ -2519,7 +2519,7 @@ dns_c_zone_setmaxtranstimein(dns_c_zone_t *zone, isc_uint32_t newval) {
 			      "Master zones do not have a "
 			      "max_trans_time_in field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_slave:
 		zone->u.szone.max_trans_time_in = newval ;
 		existed = DNS_C_CHECKBIT(SZ_MAX_TRANS_TIME_IN_BIT,
@@ -2527,7 +2527,7 @@ dns_c_zone_setmaxtranstimein(dns_c_zone_t *zone, isc_uint32_t newval) {
 		DNS_C_SETBIT(SZ_MAX_TRANS_TIME_IN_BIT,
 			     &zone->u.szone.setflags);
 		break;
-		
+
 	case dns_c_zone_stub:
 		zone->u.tzone.max_trans_time_in = newval ;
 		existed = DNS_C_CHECKBIT(TZ_MAX_TRANS_TIME_IN_BIT,
@@ -2542,7 +2542,7 @@ dns_c_zone_setmaxtranstimein(dns_c_zone_t *zone, isc_uint32_t newval) {
 			      "Hint zones do not have a "
 			      "max_trans_time_in field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -2573,7 +2573,7 @@ dns_c_zone_getmaxtranstimein(dns_c_zone_t *zone, isc_uint32_t *retval) {
 			      "Master zones do not have a "
 			      "max_trans_time_in field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_slave:
 		if (DNS_C_CHECKBIT(SZ_MAX_TRANS_TIME_IN_BIT,
 				   &zone->u.szone.setflags)) {
@@ -2583,7 +2583,7 @@ dns_c_zone_getmaxtranstimein(dns_c_zone_t *zone, isc_uint32_t *retval) {
 			res = ISC_R_NOTFOUND;
 		}
 		break;
-		
+
 	case dns_c_zone_stub:
 		if (DNS_C_CHECKBIT(TZ_MAX_TRANS_TIME_IN_BIT,
 				   &zone->u.tzone.setflags)) {
@@ -2593,14 +2593,14 @@ dns_c_zone_getmaxtranstimein(dns_c_zone_t *zone, isc_uint32_t *retval) {
 			res = ISC_R_NOTFOUND;
 		}
 		break;
-		
+
 	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 "
 			      "max_trans_time_in field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -2620,7 +2620,7 @@ dns_c_zone_getmaxtranstimein(dns_c_zone_t *zone, isc_uint32_t *retval) {
 isc_result_t
 dns_c_zone_setmaxtranstimeout(dns_c_zone_t *zone, isc_uint32_t newval) {
 	isc_boolean_t existed = ISC_FALSE;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 
 	switch (zone->ztype) {
@@ -2631,7 +2631,7 @@ dns_c_zone_setmaxtranstimeout(dns_c_zone_t *zone, isc_uint32_t newval) {
 		DNS_C_SETBIT(MZ_MAX_TRANS_TIME_OUT_BIT,
 			     &zone->u.mzone.setflags);
 		break;
-			
+
 	case dns_c_zone_slave:
 		zone->u.szone.max_trans_time_out = newval ;
 		existed = DNS_C_CHECKBIT(SZ_MAX_TRANS_TIME_OUT_BIT,
@@ -2639,7 +2639,7 @@ dns_c_zone_setmaxtranstimeout(dns_c_zone_t *zone, isc_uint32_t newval) {
 		DNS_C_SETBIT(SZ_MAX_TRANS_TIME_OUT_BIT,
 			     &zone->u.szone.setflags);
 		break;
-		
+
 	case dns_c_zone_stub:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -2653,7 +2653,7 @@ dns_c_zone_setmaxtranstimeout(dns_c_zone_t *zone, isc_uint32_t newval) {
 			      "Hint zones do not have a "
 			      "max_trans_time_out field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -2687,7 +2687,7 @@ dns_c_zone_getmaxtranstimeout(dns_c_zone_t *zone, isc_uint32_t *retval) {
 			res = ISC_R_NOTFOUND;
 		}
 		break;
-			
+
 	case dns_c_zone_slave:
 		if (DNS_C_CHECKBIT(SZ_MAX_TRANS_TIME_OUT_BIT,
 				   &zone->u.szone.setflags)) {
@@ -2697,21 +2697,21 @@ dns_c_zone_getmaxtranstimeout(dns_c_zone_t *zone, isc_uint32_t *retval) {
 			res = ISC_R_NOTFOUND;
 		}
 		break;
-		
+
 	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 "
 			      "max_trans_time_out 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 "
 			      "max_trans_time_out field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -2731,7 +2731,7 @@ dns_c_zone_getmaxtranstimeout(dns_c_zone_t *zone, isc_uint32_t *retval) {
 isc_result_t
 dns_c_zone_setmaxtransidlein(dns_c_zone_t *zone, isc_uint32_t newval) {
 	isc_boolean_t existed = ISC_FALSE;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 
 	switch (zone->ztype) {
@@ -2741,7 +2741,7 @@ dns_c_zone_setmaxtransidlein(dns_c_zone_t *zone, isc_uint32_t newval) {
 			      "Master zones do not have a "
 			      "max_trans_idle_in field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_slave:
 		zone->u.szone.max_trans_idle_in = newval ;
 		existed = DNS_C_CHECKBIT(SZ_MAX_TRANS_IDLE_IN_BIT,
@@ -2749,7 +2749,7 @@ dns_c_zone_setmaxtransidlein(dns_c_zone_t *zone, isc_uint32_t newval) {
 		DNS_C_SETBIT(SZ_MAX_TRANS_IDLE_IN_BIT,
 			     &zone->u.szone.setflags);
 		break;
-		
+
 	case dns_c_zone_stub:
 		zone->u.tzone.max_trans_idle_in = newval ;
 		existed = DNS_C_CHECKBIT(TZ_MAX_TRANS_IDLE_IN_BIT,
@@ -2764,7 +2764,7 @@ dns_c_zone_setmaxtransidlein(dns_c_zone_t *zone, isc_uint32_t newval) {
 			      "Hint zones do not have a "
 			      "max_trans_idle_in field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -2795,7 +2795,7 @@ dns_c_zone_getmaxtransidlein(dns_c_zone_t *zone, isc_uint32_t *retval) {
 			      "Master zones do not have a "
 			      "max_trans_idle_in field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_slave:
 		if (DNS_C_CHECKBIT(SZ_MAX_TRANS_IDLE_IN_BIT,
 				   &zone->u.szone.setflags)) {
@@ -2805,7 +2805,7 @@ dns_c_zone_getmaxtransidlein(dns_c_zone_t *zone, isc_uint32_t *retval) {
 			res = ISC_R_NOTFOUND;
 		}
 		break;
-		
+
 	case dns_c_zone_stub:
 		if (DNS_C_CHECKBIT(TZ_MAX_TRANS_IDLE_IN_BIT,
 				   &zone->u.tzone.setflags)) {
@@ -2815,14 +2815,14 @@ dns_c_zone_getmaxtransidlein(dns_c_zone_t *zone, isc_uint32_t *retval) {
 			res = ISC_R_NOTFOUND;
 		}
 		break;
-		
+
 	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 "
 			      "max_trans_idle_in field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -2842,7 +2842,7 @@ dns_c_zone_getmaxtransidlein(dns_c_zone_t *zone, isc_uint32_t *retval) {
 isc_result_t
 dns_c_zone_setmaxtransidleout(dns_c_zone_t *zone, isc_uint32_t newval) {
 	isc_boolean_t existed = ISC_FALSE;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 
 	switch (zone->ztype) {
@@ -2853,7 +2853,7 @@ dns_c_zone_setmaxtransidleout(dns_c_zone_t *zone, isc_uint32_t newval) {
 		DNS_C_SETBIT(MZ_MAX_TRANS_IDLE_OUT_BIT,
 			     &zone->u.mzone.setflags);
 		break;
-			
+
 	case dns_c_zone_slave:
 		zone->u.szone.max_trans_idle_out = newval ;
 		existed = DNS_C_CHECKBIT(SZ_MAX_TRANS_IDLE_OUT_BIT,
@@ -2861,7 +2861,7 @@ dns_c_zone_setmaxtransidleout(dns_c_zone_t *zone, isc_uint32_t newval) {
 		DNS_C_SETBIT(SZ_MAX_TRANS_IDLE_OUT_BIT,
 			     &zone->u.szone.setflags);
 		break;
-		
+
 	case dns_c_zone_stub:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -2875,7 +2875,7 @@ dns_c_zone_setmaxtransidleout(dns_c_zone_t *zone, isc_uint32_t newval) {
 			      "Hint zones do not have a "
 			      "max_trans_idle_out field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -2909,8 +2909,8 @@ dns_c_zone_getmaxtransidleout(dns_c_zone_t *zone, isc_uint32_t *retval) {
 			res = ISC_R_NOTFOUND;
 		}
 		break;
-		
-			
+
+
 	case dns_c_zone_slave:
 		if (DNS_C_CHECKBIT(SZ_MAX_TRANS_IDLE_OUT_BIT,
 				   &zone->u.szone.setflags)) {
@@ -2920,21 +2920,21 @@ dns_c_zone_getmaxtransidleout(dns_c_zone_t *zone, isc_uint32_t *retval) {
 			res = ISC_R_NOTFOUND;
 		}
 		break;
-		
+
 	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 "
 			      "max_trans_idle_out 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 "
 			      "max_trans_idle_out field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -2954,7 +2954,7 @@ dns_c_zone_getmaxtransidleout(dns_c_zone_t *zone, isc_uint32_t *retval) {
 isc_result_t
 dns_c_zone_setsigvalidityinterval(dns_c_zone_t *zone, isc_uint32_t newval) {
 	isc_boolean_t existed = ISC_FALSE;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 
 	switch (zone->ztype) {
@@ -2965,14 +2965,14 @@ dns_c_zone_setsigvalidityinterval(dns_c_zone_t *zone, isc_uint32_t newval) {
 		DNS_C_SETBIT(MZ_SIG_VALID_INTERVAL_BIT,
 			     &zone->u.mzone.setflags);
 		break;
-			
+
 	case dns_c_zone_slave:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
 			      "Slave zones do not have a "
 			      "sig_valid_interval field");
 		return (ISC_R_FAILURE);
-		
+
 	case dns_c_zone_stub:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -2986,7 +2986,7 @@ dns_c_zone_setsigvalidityinterval(dns_c_zone_t *zone, isc_uint32_t newval) {
 			      "Hint zones do not have a "
 			      "sig_valid_interval field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -3020,29 +3020,29 @@ dns_c_zone_getsigvalidityinterval(dns_c_zone_t *zone, isc_uint32_t *retval) {
 			res = ISC_R_NOTFOUND;
 		}
 		break;
-		
-			
+
+
 	case dns_c_zone_slave:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
 			      "Slave zones do not have a "
 			      "sig_valid_interval field");
 		return (ISC_R_FAILURE);
-		
+
 	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 "
 			      "sig_valid_interval 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 "
 			      "sig_valid_interval field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -3065,7 +3065,7 @@ dns_c_zone_setmaxixfrlog(dns_c_zone_t *zone, isc_uint32_t newval) {
 	isc_uint32_t *p = NULL;
 	int bit = 0;
 	isc_result_t res;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 
 	switch (zone->ztype) {
@@ -3074,13 +3074,13 @@ dns_c_zone_setmaxixfrlog(dns_c_zone_t *zone, isc_uint32_t newval) {
 		bits = &zone->u.mzone.setflags;
 		bit = MZ_MAX_IXFR_LOG_BIT;
 		break;
-			
+
 	case dns_c_zone_slave:
 		p = &zone->u.szone.max_ixfr_log;
 		bits = &zone->u.mzone.setflags;
 		bit = SZ_MAX_IXFR_LOG_BIT;
 		break;
-		
+
 	case dns_c_zone_stub:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -3092,7 +3092,7 @@ dns_c_zone_setmaxixfrlog(dns_c_zone_t *zone, isc_uint32_t newval) {
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
 			      "Hint zones do not have a max-ixfr-log field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -3106,7 +3106,7 @@ dns_c_zone_setmaxixfrlog(dns_c_zone_t *zone, isc_uint32_t newval) {
 	} else {
 		res = ISC_R_SUCCESS;
 	}
-	
+
 	*p = newval;
 	DNS_C_SETBIT(bit, bits);
 
@@ -3134,13 +3134,13 @@ dns_c_zone_getmaxixfrlog(dns_c_zone_t *zone, isc_uint32_t *retval) {
 		bit = MZ_MAX_IXFR_LOG_BIT;
 		ptr = &zone->u.mzone.max_ixfr_log;
 		break;
-			
+
 	case dns_c_zone_slave:
 		bits = &zone->u.szone.setflags;
 		bit = SZ_MAX_IXFR_LOG_BIT;
 		ptr = &zone->u.szone.max_ixfr_log;
 		break;
-		
+
 	case dns_c_zone_stub:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -3152,7 +3152,7 @@ dns_c_zone_getmaxixfrlog(dns_c_zone_t *zone, isc_uint32_t *retval) {
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
 			      "Hint zones do not have a max_ixfr_log field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -3167,7 +3167,7 @@ dns_c_zone_getmaxixfrlog(dns_c_zone_t *zone, isc_uint32_t *retval) {
 	} else {
 		res = ISC_R_NOTFOUND;
 	}
-	
+
 	return (res);
 }
 
@@ -3179,9 +3179,9 @@ dns_c_zone_getmaxixfrlog(dns_c_zone_t *zone, isc_uint32_t *retval) {
 isc_result_t
 dns_c_zone_setforward(dns_c_zone_t *zone, dns_c_forw_t newval) {
 	isc_boolean_t existed = ISC_FALSE;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
-		
+
 	switch (zone->ztype) {
 	case dns_c_zone_master:
 		zone->u.mzone.forward = newval;
@@ -3189,27 +3189,27 @@ dns_c_zone_setforward(dns_c_zone_t *zone, dns_c_forw_t newval) {
 					 &zone->u.mzone.setflags);
 		DNS_C_SETBIT(MZ_FORWARD_BIT, &zone->u.mzone.setflags);
 		break;
-			
+
 	case dns_c_zone_slave:
 		zone->u.szone.forward = newval;
 		existed = DNS_C_CHECKBIT(SZ_FORWARD_BIT,
 					 &zone->u.szone.setflags);
 		DNS_C_SETBIT(SZ_FORWARD_BIT, &zone->u.szone.setflags);
 		break;
-		
+
 	case dns_c_zone_stub:
 		zone->u.tzone.forward = newval;
 		existed = DNS_C_CHECKBIT(TZ_FORWARD_BIT,
 					 &zone->u.tzone.setflags);
 		DNS_C_SETBIT(TZ_FORWARD_BIT, &zone->u.tzone.setflags);
 		break;
-		
+
 	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 forward field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		zone->u.fzone.forward = newval;
 		existed = DNS_C_CHECKBIT(FZ_FORWARD_BIT,
@@ -3229,7 +3229,7 @@ dns_c_zone_setforward(dns_c_zone_t *zone, dns_c_forw_t newval) {
 isc_result_t
 dns_c_zone_getforward(dns_c_zone_t *zone, dns_c_forw_t *retval) {
 	isc_result_t res = ISC_R_SUCCESS;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 	REQUIRE(retval != NULL);
 
@@ -3242,7 +3242,7 @@ dns_c_zone_getforward(dns_c_zone_t *zone, dns_c_forw_t *retval) {
 			res = ISC_R_NOTFOUND;
 		}
 		break;
-			
+
 	case dns_c_zone_slave:
 		if (DNS_C_CHECKBIT(SZ_FORWARD_BIT, &zone->u.szone.setflags)) {
 			*retval = zone->u.szone.forward;
@@ -3266,7 +3266,7 @@ dns_c_zone_getforward(dns_c_zone_t *zone, dns_c_forw_t *retval) {
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
 			      "Hint zones do not have a forward field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		if (DNS_C_CHECKBIT(FZ_FORWARD_BIT, &zone->u.fzone.setflags)) {
 			*retval = zone->u.fzone.forward;
@@ -3293,7 +3293,7 @@ dns_c_zone_setforwarders(dns_c_zone_t *zone,
 	isc_boolean_t existed = ISC_FALSE;
 	isc_result_t res;
 	dns_c_iplist_t **p = NULL;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 	REQUIRE(DNS_C_IPLIST_VALID(ipl));
 
@@ -3302,23 +3302,23 @@ dns_c_zone_setforwarders(dns_c_zone_t *zone,
 		p = &zone->u.mzone.forwarders;
 		existed = (*p == NULL ? ISC_FALSE : ISC_TRUE);
 		break;
-			
+
 	case dns_c_zone_slave:
 		p = &zone->u.szone.forwarders;
 		existed = (*p == NULL ? ISC_FALSE : ISC_TRUE);
 		break;
-		
+
 	case dns_c_zone_stub:
 		p = &zone->u.tzone.forwarders;
 		existed = (*p == NULL ? ISC_FALSE : ISC_TRUE);
 		break;
-		
+
 	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 forwarders field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		p = &zone->u.fzone.forwarders;
 		existed = (*p == NULL ? ISC_FALSE : ISC_TRUE);
@@ -3341,7 +3341,7 @@ dns_c_zone_setforwarders(dns_c_zone_t *zone,
 isc_result_t
 dns_c_zone_getforwarders(dns_c_zone_t *zone, dns_c_iplist_t **retval) {
 	isc_result_t res = ISC_R_SUCCESS;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 	REQUIRE(retval != NULL);
 
@@ -3355,7 +3355,7 @@ dns_c_zone_getforwarders(dns_c_zone_t *zone, dns_c_iplist_t **retval) {
 			res = ISC_R_NOTFOUND;
 		}
 		break;
-			
+
 	case dns_c_zone_slave:
 		if (zone->u.szone.forwarders != NULL &&
 		    zone->u.szone.forwarders->nextidx > 0) {
@@ -3365,7 +3365,7 @@ dns_c_zone_getforwarders(dns_c_zone_t *zone, dns_c_iplist_t **retval) {
 			res = ISC_R_NOTFOUND;
 		}
 		break;
-		
+
 	case dns_c_zone_stub:
 		if (zone->u.tzone.forwarders != NULL &&
 		    zone->u.tzone.forwarders->nextidx > 0) {
@@ -3375,13 +3375,13 @@ dns_c_zone_getforwarders(dns_c_zone_t *zone, dns_c_iplist_t **retval) {
 			res = ISC_R_NOTFOUND;
 		}
 		break;
-		
+
 	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 forwarders field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		if (zone->u.fzone.forwarders != NULL &&
 		    zone->u.fzone.forwarders->nextidx > 0) {
@@ -3409,7 +3409,7 @@ dns_c_zone_setallowupd(dns_c_zone_t *zone,
 	dns_c_ipmatchlist_t **p = NULL;
 	isc_result_t res;
 	isc_boolean_t existed;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 	REQUIRE(DNS_C_IPMLIST_VALID(ipml));
 
@@ -3417,21 +3417,21 @@ dns_c_zone_setallowupd(dns_c_zone_t *zone,
 	case dns_c_zone_master:
 		p = &zone->u.mzone.allow_update;
 		break;
-			
+
 	case dns_c_zone_slave:
 		p = &zone->u.szone.allow_update;
 		break;
-		
+
 	case dns_c_zone_stub:
 		p = &zone->u.tzone.allow_update;
 		break;
-		
+
 	case dns_c_zone_hint:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
 			      "Hint zones do not have an allow_update field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -3441,7 +3441,7 @@ dns_c_zone_setallowupd(dns_c_zone_t *zone,
 	}
 
 	existed = (*p != NULL ? ISC_TRUE : ISC_FALSE);
-	
+
 	res = set_ipmatch_list_field(zone->mem, p,
 				     ipml, deepcopy);
 	if (res == ISC_R_SUCCESS && existed) {
@@ -3460,7 +3460,7 @@ isc_result_t
 dns_c_zone_getallowupd(dns_c_zone_t *zone, dns_c_ipmatchlist_t **retval) {
 	dns_c_ipmatchlist_t *p = NULL;
 	isc_result_t res;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 	REQUIRE(retval != NULL);
 
@@ -3468,21 +3468,21 @@ dns_c_zone_getallowupd(dns_c_zone_t *zone, dns_c_ipmatchlist_t **retval) {
 	case dns_c_zone_master:
 		p = zone->u.mzone.allow_update;
 		break;
-			
+
 	case dns_c_zone_slave:
 		p = zone->u.szone.allow_update;
 		break;
-		
+
 	case dns_c_zone_stub:
 		p = zone->u.tzone.allow_update;
 		break;
-		
+
 	case dns_c_zone_hint:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
 			      "Hint zones do not have an allow_update field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -3509,28 +3509,28 @@ dns_c_zone_getallowupd(dns_c_zone_t *zone, dns_c_ipmatchlist_t **retval) {
 isc_result_t
 dns_c_zone_unsetallowupd(dns_c_zone_t *zone) {
 	dns_c_ipmatchlist_t **p = NULL;
-	
+
 	REQUIRE(DNS_C_ZONE_VALID(zone));
 
 	switch (zone->ztype) {
 	case dns_c_zone_master:
 		p = &zone->u.mzone.allow_update;
 		break;
-			
+
 	case dns_c_zone_slave:
 		p = &zone->u.szone.allow_update;
 		break;
-		
+
 	case dns_c_zone_stub:
 		p = &zone->u.tzone.allow_update;
 		break;
-		
+
 	case dns_c_zone_hint:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
 			      "Hint zones do not have an allow_update field");
 		return (ISC_R_FAILURE);
-			
+
 	case dns_c_zone_forward:
 		isc_log_write(dns_lctx, DNS_LOGCATEGORY_CONFIG,
 			      DNS_LOGMODULE_CONFIG, ISC_LOG_CRITICAL,
@@ -3565,7 +3565,7 @@ dns_c_zone_setdatabase(dns_c_zone_t *zone, const char *database)
 		existed = ISC_TRUE;
 		isc_mem_free(zone->mem, zone->database);
 	}
-	
+
 	zone->database = isc_mem_strdup(zone->mem, database);
 	if (zone->database == NULL) {
 		return (ISC_R_NOMEMORY);
@@ -3631,7 +3631,7 @@ dns_c_zone_setenabled(dns_c_zone_t *zone, isc_boolean_t enabled)
 	} else {
 		zone->enabled = isc_mem_get(zone->mem, sizeof (zone->enabled));
 	}
-	
+
 	*zone->enabled = enabled;
 
 	if (existed) {
@@ -3691,7 +3691,7 @@ dns_c_zone_unsetenabled(dns_c_zone_t *zone)
 static void
 master_zone_print(FILE *fp, int indent, dns_c_masterzone_t *mzone) {
 	REQUIRE(mzone != NULL);
-	
+
 	if (mzone->file != NULL) {
 		dns_c_printtabs(fp, indent);
 		fprintf(fp, "file \"%s\";\n", mzone->file);
@@ -3795,13 +3795,13 @@ master_zone_print(FILE *fp, int indent, dns_c_masterzone_t *mzone) {
 		fprintf(fp, "max-transfer-time-out %d;\n",
 			mzone->max_trans_time_out / 60);
 	}
-	
+
 	if (DNS_C_CHECKBIT(MZ_SIG_VALID_INTERVAL_BIT, &mzone->setflags)) {
 		dns_c_printtabs(fp, indent);
 		fprintf(fp, "sig-validity-interval %d;\n",
 			mzone->sig_valid_interval);
 	}
-	
+
 	if (mzone->pubkeylist != NULL) {
 		fprintf(fp, "\n");
 		dns_c_pklist_print(fp, indent, mzone->pubkeylist);
@@ -3830,7 +3830,7 @@ master_zone_print(FILE *fp, int indent, dns_c_masterzone_t *mzone) {
 static void
 slave_zone_print(FILE *fp, int indent, dns_c_slavezone_t *szone) {
 	REQUIRE(szone != NULL);
-	
+
 	if (szone->file != NULL) {
 		dns_c_printtabs(fp, indent);
 		fprintf(fp, "file \"%s\";\n", szone->file);
@@ -3870,7 +3870,7 @@ slave_zone_print(FILE *fp, int indent, dns_c_slavezone_t *szone) {
 		}
 		fprintf(fp, ";\n");
 	}
-	
+
 
 	if (DNS_C_CHECKBIT(SZ_FORWARD_BIT, &szone->setflags)) {
 		dns_c_printtabs(fp, indent);
@@ -3948,25 +3948,25 @@ slave_zone_print(FILE *fp, int indent, dns_c_slavezone_t *szone) {
 		fprintf(fp, "max-transfer-time-in %d;\n",
 			szone->max_trans_time_in / 60);
 	}
-	
+
 	if (DNS_C_CHECKBIT(SZ_MAX_TRANS_TIME_OUT_BIT, &szone->setflags)) {
 		dns_c_printtabs(fp, indent);
 		fprintf(fp, "max-transfer-time-out %d;\n",
 			szone->max_trans_time_out / 60);
 	}
-	
+
 	if (DNS_C_CHECKBIT(SZ_MAX_TRANS_IDLE_IN_BIT, &szone->setflags)) {
 		dns_c_printtabs(fp, indent);
 		fprintf(fp, "max-transfer-idle-in %d;\n",
 			szone->max_trans_idle_in / 60);
 	}
-	
+
 	if (DNS_C_CHECKBIT(SZ_MAX_TRANS_IDLE_OUT_BIT, &szone->setflags)) {
 		dns_c_printtabs(fp, indent);
 		fprintf(fp, "max-transfer-idle-out %d;\n",
 			szone->max_trans_idle_out / 60);
 	}
-	
+
 	if (DNS_C_CHECKBIT(SZ_DIALUP_BIT, &szone->setflags)) {
 		dns_c_printtabs(fp, indent);
 		fprintf(fp, "dialup %s;\n",
@@ -4005,7 +4005,7 @@ slave_zone_print(FILE *fp, int indent, dns_c_slavezone_t *szone) {
 static void
 stub_zone_print(FILE *fp, int indent, dns_c_stubzone_t *tzone) {
 	REQUIRE(tzone != NULL);
-	
+
 	if (tzone->file != NULL) {
 		dns_c_printtabs(fp, indent);
 		fprintf(fp, "file \"%s\";\n", tzone->file);
@@ -4113,13 +4113,13 @@ stub_zone_print(FILE *fp, int indent, dns_c_stubzone_t *tzone) {
 		fprintf(fp, "max-transfer-time-in %d;\n",
 			tzone->max_trans_time_in / 60);
 	}
-	
+
 	if (DNS_C_CHECKBIT(TZ_MAX_TRANS_IDLE_IN_BIT, &tzone->setflags)) {
 		dns_c_printtabs(fp, indent);
 		fprintf(fp, "max-transfer-idle-in %d;\n",
 			tzone->max_trans_idle_in / 60);
 	}
-	
+
 	if (tzone->pubkeylist != NULL) {
 		fprintf(fp, "\n");
 		dns_c_pklist_print(fp, indent, tzone->pubkeylist);
@@ -4134,7 +4134,7 @@ stub_zone_print(FILE *fp, int indent, dns_c_stubzone_t *tzone) {
 static void
 hint_zone_print(FILE *fp, int indent, dns_c_hintzone_t *hzone) {
 	REQUIRE(hzone != NULL);
-	
+
 	if (hzone->file != NULL) {
 		dns_c_printtabs(fp, indent);
 		fprintf(fp, "file \"%s\";\n", hzone->file);
@@ -4161,7 +4161,7 @@ hint_zone_print(FILE *fp, int indent, dns_c_hintzone_t *hzone) {
 static void
 forward_zone_print(FILE *fp, int indent, dns_c_forwardzone_t *fzone) {
 	REQUIRE(fzone != NULL);
-	
+
 	if (DNS_C_CHECKBIT(FZ_FORWARD_BIT, &fzone->setflags)) {
 		dns_c_printtabs(fp, indent);
 		fprintf(fp, "forward %s;\n",
@@ -4192,7 +4192,7 @@ forward_zone_print(FILE *fp, int indent, dns_c_forwardzone_t *fzone) {
 static void
 master_zone_init(dns_c_masterzone_t *mzone) {
 	REQUIRE(mzone != NULL);
-	
+
 	mzone->file = NULL;
 	mzone->allow_update = NULL;
 	mzone->ssuauth = NULL;
@@ -4289,7 +4289,7 @@ static isc_result_t
 zone_delete(dns_c_zone_t **zone) {
 	dns_c_zone_t *z;
 	isc_result_t res = ISC_R_SUCCESS;
-	
+
 	REQUIRE(zone != NULL);
 	REQUIRE(DNS_C_ZONE_VALID(*zone));
 
@@ -4307,7 +4307,7 @@ zone_delete(dns_c_zone_t **zone) {
 		isc_mem_put(z->mem, z->enabled, sizeof (z->enabled));
 		z->enabled = NULL;
 	}
-	
+
 	switch(z->ztype) {
 	case dns_c_zone_master:
 		res = master_zone_clear(z->mem, &z->u.mzone);
@@ -4316,15 +4316,15 @@ zone_delete(dns_c_zone_t **zone) {
 	case dns_c_zone_slave:
 		res = slave_zone_clear(z->mem, &z->u.szone);
 		break;
-		
+
 	case dns_c_zone_stub:
 		res = stub_zone_clear(z->mem, &z->u.tzone);
 		break;
-		
+
 	case dns_c_zone_hint:
 		res = hint_zone_clear(z->mem, &z->u.hzone);
 		break;
-		
+
 	case dns_c_zone_forward:
 		res = forward_zone_clear(z->mem, &z->u.fzone);
 		break;
@@ -4345,7 +4345,7 @@ zone_delete(dns_c_zone_t **zone) {
 static isc_result_t
 master_zone_clear(isc_mem_t *mem, dns_c_masterzone_t *mzone) {
 	REQUIRE(mzone != NULL);
-	
+
 	if (mzone == NULL) {
 		return (ISC_R_SUCCESS);
 	}
@@ -4359,7 +4359,7 @@ master_zone_clear(isc_mem_t *mem, dns_c_masterzone_t *mzone) {
 
 	if (mzone->ssuauth != NULL)
 		dns_ssutable_detach(&mzone->ssuauth);
-	
+
 	if (mzone->allow_update_forwarding != NULL)
 		dns_c_ipmatchlist_detach(&mzone->allow_update_forwarding);
 
@@ -4371,11 +4371,11 @@ master_zone_clear(isc_mem_t *mem, dns_c_masterzone_t *mzone) {
 
 	if (mzone->also_notify != NULL)
 		dns_c_iplist_detach(&mzone->also_notify);
-	
+
 	if (mzone->ixfr_base != NULL) {
 		isc_mem_free(mem, mzone->ixfr_base);
 	}
-		
+
 	if (mzone->ixfr_tmp != NULL) {
 		isc_mem_free(mem, mzone->ixfr_tmp);
 	}
@@ -4397,7 +4397,7 @@ master_zone_clear(isc_mem_t *mem, dns_c_masterzone_t *mzone) {
 static isc_result_t
 slave_zone_clear(isc_mem_t *mem, dns_c_slavezone_t *szone) {
 	REQUIRE(szone != NULL);
-	
+
 	if (szone == NULL) {
 		return (ISC_R_SUCCESS);
 	}
@@ -4409,32 +4409,32 @@ slave_zone_clear(isc_mem_t *mem, dns_c_slavezone_t *szone) {
 	if (szone->ixfr_base != NULL) {
 		isc_mem_free(mem, szone->ixfr_base);
 	}
-		
+
 	if (szone->ixfr_tmp != NULL) {
 		isc_mem_free(mem, szone->ixfr_tmp);
 	}
-		
+
 	if (szone->master_ips != NULL)
 		dns_c_iplist_detach(&szone->master_ips);
-	
+
 	if (szone->allow_update != NULL)
 		dns_c_ipmatchlist_detach(&szone->allow_update);
-	
+
 	if (szone->allow_update_forwarding != NULL)
 		dns_c_ipmatchlist_detach(&szone->allow_update_forwarding);
-	
+
 	if (szone->allow_query != NULL)
 		dns_c_ipmatchlist_detach(&szone->allow_query);
-	
+
 	if (szone->allow_transfer != NULL)
 		dns_c_ipmatchlist_detach(&szone->allow_transfer);
-	
+
 	if (szone->also_notify != NULL)
 		dns_c_iplist_detach(&szone->also_notify);
-	
+
 	if (szone->forwarders != NULL)
 		dns_c_iplist_detach(&szone->forwarders);
-	
+
 	if (szone->pubkeylist != NULL)
 		dns_c_pklist_delete(&szone->pubkeylist);
 
@@ -4449,7 +4449,7 @@ slave_zone_clear(isc_mem_t *mem, dns_c_slavezone_t *szone) {
 static isc_result_t
 stub_zone_clear(isc_mem_t *mem, dns_c_stubzone_t *tzone) {
 	REQUIRE(tzone != NULL);
-	
+
 	if (tzone == NULL) {
 		return (ISC_R_SUCCESS);
 	}
@@ -4460,25 +4460,25 @@ stub_zone_clear(isc_mem_t *mem, dns_c_stubzone_t *tzone) {
 
 	if (tzone->master_ips != NULL)
 		dns_c_iplist_detach(&tzone->master_ips);
-	
+
 	if (tzone->allow_update != NULL)
 		dns_c_ipmatchlist_detach(&tzone->allow_update);
-	
+
 	if (tzone->allow_update_forwarding != NULL)
 		dns_c_ipmatchlist_detach(&tzone->allow_update_forwarding);
-	
+
 	if (tzone->allow_query != NULL)
 		dns_c_ipmatchlist_detach(&tzone->allow_query);
-	
+
 	if (tzone->allow_transfer != NULL)
 		dns_c_ipmatchlist_detach(&tzone->allow_transfer);
-	
+
 	if (tzone->forwarders != NULL)
 		dns_c_iplist_detach(&tzone->forwarders);
-	
+
 	if (tzone->pubkeylist != NULL)
 		dns_c_pklist_delete(&tzone->pubkeylist);
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -4490,16 +4490,16 @@ stub_zone_clear(isc_mem_t *mem, dns_c_stubzone_t *tzone) {
 static isc_result_t
 forward_zone_clear(isc_mem_t *mem, dns_c_forwardzone_t *fzone) {
 	REQUIRE(fzone != NULL);
-	
+
 	if (fzone == NULL) {
 		return (ISC_R_SUCCESS);
 	}
 
 	(void) mem;			/* lint happiness */
-	
+
 	if (fzone->forwarders != NULL)
 		dns_c_iplist_detach(&fzone->forwarders);
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -4511,7 +4511,7 @@ forward_zone_clear(isc_mem_t *mem, dns_c_forwardzone_t *fzone) {
 static isc_result_t
 hint_zone_clear(isc_mem_t *mem, dns_c_hintzone_t *hzone) {
 	REQUIRE(hzone != NULL);
-	
+
 	if (hzone == NULL) {
 		return (ISC_R_SUCCESS);
 	}
@@ -4519,10 +4519,10 @@ hint_zone_clear(isc_mem_t *mem, dns_c_hintzone_t *hzone) {
 	if (hzone->file != NULL) {
 		isc_mem_free(mem, hzone->file);
 	}
-	
+
 	if (hzone->pubkeylist != NULL)
 		dns_c_pklist_delete(&hzone->pubkeylist);
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -4539,14 +4539,14 @@ set_ipmatch_list_field(isc_mem_t *mem,
 		       isc_boolean_t deepcopy)
 {
 	isc_result_t res;
-	
+
 	if (*dest != NULL) {
 		res = dns_c_ipmatchlist_detach(dest);
 		if (res != ISC_R_SUCCESS) {
 			return (res);
 		}
 	}
-	
+
 	if (deepcopy) {
 		res = dns_c_ipmatchlist_copy(mem, dest, src);
 	} else {
@@ -4568,14 +4568,14 @@ set_iplist_field(isc_mem_t *mem,
 		 isc_boolean_t deepcopy)
 {
 	isc_result_t res;
-	
+
 	if (*dest != NULL) {
 		res = dns_c_iplist_detach(dest);
 		if (res != ISC_R_SUCCESS) {
 			return (res);
 		}
 	}
-	
+
 	if (deepcopy) {
 		res = dns_c_iplist_copy(mem, dest, src);
 	} else {
diff --git a/lib/dns/db.c b/lib/dns/db.c
index ee031655f6..cf335056fb 100644
--- a/lib/dns/db.c
+++ b/lib/dns/db.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: db.c,v 1.48 2000/07/27 09:45:57 tale Exp $ */
+/* $Id: db.c,v 1.49 2000/08/01 01:22:15 tale Exp $ */
 
 /***
  *** Imports
@@ -37,7 +37,7 @@
  ***/
 
 typedef struct {
-	const char *		name;	
+	const char *		name;
 	isc_result_t		(*create)(isc_mem_t *mctx, dns_name_t *name,
 					  dns_dbtype_t type,
 					  dns_rdataclass_t rdclass,
@@ -135,7 +135,7 @@ dns_db_iscache(dns_db_t *db) {
 	/*
 	 * Does 'db' have cache semantics?
 	 */
-	
+
 	REQUIRE(DNS_DB_VALID(db));
 
 	if ((db->attributes & DNS_DBATTR_CACHE) != 0)
@@ -150,7 +150,7 @@ dns_db_iszone(dns_db_t *db) {
 	/*
 	 * Does 'db' have zone semantics?
 	 */
-	
+
 	REQUIRE(DNS_DB_VALID(db));
 
 	if ((db->attributes & (DNS_DBATTR_CACHE|DNS_DBATTR_STUB)) == 0)
@@ -165,7 +165,7 @@ dns_db_isstub(dns_db_t *db) {
 	/*
 	 * Does 'db' have stub semantics?
 	 */
-	
+
 	REQUIRE(DNS_DB_VALID(db));
 
 	if ((db->attributes & DNS_DBATTR_STUB) != 0)
@@ -180,7 +180,7 @@ dns_db_issecure(dns_db_t *db) {
 	/*
 	 * Is 'db' secure?
 	 */
-	
+
 	REQUIRE(DNS_DB_VALID(db));
 	REQUIRE((db->attributes & DNS_DBATTR_CACHE) == 0);
 
@@ -287,11 +287,11 @@ dns_db_dump(dns_db_t *db, dns_dbversion_t *version, const char *filename) {
 
 void
 dns_db_currentversion(dns_db_t *db, dns_dbversion_t **versionp) {
-	
+
 	/*
 	 * Open the current version for reading.
 	 */
-	
+
 	REQUIRE(DNS_DB_VALID(db));
 	REQUIRE((db->attributes & DNS_DBATTR_CACHE) == 0);
 	REQUIRE(versionp != NULL && *versionp == NULL);
@@ -301,7 +301,7 @@ dns_db_currentversion(dns_db_t *db, dns_dbversion_t **versionp) {
 
 isc_result_t
 dns_db_newversion(dns_db_t *db, dns_dbversion_t **versionp) {
-	
+
 	/*
 	 * Open a new version for reading and writing.
 	 */
@@ -329,13 +329,13 @@ dns_db_attachversion(dns_db_t *db, dns_dbversion_t *source,
 	(db->methods->attachversion)(db, source, targetp);
 
 	ENSURE(*targetp != NULL);
-}	
+}
 
 void
 dns_db_closeversion(dns_db_t *db, dns_dbversion_t **versionp,
 		    isc_boolean_t commit)
 {
-	
+
 	/*
 	 * Close version '*versionp'.
 	 */
@@ -615,7 +615,7 @@ dns_db_getsoaserial(dns_db_t *db, dns_dbversion_t *ver, isc_uint32_t *serialp)
 	isc_buffer_t buffer;
 
 	REQUIRE(dns_db_iszone(db) || dns_db_isstub(db));
-		
+
 	result = dns_db_findnode(db, dns_db_origin(db), ISC_FALSE, &node);
 	if (result != ISC_R_SUCCESS)
 		return (result);
@@ -625,7 +625,7 @@ dns_db_getsoaserial(dns_db_t *db, dns_dbversion_t *ver, isc_uint32_t *serialp)
 				     (isc_stdtime_t)0, &rdataset, NULL);
  	if (result != ISC_R_SUCCESS)
 		goto freenode;
-	
+
 	result = dns_rdataset_first(&rdataset);
  	if (result != ISC_R_SUCCESS)
 		goto freerdataset;
@@ -641,7 +641,7 @@ dns_db_getsoaserial(dns_db_t *db, dns_dbversion_t *ver, isc_uint32_t *serialp)
 
  freerdataset:
 	dns_rdataset_disassociate(&rdataset);
-	
+
  freenode:
 	dns_db_detachnode(db, &node);
 	return (result);
diff --git a/lib/dns/dbiterator.c b/lib/dns/dbiterator.c
index c40d09b1ae..869b0a4080 100644
--- a/lib/dns/dbiterator.c
+++ b/lib/dns/dbiterator.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dbiterator.c,v 1.10 2000/07/27 09:45:59 tale Exp $ */
+/* $Id: dbiterator.c,v 1.11 2000/08/01 01:22:16 tale Exp $ */
 
 #include 
 
@@ -129,6 +129,6 @@ dns_dbiterator_origin(dns_dbiterator_t *iterator, dns_name_t *name) {
 	REQUIRE(DNS_DBITERATOR_VALID(iterator));
 	REQUIRE(iterator->relative_names);
 	REQUIRE(dns_name_hasbuffer(name));
-	
+
 	return (iterator->methods->origin(iterator, name));
 }
diff --git a/lib/dns/dbtable.c b/lib/dns/dbtable.c
index 3bdd6a3025..802e115f77 100644
--- a/lib/dns/dbtable.c
+++ b/lib/dns/dbtable.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: dbtable.c,v 1.19 2000/07/27 09:46:00 tale Exp $
+ * $Id: dbtable.c,v 1.20 2000/08/01 01:22:17 tale Exp $
  */
 
 /*
@@ -147,7 +147,7 @@ void
 dns_dbtable_attach(dns_dbtable_t *source, dns_dbtable_t **targetp) {
 	REQUIRE(VALID_DBTABLE(source));
 	REQUIRE(targetp != NULL && *targetp == NULL);
-	
+
 	LOCK(&source->lock);
 
 	INSIST(source->references > 0);
@@ -167,7 +167,7 @@ dns_dbtable_detach(dns_dbtable_t **dbtablep) {
 	REQUIRE(dbtablep != NULL);
 	dbtable = *dbtablep;
 	REQUIRE(VALID_DBTABLE(dbtable));
-	
+
 	LOCK(&dbtable->lock);
 
 	INSIST(dbtable->references > 0);
@@ -208,7 +208,7 @@ dns_dbtable_remove(dns_dbtable_t *dbtable, dns_db_t *db) {
 	dns_name_t *name;
 
 	REQUIRE(VALID_DBTABLE(dbtable));
-	
+
 	name = dns_db_origin(db);
 
 	/*
diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c
index e06abf889e..b8cc37a7ed 100644
--- a/lib/dns/dispatch.c
+++ b/lib/dns/dispatch.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dispatch.c,v 1.61 2000/07/27 09:46:01 tale Exp $ */
+/* $Id: dispatch.c,v 1.62 2000/08/01 01:22:19 tale Exp $ */
 
 #include 
 
@@ -194,7 +194,7 @@ dispatch_log(dns_dispatch_t *disp, int level, const char *fmt, ...) {
 
 	if (! isc_log_wouldlog(dns_lctx, level))
 		return;
-	
+
 	va_start(ap, fmt);
 	vsnprintf(msgbuf, sizeof(msgbuf), fmt, ap);
 	va_end(ap);
@@ -710,7 +710,7 @@ tcp_recv(isc_task_t *task, isc_event_t *ev_in) {
 
 	case ISC_R_CANCELED:
 		/*
-		 * The event is statically allocated in the tcpmsg	
+		 * The event is statically allocated in the tcpmsg
 		 * structure, and destroy_disp() frees the tcpmsg, so we must
 		 * free the event *before* calling destroy_disp().
 		 */
@@ -1088,7 +1088,7 @@ dns_dispatchmgr_destroy(dns_dispatchmgr_t **mgrp) {
 	UNLOCK(&mgr->lock);
 
 	mgr_log(mgr, LVL(90), "destroy: killit=%d", killit);
-	
+
 	if (killit)
 		destroy_mgr(&mgr);
 }
@@ -1701,7 +1701,7 @@ void
 dns_dispatch_starttcp(dns_dispatch_t *disp) {
 
 	REQUIRE(VALID_DISPATCH(disp));
-	
+
 	dispatch_log(disp, LVL(90), "starttcp %p", disp->task);
 
 	LOCK(&disp->lock);
diff --git a/lib/dns/dnssec.c b/lib/dns/dnssec.c
index 75048994c0..62b00d6dbe 100644
--- a/lib/dns/dnssec.c
+++ b/lib/dns/dnssec.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: dnssec.c,v 1.46 2000/07/31 20:53:56 tale Exp $
+ * $Id: dnssec.c,v 1.47 2000/08/01 01:22:20 tale Exp $
  * Principal Author: Brian Wellington
  */
 
@@ -238,7 +238,7 @@ dns_dnssec_sign(dns_name_t *name, dns_rdataset_t *set, dst_key_t *key,
 	isc_buffer_putuint16(&envbuf, set->type);
 	isc_buffer_putuint16(&envbuf, set->rdclass);
 	isc_buffer_putuint32(&envbuf, set->ttl);
-	
+
 	ret = rdataset_to_sortedarray(set, mctx, &rdatas, &nrdatas);
 	if (ret != ISC_R_SUCCESS)
 		goto cleanup_context;
@@ -248,7 +248,7 @@ dns_dnssec_sign(dns_name_t *name, dns_rdataset_t *set, dst_key_t *key,
 		isc_uint16_t len;
 		isc_buffer_t lenbuf;
 		isc_region_t lenr;
-		
+
 		/*
 		 * Digest the envelope.
 		 */
@@ -274,7 +274,7 @@ dns_dnssec_sign(dns_name_t *name, dns_rdataset_t *set, dst_key_t *key,
 		if (ret != ISC_R_SUCCESS)
 			goto cleanup_array;
 	}
-		
+
 	isc_buffer_init(&sigbuf, sig.signature, sig.siglen);
 	ret = dst_context_sign(ctx, &sigbuf);
 	if (ret != ISC_R_SUCCESS)
@@ -354,7 +354,7 @@ dns_dnssec_verify(dns_name_t *name, dns_rdataset_t *set, dst_key_t *key,
 	dns_rdata_toregion(sigrdata, &r);
 	r.length -= sig.siglen;
 	RUNTIME_CHECK(r.length >= 19);
-	
+
 	ret = dst_context_create(key, mctx, &ctx);
 	if (ret != ISC_R_SUCCESS)
 		goto cleanup_struct;
@@ -556,7 +556,7 @@ dns_dnssec_signmessage(dns_message_t *msg, dst_key_t *key) {
 
 	sig.siglen = 0;
 	sig.signature = NULL;
-	
+
 	isc_buffer_init(&databuf, data, sizeof(data));
 
 	RETERR(dst_context_create(key, mctx, &ctx));
diff --git a/lib/dns/gen-unix.h b/lib/dns/gen-unix.h
index 25396805c4..2ebf1a709b 100644
--- a/lib/dns/gen-unix.h
+++ b/lib/dns/gen-unix.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,14 +15,14 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: gen-unix.h,v 1.10 2000/07/27 09:46:03 tale Exp $ */
+/* $Id: gen-unix.h,v 1.11 2000/08/01 01:22:21 tale Exp $ */
 
 /*
  * This file is responsible for defining two operations that are not
  * directly portable between Unix-like systems and Windows NT, option
  * parsing and directory scanning.  It is here because it was decided
  * that the "gen" build utility was not to depend on libisc.a, so
- * the functions delcared in isc/commandline.h and isc/dir.h could not 
+ * the functions delcared in isc/commandline.h and isc/dir.h could not
  * be used.
  *
  * The commandline stuff is really just a wrapper around getopt().
diff --git a/lib/dns/gen-win32.h b/lib/dns/gen-win32.h
index 03ac1eb6c3..70978bab54 100644
--- a/lib/dns/gen-win32.h
+++ b/lib/dns/gen-win32.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -48,7 +48,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: gen-win32.h,v 1.5 2000/07/27 09:46:05 tale Exp $ */
+/* $Id: gen-win32.h,v 1.6 2000/08/01 01:22:22 tale Exp $ */
 
 /*
  * Principal Authors: Computer Systems Research Group at UC Berkeley
@@ -66,7 +66,7 @@
  * directly portable between Unix-like systems and Windows NT, option
  * parsing and directory scanning.  It is here because it was decided
  * that the "gen" build utility was not to depend on libisc.a, so
- * the functions delcared in isc/commandline.h and isc/dir.h could not 
+ * the functions delcared in isc/commandline.h and isc/dir.h could not
  * be used.
  *
  * The commandline stuff is pretty much a straight copy from the initial
@@ -247,7 +247,7 @@ start_directory(char *path, isc_dir_t *dir) {
 		*p++ = '\\';
 	*p++ = '*';
 	*p++ = '\0';
- 
+
 	dir->first_file = ISC_TRUE;
 
 	dir->handle = FindFirstFile(pattern, &dir->find_data);
diff --git a/lib/dns/gen.c b/lib/dns/gen.c
index 9cfb27a58a..d29c925b12 100644
--- a/lib/dns/gen.c
+++ b/lib/dns/gen.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: gen.c,v 1.53 2000/07/27 09:46:07 tale Exp $ */
+/* $Id: gen.c,v 1.54 2000/08/01 01:22:24 tale Exp $ */
 
 #include 
 
@@ -226,7 +226,7 @@ doswitch(const char *name, const char *function, const char *args,
 		else
 			fprintf(stdout,
 			        "\t\tcase %d:%s %s_%s_%s(%s); break;",
-				tt->rdclass, result, function, 
+				tt->rdclass, result, function,
 				funname(tt->classname, buf1),
 				funname(tt->typename, buf2), args);
 		fputs(" \\\n", stdout);
@@ -235,7 +235,7 @@ doswitch(const char *name, const char *function, const char *args,
 	if (subswitch) {
 		if (res == NULL)
 			fprintf(stdout, "\t\tdefault: break; \\\n");
-		else 
+		else
 			fprintf(stdout, "\t\tdefault: %s; break; \\\n", res);
 		fputs(/*{*/ "\t\t} \\\n", stdout);
 		fputs("\t\tbreak; \\\n", stdout);
@@ -270,7 +270,7 @@ dodecl(char *type, char *function, char *args) {
 		else
 			fprintf(stdout,
 				"static inline %s %s_%s(%s);\n",
-				type, function, 
+				type, function,
 				funname(tt->typename, buf1), args);
 }
 
@@ -380,7 +380,7 @@ add(int rdclass, const char *classname, int type, const char *typename,
 	strcpy(newcc->classname, classname);
 	cc = classes;
 	oldcc = NULL;
-	
+
 	while ((cc != NULL) && (cc->rdclass < rdclass)) {
 		oldcc = cc;
 		cc = cc->next;
@@ -771,7 +771,7 @@ main(int argc, char **argv) {
 			"((dns_rdatatype_t)dns_rdatatype_maila)\n");
 		fprintf(stdout, "#define dns_rdatatype_any\t"
 			"((dns_rdatatype_t)dns_rdatatype_any)\n");
-		
+
 		fprintf(stdout, "\n#endif /* DNS_ENUMTYPE_H */\n");
 
 	} else if (class_enum) {
diff --git a/lib/dns/include/Makefile.in b/lib/dns/include/Makefile.in
index 9ccac1506d..e6322f6e5b 100644
--- a/lib/dns/include/Makefile.in
+++ b/lib/dns/include/Makefile.in
@@ -1,9 +1,9 @@
 # Copyright (C) 1998-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
 # 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
@@ -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.9 2000/07/27 09:47:16 tale Exp $
+# $Id: Makefile.in,v 1.10 2000/08/01 01:23:34 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/dns/include/dns/Makefile.in b/lib/dns/include/dns/Makefile.in
index 5d77dd752c..e093170b9c 100644
--- a/lib/dns/include/dns/Makefile.in
+++ b/lib/dns/include/dns/Makefile.in
@@ -1,9 +1,9 @@
 # Copyright (C) 1998-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
 # 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
@@ -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.30 2000/07/27 09:47:17 tale Exp $
+# $Id: Makefile.in,v 1.31 2000/08/01 01:23:35 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -39,7 +39,7 @@ HEADERS =	a6.h acl.h aclconf.h adb.h byaddr.h cache.h callbacks.h \
 
 GENHEADERS =	enumclass.h enumtype.h rdatastruct.h
 
-SUBDIRS =	
+SUBDIRS =
 TARGETS =
 
 @BIND9_MAKE_RULES@
diff --git a/lib/dns/include/dns/a6.h b/lib/dns/include/dns/a6.h
index 247fbd70de..6fda50fb6f 100644
--- a/lib/dns/include/dns/a6.h
+++ b/lib/dns/include/dns/a6.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: a6.h,v 1.9 2000/07/27 09:47:18 tale Exp $ */
+/* $Id: a6.h,v 1.10 2000/08/01 01:23:36 tale Exp $ */
 
 #ifndef DNS_A6_H
 #define DNS_A6_H 1
diff --git a/lib/dns/include/dns/acl.h b/lib/dns/include/dns/acl.h
index 87aeffc176..861fd14a3c 100644
--- a/lib/dns/include/dns/acl.h
+++ b/lib/dns/include/dns/acl.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: acl.h,v 1.12 2000/07/27 09:47:19 tale Exp $ */
+/* $Id: acl.h,v 1.13 2000/08/01 01:23:37 tale Exp $ */
 
 #ifndef DNS_ACL_H
 #define DNS_ACL_H 1
@@ -78,7 +78,7 @@ struct dns_acl {
 
 struct dns_aclenv {
 	dns_acl_t *localhost;
-	dns_acl_t *localnets;	
+	dns_acl_t *localnets;
 };
 
 #define DNS_ACL_MAGIC		0x4461636c	/* Dacl */
@@ -132,7 +132,7 @@ dns_aclenv_init(isc_mem_t *mctx, dns_aclenv_t *env);
 
 void
 dns_aclenv_copy(dns_aclenv_t *t, dns_aclenv_t *s);
-	
+
 void
 dns_aclenv_destroy(dns_aclenv_t *env);
 
@@ -157,7 +157,7 @@ dns_acl_match(isc_netaddr_t *reqaddr,
  * whose absoluate value indicates the distance from the beginning of
  * the list.
  *
- * If there is a match (either positive or negative) and 'matchelt' is  
+ * If there is a match (either positive or negative) and 'matchelt' is
  * non-NULL, *matchelt will be attached to the primitive
  * (non-indirect) address match list element that matched.
  *
diff --git a/lib/dns/include/dns/aclconf.h b/lib/dns/include/dns/aclconf.h
index bfd3e545d8..7a50d60cad 100644
--- a/lib/dns/include/dns/aclconf.h
+++ b/lib/dns/include/dns/aclconf.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: aclconf.h,v 1.8 2000/07/27 09:47:20 tale Exp $ */
+/* $Id: aclconf.h,v 1.9 2000/08/01 01:23:38 tale Exp $ */
 
 #ifndef DNS_ACLCONF_H
 #define DNS_ACLCONF_H 1
diff --git a/lib/dns/include/dns/adb.h b/lib/dns/include/dns/adb.h
index 84976f0a8e..98ba2155cc 100644
--- a/lib/dns/include/dns/adb.h
+++ b/lib/dns/include/dns/adb.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,14 +15,14 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: adb.h,v 1.58 2000/07/27 09:47:22 tale Exp $ */
+/* $Id: adb.h,v 1.59 2000/08/01 01:23:39 tale Exp $ */
 
 #ifndef DNS_ADB_H
 #define DNS_ADB_H 1
 
-/***** 
- ***** Module Info 
- *****/ 
+/*****
+ ***** Module Info
+ *****/
 
 /*
  * DNS Address Database
@@ -58,7 +58,7 @@
  *
  * MP:
  *
- *	The ADB takes care of all necessary locking. 
+ *	The ADB takes care of all necessary locking.
  *
  *	Only the task which initiated the name lookup can cancel the lookup.
  *
diff --git a/lib/dns/include/dns/bit.h b/lib/dns/include/dns/bit.h
index c98606452f..ebeaa88c0a 100644
--- a/lib/dns/include/dns/bit.h
+++ b/lib/dns/include/dns/bit.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: bit.h,v 1.5 2000/07/27 09:47:23 tale Exp $ */
+/* $Id: bit.h,v 1.6 2000/08/01 01:23:40 tale Exp $ */
 
 #ifndef DNS_BIT_H
 #define DNS_BIT_H 1
diff --git a/lib/dns/include/dns/byaddr.h b/lib/dns/include/dns/byaddr.h
index 0d40b22e55..7bdb176828 100644
--- a/lib/dns/include/dns/byaddr.h
+++ b/lib/dns/include/dns/byaddr.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: byaddr.h,v 1.9 2000/07/27 09:47:24 tale Exp $ */
+/* $Id: byaddr.h,v 1.10 2000/08/01 01:23:41 tale Exp $ */
 
 #ifndef DNS_BYADDR_H
 #define DNS_BYADDR_H 1
diff --git a/lib/dns/include/dns/cache.h b/lib/dns/include/dns/cache.h
index a3adfdbef2..38f407441d 100644
--- a/lib/dns/include/dns/cache.h
+++ b/lib/dns/include/dns/cache.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cache.h,v 1.12 2000/07/27 09:47:25 tale Exp $ */
+/* $Id: cache.h,v 1.13 2000/08/01 01:23:43 tale Exp $ */
 
 #ifndef DNS_CACHE_H
 #define DNS_CACHE_H 1
@@ -27,7 +27,7 @@
 /*
  * cache
  *
- * Defines dns_cache_t, the cache object.  
+ * Defines dns_cache_t, the cache object.
  *
  * Notes:
  * 	A cache object contains DNS data of a single class.
@@ -61,13 +61,13 @@ ISC_LANG_BEGINDECLS
  ***	Functions
  ***/
 
-isc_result_t 
+isc_result_t
 dns_cache_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr,
 		 isc_timermgr_t *timermgr, dns_rdataclass_t rdclass,
 		 const char *db_type, unsigned int db_argc, char **db_argv,
 		 dns_cache_t **cachep);
 /*
- * Create a new DNS cache.  
+ * Create a new DNS cache.
  *
  * Requires:
  *
@@ -133,9 +133,9 @@ dns_cache_attachdb(dns_cache_t *cache, dns_db_t **dbp);
  *	This may be used to get a reference to the database for
  *	the purpose of cache lookups (XXX currently it is also
  * 	the way to add data to the cache, but having a
- * 	separate dns_cache_add() interface instead would allow 
+ * 	separate dns_cache_add() interface instead would allow
  * 	more control over memory usage).
- *	The caller should call dns_db_detach() on the reference 
+ *	The caller should call dns_db_detach() on the reference
  *	when it is no longer needed.
  *
  * Requires:
@@ -172,10 +172,10 @@ dns_cache_load(dns_cache_t *cache);
  * If no file name has been set, do nothing and return success.
  *
  * MT:
- *	Multiple simultaneous attempts to load or dump the cache 
+ *	Multiple simultaneous attempts to load or dump the cache
  * 	will be serialized with respect to one another, but
  *	the cache may be read and updated while the dump is
- *	in progress.  Updates performed during loading 
+ *	in progress.  Updates performed during loading
  *	may or may not be preserved, and reads may return
  * 	either the old or the newly loaded data.
  *
@@ -193,12 +193,12 @@ dns_cache_dump(dns_cache_t *cache);
  * do nothing and return success.
  *
  * MT:
- *	Multiple simultaneous attempts to load or dump the cache 
+ *	Multiple simultaneous attempts to load or dump the cache
  * 	will be serialized with respect to one another, but
  *	the cache may be read and updated while the dump is
  *	in progress.  Updates performed during the dump may
  * 	or may not be reflected in the dumped file.
- * 
+ *
  * Returns:
  *
  *	ISC_R_SUCCESS
@@ -217,7 +217,7 @@ void
 dns_cache_setcleaninginterval(dns_cache_t *cache, unsigned int interval);
 /*
  * Set the periodic cache cleaning interval to 'interval' seconds.
- */ 
+ */
 
 ISC_LANG_ENDDECLS
 
diff --git a/lib/dns/include/dns/callbacks.h b/lib/dns/include/dns/callbacks.h
index fe7509bdfb..f8343b69b4 100644
--- a/lib/dns/include/dns/callbacks.h
+++ b/lib/dns/include/dns/callbacks.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: callbacks.h,v 1.13 2000/07/27 09:47:26 tale Exp $ */
+/* $Id: callbacks.h,v 1.14 2000/08/01 01:23:44 tale Exp $ */
 
 #ifndef DNS_CALLBACKS_H
 #define DNS_CALLBACKS_H 1
@@ -29,7 +29,7 @@
 #include 
 
 ISC_LANG_BEGINDECLS
- 
+
 /***
  ***	Types
  ***/
@@ -65,7 +65,7 @@ dns_rdatacallbacks_init(dns_rdatacallbacks_t *callbacks);
  * Initalise 'callbacks'.
  * 	'error' and 'warn' are set to default callbacks that print the
  *	error message through the DNS library log context.
- * 
+ *
  *	All other elements are initalised to NULL.
  *
  * Requires:
diff --git a/lib/dns/include/dns/cert.h b/lib/dns/include/dns/cert.h
index 86289a2422..7731351387 100644
--- a/lib/dns/include/dns/cert.h
+++ b/lib/dns/include/dns/cert.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cert.h,v 1.10 2000/07/27 09:47:27 tale Exp $ */
+/* $Id: cert.h,v 1.11 2000/08/01 01:23:45 tale Exp $ */
 
 #ifndef DNS_CERT_H
 #define DNS_CERT_H 1
diff --git a/lib/dns/include/dns/compress.h b/lib/dns/include/dns/compress.h
index 25c082045b..a7c131e047 100644
--- a/lib/dns/include/dns/compress.h
+++ b/lib/dns/include/dns/compress.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: compress.h,v 1.17 2000/07/27 09:47:28 tale Exp $ */
+/* $Id: compress.h,v 1.18 2000/08/01 01:23:46 tale Exp $ */
 
 #ifndef DNS_COMPRESS_H
 #define DNS_COMPRESS_H 1
diff --git a/lib/dns/include/dns/confacl.h b/lib/dns/include/dns/confacl.h
index 26803cb995..23ee6a5467 100644
--- a/lib/dns/include/dns/confacl.h
+++ b/lib/dns/include/dns/confacl.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: confacl.h,v 1.13 2000/07/27 09:47:29 tale Exp $ */
+/* $Id: confacl.h,v 1.14 2000/08/01 01:23:47 tale Exp $ */
 
 #ifndef DNS_CONFACL_H
 #define DNS_CONFACL_H 1
@@ -35,7 +35,7 @@
 /*
  * MP:
  *	Caller must do necessary locking.
- *      
+ *
  * Reliability:
  *
  *	No known problems.
@@ -51,7 +51,7 @@
  * Standards:
  *
  *	N/A.
- *      
+ *
  */
 
 /***
@@ -84,7 +84,7 @@ struct dns_c_acl {
 	isc_uint32_t		magic;
 
 	dns_c_acltable_t       *mytable;
-	
+
 	char		       *name;
 	dns_c_ipmatchlist_t    *ipml;
 	isc_boolean_t		is_special;
@@ -94,9 +94,9 @@ struct dns_c_acl {
 
 struct dns_c_acl_table {
 	isc_uint32_t		magic;
-	
+
 	isc_mem_t	       *mem;
-	
+
 	ISC_LIST(dns_c_acl_t)	acl_list;
 };
 
@@ -116,11 +116,11 @@ dns_c_acltable_new(isc_mem_t *mem, dns_c_acltable_t **newtable);
  *	mem is a valid memory pool
  *	newtable is a valid non-NULL pointer.
  *	mem remain a valuid memory pool until the table is destroyed.
- * 	
+ *
  * Returns:
  *	ISC_R_SUCCESS		-- all is well.
  *	ISC_R_NOMEMORY		-- not enough memory.
- * 
+ *
  */
 
 
@@ -133,10 +133,10 @@ dns_c_acltable_delete(dns_c_acltable_t **table);
  * Requires:
  *	table is a valid pointer.
  *	The memory pool used at creation time still be valid.
- * 
+ *
  * Returns:
  *	ISC_R_SUCCESS
- * 
+ *
  */
 
 
@@ -149,11 +149,11 @@ dns_c_acltable_getacl(dns_c_acltable_t *table, const char *aclname,
  *
  * Requires:
  *	TABLE be a value ACL table.
- * 	
+ *
  * Returns:
  *	ISC_R_SUCCESS		-- all is well
  *	ISC_R_NOTFOUND		-- acl was not found
- * 
+ *
  */
 
 isc_result_t
@@ -164,11 +164,11 @@ dns_c_acltable_removeacl(dns_c_acltable_t *table, const char *aclname);
  * Requires:
  *	table be a valid pointer to an acl table
  *	aclname be a valid pointer to string of positive length.
- * 
+ *
  * Returns:
  *	ISC_R_SUCCESS		-- all is well
  *	ISC_R_NOTFOUND		-- acl was not in the table.
- * 
+ *
  */
 
 void
@@ -182,7 +182,7 @@ dns_c_acltable_print(FILE *fp, int indent, dns_c_acltable_t *table);
  *	fp be a valid stdio stream
  *	indent be a non-negative number
  *	table be a valid acl table.
- * 	
+ *
  */
 
 isc_result_t
@@ -192,17 +192,17 @@ dns_c_acltable_clear(dns_c_acltable_t *table);
  *
  * Requires:
  *	table must point to a valid ACL table.
- * 
+ *
  * Returns:
  *	ISC_R_SUCCESS
- * 
+ *
  */
 
 isc_result_t
 dns_c_acl_new(dns_c_acltable_t *table, const char *aclname,
 	      isc_boolean_t isspecial, dns_c_acl_t **newacl);
 /*
- * Creates a new ACL. The acl is placed in the given table. If isspecial is 
+ * Creates a new ACL. The acl is placed in the given table. If isspecial is
  * true then the acl is not printed by dns_c_acl_print. The new acl is
  * returned via the newacl parameter
  *
@@ -210,25 +210,25 @@ dns_c_acl_new(dns_c_acltable_t *table, const char *aclname,
  *	table be a pointer to a valid acl table.
  *	aclname be a pointer to a valid string of positive length
  *	newacl be a valid non-NULL pointer.
- * 
+ *
  * Returns:
  *	ISC_R_SUCCESS		-- all is well
  *	ISC_R_NOMEMORY		-- out of memory
- * 
+ *
  */
 
 
 void
 dns_c_acl_print(FILE *fp, int indent, dns_c_acl_t *acl);
 /*
- * Prints out the acl to the stdio stream. The outupt is indented by INDENT 
+ * Prints out the acl to the stdio stream. The outupt is indented by INDENT
  * tabs.
  *
  * Requires:
  *	fp be a pointer to a valid stdio stream
  *	indent be non-negative,
  *	acl be a pointer to a valid acl.
- * 
+ *
  */
 
 isc_result_t
@@ -236,21 +236,21 @@ dns_c_acl_setipml(dns_c_acl_t *acl, dns_c_ipmatchlist_t *ipml,
 		  isc_boolean_t deepcopy);
 /*
  * Sets the ipmatch list of the ACL to the IPML. If DEEPCOPY is true, then
- * a full copy of IPML is made using the MEM memory pool. In which case the 
- * caller still is the owner the memory IPML points to. If DEEPCOPY is 
- * false, then the acl takes ownership of the memory IPML points to. If the 
+ * a full copy of IPML is made using the MEM memory pool. In which case the
+ * caller still is the owner the memory IPML points to. If DEEPCOPY is
+ * false, then the acl takes ownership of the memory IPML points to. If the
  * acl already has an ipmatch list, then it is deleted before the new one
  * is added.
  *
  * Requires:
  *	mem be a pointer to a valid memory manager
  *	ipml be a valid dns_c_ipmatchlist_t
- * 
+ *
  * Returns:
  *	ISC_R_SUCCESS		-- all is well
  *	ISC_R_NOMEMORY		-- memory could not be allocated for the
  *				   deepcopy  .
- * 
+ *
  */
 
 isc_result_t
@@ -267,12 +267,12 @@ dns_c_acl_getipmlexpanded(isc_mem_t *mem, dns_c_acl_t *acl,
  *	mem be a pointer to a valid memory manager
  *	acl be a pointer to a valid acl.
  *	retval be a valid non-NULL pointer.
- * 
+ *
  * Returns:
  *	ISC_R_SUCCESS		-- all is well
  *	ISC_R_NOMEMORY		-- not enough memory to make copy.
  *	ISC_R_FAILURE		-- an acl reference couldn't be expanded.
- * 
+ *
  */
 
 isc_result_t
diff --git a/lib/dns/include/dns/confcache.h b/lib/dns/include/dns/confcache.h
index 46d76dee40..3453b262ec 100644
--- a/lib/dns/include/dns/confcache.h
+++ b/lib/dns/include/dns/confcache.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: confcache.h,v 1.9 2000/07/27 09:47:30 tale Exp $ */
+/* $Id: confcache.h,v 1.10 2000/08/01 01:23:48 tale Exp $ */
 
 #ifndef DNS_CONFCACHE_H
 #define DNS_CONFCACHE_H 1
@@ -33,7 +33,7 @@
  *
  * MP:
  *	Client must do necessary locking.
- *      
+ *
  * Reliability:
  *
  *	No problems.
@@ -45,7 +45,7 @@
  * Security:
  *
  *	N/A
- *      
+ *
  */
 
 /***
@@ -83,11 +83,11 @@ dns_c_cache_new(isc_mem_t *mem, dns_c_cache_t **cfgres);
  * Requires:
  *	mem be a pointer to a valid memory manager.
  *	newres be a valid non-NULL pointer.
- * 
+ *
  * Returns:
  *	ISC_R_SUCCESS		-- all is well
  *	ISC_R_NOMEMORY		-- out of memory
- * 
+ *
  */
 
 isc_result_t
@@ -98,10 +98,10 @@ dns_c_cache_delete(dns_c_cache_t **cfgres);
  * Requires:
  *	cfgres be a valid non-NULL pointer. The pointer it points to
  *	can be NULL or must be a valid dns_c_cache_t object.
- * 
+ *
  * Returns:
  *	ISC_R_SUCCESS		-- all is well
- * 
+ *
  */
 
 ISC_LANG_ENDDECLS
diff --git a/lib/dns/include/dns/confcommon.h b/lib/dns/include/dns/confcommon.h
index ba358f14c7..62aa9f7900 100644
--- a/lib/dns/include/dns/confcommon.h
+++ b/lib/dns/include/dns/confcommon.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: confcommon.h,v 1.28 2000/07/27 09:47:31 tale Exp $ */
+/* $Id: confcommon.h,v 1.29 2000/08/01 01:23:49 tale Exp $ */
 
 #ifndef DNS_CONFCOMMON_H
 #define DNS_CONFCOMMON_H 1
@@ -73,7 +73,7 @@
 #define DNS_C_STDERR_PATH "  "	/* not really a path */
 
 /*
- * The value we use in config files if the user doesn't specify the port or 
+ * The value we use in config files if the user doesn't specify the port or
  * in some statements.
  */
 #define DNS_C_DEFAULTPORT	53	/* XXX this should be imported */
@@ -94,7 +94,7 @@
 #define DNS_C_UNLIM_VERSIONS	DNS_C_SIZE_SPEC_UNLIM
 
 /*
- * The default ordering given to rrset-order statements when the type given 
+ * The default ordering given to rrset-order statements when the type given
  * is illegal (so parsing can continue).
  */
 #define DNS_DEFAULT_ORDERING 	dns_c_ordering_fixed
@@ -145,7 +145,7 @@ typedef enum {
 } dns_c_zonetype_t;
 
 
-/* Possible address-match-element types */ 
+/* Possible address-match-element types */
 typedef enum {
 	dns_c_ipmatch_pattern,
 	dns_c_ipmatch_indirect,
@@ -205,7 +205,7 @@ typedef struct dns_c_zone_list		dns_c_zonelist_t;
  * Set this variable to a true value to get output by the wrapper
  * functions (if the memory debugging hack is compiled in--it isn't by
  * default
- */ 
+ */
 
 extern isc_boolean_t debug_mem_print;
 extern FILE *debug_mem_print_stream;	/* NULL means stderr */
@@ -216,12 +216,12 @@ extern FILE *debug_mem_print_stream;	/* NULL means stderr */
 
 ISC_LANG_BEGINDECLS
 
-/* The following dns_c_xxx2string() functions convert the first argument into 
+/* The following dns_c_xxx2string() functions convert the first argument into
  * a string value and returns that value. If the first argument is not a
- * legal value, then NULL is returned, unless PRINTABLE is true, in which 
+ * legal value, then NULL is returned, unless PRINTABLE is true, in which
  * case an ugly, but safe-to-pass-to-printf string is returned.
  *
- * e.g. dns_c_ordering2string(dns_c_ordering_cyclic,ISC_FALSE) returns the 
+ * e.g. dns_c_ordering2string(dns_c_ordering_cyclic,ISC_FALSE) returns the
  * string "cyclic", but
  * dns_c_ordering2string((dns_c_ordering_t)0xffff,ISC_TRUE) returns the
  * value "UNKNOWN_ORDERING"
@@ -252,7 +252,7 @@ dns_c_addata2string(dns_c_addata_t addata, isc_boolean_t printable);
 
 /*
  * The following dns_c_string2xxx() functions will look up the string
- * argument in a table of values and will return the appropriate enum/integer 
+ * argument in a table of values and will return the appropriate enum/integer
  * through the second argument and ISC_R_SUCCESS is returned. If the string
  * doesn't match a valid value then ISC_R_FAILURE is returned.
  */
@@ -275,7 +275,7 @@ isc_boolean_t
 dns_c_need_quote(const char *string);
 
 void
-dns_c_printtabs(FILE *fp, int count); 
+dns_c_printtabs(FILE *fp, int count);
 
 void
 dns_c_printinunits(FILE *fp, isc_uint32_t val);
diff --git a/lib/dns/include/dns/confctl.h b/lib/dns/include/dns/confctl.h
index 61b8e46e46..571defc08a 100644
--- a/lib/dns/include/dns/confctl.h
+++ b/lib/dns/include/dns/confctl.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: confctl.h,v 1.20 2000/07/27 09:47:32 tale Exp $ */
+/* $Id: confctl.h,v 1.21 2000/08/01 01:23:50 tale Exp $ */
 
 #ifndef DNS_CONFCTL_H
 #define DNS_CONFCTL_H 1
@@ -29,7 +29,7 @@
  */
 
 /*
- * 
+ *
  * MP:
  *
  *	Caller must do necessary locking.
@@ -49,7 +49,7 @@
  * Standards:
  *
  *	N/A.
- *      
+ *
  */
 
 
@@ -96,7 +96,7 @@ struct dns_c_ctrl {
 		} unix_v; /* when control_type == dns_c_unix_control  */
 	} u;
 	dns_c_kidlist_t *keyidlist;
-	
+
 	ISC_LINK(dns_c_ctrl_t) next;
 };
 
@@ -146,7 +146,7 @@ dns_c_ctrlunix_new(isc_mem_t *mem, dns_c_ctrl_t **control, const char *path,
  * Returns:
  *	ISC_R_SUCCESS		-- all is well
  *	ISC_R_NOMEMORY		-- insufficient memory available
- *	
+ *
  */
 
 isc_result_t
diff --git a/lib/dns/include/dns/confctx.h b/lib/dns/include/dns/confctx.h
index 6253af01cf..a35b51ba73 100644
--- a/lib/dns/include/dns/confctx.h
+++ b/lib/dns/include/dns/confctx.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: confctx.h,v 1.47 2000/07/31 21:07:04 explorer Exp $ */
+/* $Id: confctx.h,v 1.48 2000/08/01 01:23:52 tale Exp $ */
 
 #ifndef DNS_CONFCTX_H
 #define DNS_CONFCTX_H 1
@@ -25,26 +25,26 @@
  *****/
 
 /*
- * Defines the structures and accessor/modifier functions for the top level 
+ * Defines the structures and accessor/modifier functions for the top level
  * structures created by the config file parsing routines.
  */
 
 /*
  *
  * MP:
- *	
+ *
  *
  * Reliability:
- *	
+ *
  *
  * Resources:
- *	
+ *
  *
  * Security:
- *	
+ *
  *
  * Standards:
- *	
+ *
  */
 
 /***
@@ -85,7 +85,7 @@ struct dns_c_ctx {
 
 	int			warnings; /* semantic warning count */
 	int			errors;	/* semantic error count */
-	
+
 	dns_c_options_t	       *options;
 	dns_c_cache_t	       *cache;
 	dns_c_resolv_t	       *resolver;
@@ -109,7 +109,7 @@ struct dns_c_ctx {
 struct dns_c_options {
 	isc_uint32_t		magic;
 	isc_mem_t	       *mem;
-	
+
 	char		       *directory;
 	char		       *version;
 	char		       *dump_filename;
@@ -122,9 +122,9 @@ struct dns_c_options {
 
 	in_port_t 	       *port;
 
-	isc_uint32_t	       *transfers_in; 
+	isc_uint32_t	       *transfers_in;
 	isc_uint32_t	       *transfers_per_ns;
-	isc_uint32_t	       *transfers_out; 
+	isc_uint32_t	       *transfers_out;
 	isc_uint32_t	       *max_log_size_ixfr;
 	isc_uint32_t	       *clean_interval;
 	isc_uint32_t	       *interface_interval;
@@ -141,7 +141,7 @@ struct dns_c_options {
 	isc_uint32_t	       *min_roots;
 	isc_uint32_t	       *serial_queries;
 	isc_uint32_t	       *sig_valid_interval;
-	
+
 	isc_uint32_t	       *data_size;
 	isc_uint32_t	       *stack_size;
 	isc_uint32_t	       *core_size;
@@ -169,20 +169,20 @@ struct dns_c_options {
 	isc_boolean_t	       *treat_cr_as_space;
 	isc_boolean_t	       *additional_from_cache;
 	isc_boolean_t	       *additional_from_auth;
-	
+
 	isc_sockaddr_t	       *transfer_source;
 	isc_sockaddr_t	       *transfer_source_v6;
 	isc_sockaddr_t	       *query_source;
 	isc_sockaddr_t	       *query_source_v6;
 
 	dns_c_addata_t	       *additional_data;
-	
+
 	dns_c_forw_t	       *forward;
 
 	char 		       *tkeydhkeycp;
 	isc_uint32_t		tkeydhkeyi;
 	char 		       *tkeydomain;
-	
+
 	dns_notifytype_t       *notify;
 	dns_c_iplist_t	       *also_notify;
 
@@ -200,7 +200,7 @@ struct dns_c_options {
 
 	dns_c_lstnlist_t       *listens;
 	dns_c_lstnlist_t       *v6listens;
-	
+
 	dns_c_rrsolist_t       *ordering;
 
 	dns_c_iplist_t	       *forwarders;
diff --git a/lib/dns/include/dns/confip.h b/lib/dns/include/dns/confip.h
index ec53e17c8e..1559b26ec5 100644
--- a/lib/dns/include/dns/confip.h
+++ b/lib/dns/include/dns/confip.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: confip.h,v 1.26 2000/07/27 09:47:35 tale Exp $ */
+/* $Id: confip.h,v 1.27 2000/08/01 01:23:53 tale Exp $ */
 
 #ifndef DNS_CONFIP_H
 #define DNS_CONFIP_H 1
@@ -91,7 +91,7 @@ typedef struct dns_c_ipmatch_list	dns_c_ipmatchlist_t;
  */
 struct dns_c_iplist {
 	isc_uint32_t		magic;
-	
+
 	isc_mem_t	       *mem;
 	int			refcount;
 	isc_sockaddr_t	       *ips;
@@ -104,7 +104,7 @@ struct dns_c_iplist {
 
 struct dns_c_ipmatch_direct {
 	isc_uint32_t	magic;
-	
+
 	isc_sockaddr_t	address;
 	isc_uint32_t	mask;
 };
@@ -113,14 +113,14 @@ struct dns_c_ipmatch_direct {
 
 struct dns_c_ipmatch_indirect {
 	isc_uint32_t	magic;
-	
+
 	isc_textregion_t refname;	/* For acls, mostly. */
 	dns_c_ipmatchlist_t *list;
 };
 
 struct dns_c_ipmatch_element {
 	isc_uint32_t	magic;
-	
+
 	dns_c_ipmatch_type_t type;
 	u_int flags;
 	union {
@@ -136,7 +136,7 @@ struct dns_c_ipmatch_element {
 
 struct dns_c_ipmatch_list {
 	isc_uint32_t	magic;
-	
+
 	isc_mem_t *mem;
 	int refcount;
 
@@ -182,13 +182,13 @@ isc_result_t dns_c_ipmatchkey_new(isc_mem_t *mem,
 				  const char *key);
 
 isc_result_t dns_c_ipmatchany_new(isc_mem_t *mem,
-				  dns_c_ipmatchelement_t **result); 
+				  dns_c_ipmatchelement_t **result);
 
 isc_result_t dns_c_ipmatchlocalhost_new(isc_mem_t *mem,
-					dns_c_ipmatchelement_t **result); 
+					dns_c_ipmatchelement_t **result);
 
 isc_result_t dns_c_ipmatchlocalnets_new(isc_mem_t *mem,
-					dns_c_ipmatchelement_t **result); 
+					dns_c_ipmatchelement_t **result);
 
 isc_result_t dns_c_ipmatchpattern_new(isc_mem_t *mem,
 				      dns_c_ipmatchelement_t **result,
@@ -263,7 +263,7 @@ isc_boolean_t dns_c_ipmatchlist_equal(dns_c_ipmatchlist_t *l1,
 typedef isc_boolean_t (*dns_c_ipmlwalker)(dns_c_ipmatchelement_t *element);
 
 /*
- * Recursively decends the list and returns the boolean AND of the return 
+ * Recursively decends the list and returns the boolean AND of the return
  * values of func.
  */
 isc_boolean_t
diff --git a/lib/dns/include/dns/confkeys.h b/lib/dns/include/dns/confkeys.h
index d4cf2d238b..90b826b0f2 100644
--- a/lib/dns/include/dns/confkeys.h
+++ b/lib/dns/include/dns/confkeys.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: confkeys.h,v 1.19 2000/07/27 09:47:36 tale Exp $ */
+/* $Id: confkeys.h,v 1.20 2000/08/01 01:23:54 tale Exp $ */
 
 #ifndef DNS_CONFKEYS_H
 #define DNS_CONFKEYS_H 1
@@ -29,7 +29,7 @@
  */
 
 /*
- * 
+ *
  * MP:
  *
  *	Caller must to all necessary locking.
@@ -43,11 +43,11 @@
  *	Memory allocators supplied by caller
  *
  * Security:
- *	
+ *
  *	Not applicable.
  *
  * Standards:
- *	
+ *
  *	Not applicable.
  */
 
@@ -99,7 +99,7 @@ typedef struct dns_c_kid_list		dns_c_kidlist_t;
 struct dns_c_tkey {
 	isc_uint32_t		magic;
 	isc_mem_t	       *mem;
-	
+
 	char		       *domain;
 	dns_c_pubkey_t	       *pubkey;
 
@@ -115,8 +115,8 @@ struct dns_c_tkey_list {
 
 	ISC_LIST(dns_c_tkey_t)	tkeylist;
 };
-	
-	
+
+
 /*
  * A public key value.
  */
@@ -234,7 +234,7 @@ isc_result_t dns_c_kidlist_delete(dns_c_kidlist_t **list);
 
 isc_uint32_t dns_c_kidlist_keycount(dns_c_kidlist_t *list);
 
-			   
+
 isc_result_t dns_c_kidlist_undef(dns_c_kidlist_t *list, const char *keyid);
 
 isc_result_t dns_c_kidlist_find(dns_c_kidlist_t *list, const char *keyid,
@@ -257,7 +257,7 @@ isc_result_t dns_c_kdeflist_copy(isc_mem_t *mem, dns_c_kdeflist_t **dest,
 isc_result_t dns_c_kdeflist_append(dns_c_kdeflist_t *list, dns_c_kdef_t *key,
 				   isc_boolean_t copy);
 
-isc_result_t dns_c_kdeflist_undef(dns_c_kdeflist_t *list, const char *keyid); 
+isc_result_t dns_c_kdeflist_undef(dns_c_kdeflist_t *list, const char *keyid);
 
 isc_result_t dns_c_kdeflist_find(dns_c_kdeflist_t *list, const char *keyid,
 				 dns_c_kdef_t **retval);
diff --git a/lib/dns/include/dns/conflog.h b/lib/dns/include/dns/conflog.h
index d85f779eb0..b53c4afbf4 100644
--- a/lib/dns/include/dns/conflog.h
+++ b/lib/dns/include/dns/conflog.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: conflog.h,v 1.14 2000/07/27 09:47:37 tale Exp $ */
+/* $Id: conflog.h,v 1.15 2000/08/01 01:23:55 tale Exp $ */
 
 #ifndef DNS_CONFLOG_H
 #define DNS_CONFLOG_H 1
@@ -33,7 +33,7 @@
  * MP:
  *
  *	Caller must do appropriate locking
- *	
+ *
  * Reliability:
  *
  *	No impact.
@@ -41,7 +41,7 @@
  * Resources:
  *
  *	Caller supplies memory allocators
- *	
+ *
  * Security:
  *
  *	No impact.
@@ -49,7 +49,7 @@
  * Standards:
  *
  *	N/A
- *	
+ *
  */
 
 /***
@@ -85,7 +85,7 @@ typedef struct dns_c_logging_list	dns_c_logginglist_t;
 struct dns_c_logging_list {
 	isc_uint32_t			magic;
 	isc_mem_t		       *mem;
-	
+
 	ISC_LIST(dns_c_logchan_t)	channels;
 	ISC_LIST(dns_c_logcat_t)	categories;
 };
@@ -99,7 +99,7 @@ struct dns_c_logchan
 
 	char			       *name;
 
-	dns_c_logchantype_t		ctype; 
+	dns_c_logchantype_t		ctype;
 	union {
 		struct
 		{			/* when ctype == dns_c_logchan_file */
@@ -124,8 +124,8 @@ struct dns_c_logchan
 	 * Some channels are predefined e.g. default_syslog, in which case
 	 * this is true.
 	 */
-	isc_boolean_t			predefined; 
-	
+	isc_boolean_t			predefined;
+
 	ISC_LINK(dns_c_logchan_t)	next;
 	dns_c_setbits_t			setflags;
 };
@@ -140,12 +140,12 @@ struct dns_c_logcat {
 	char			       *catname;
 
 	char			      **channel_names;
-	size_t				cnames_len; /* size, in elements of 
+	size_t				cnames_len; /* size, in elements of
 						     channel_names */
 	size_t				nextcname; /* index in
-						      channel_names of next 
+						      channel_names of next
 						      free spot. */
-	
+
 	isc_boolean_t			predefined;
 
 	ISC_LINK(dns_c_logcat_t)	next;
diff --git a/lib/dns/include/dns/conflsn.h b/lib/dns/include/dns/conflsn.h
index 48d9a63348..f34a58d0c7 100644
--- a/lib/dns/include/dns/conflsn.h
+++ b/lib/dns/include/dns/conflsn.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: conflsn.h,v 1.16 2000/07/27 09:47:38 tale Exp $ */
+/* $Id: conflsn.h,v 1.17 2000/08/01 01:23:56 tale Exp $ */
 
 #ifndef DNS_CONFLSN_H
 #define DNS_CONFLSN_H 1
@@ -28,7 +28,7 @@
  * Data structures to hold information related to ``listen-on'' statements
  * in the named.conf file.
  */
- 
+
 /*
  *
  * MP:
@@ -50,7 +50,7 @@
  * Standards:
  *
  *	N/A
- *	
+ *
  */
 
 /***
@@ -81,7 +81,7 @@ typedef struct dns_c_lstn_list		dns_c_lstnlist_t;
 struct dns_c_lstn_on {
 	isc_uint32_t			magic;
 	isc_mem_t		       *mem;
-	
+
 	in_port_t			port;
 	dns_c_ipmatchlist_t	       *iml;
 
@@ -127,7 +127,7 @@ dns_c_lstnlist_delete(dns_c_lstnlist_t **llist);
  * Sets *LLIST to NULL when done.
  *
  * Requires:
- * 
+ *
  * Returns:
  *
  *	ISC_R_SUCCESS on success.
diff --git a/lib/dns/include/dns/confndc.h b/lib/dns/include/dns/confndc.h
index 9dc7df7257..b712a6ef4a 100644
--- a/lib/dns/include/dns/confndc.h
+++ b/lib/dns/include/dns/confndc.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: confndc.h,v 1.10 2000/07/27 09:47:40 tale Exp $ */
+/* $Id: confndc.h,v 1.11 2000/08/01 01:23:57 tale Exp $ */
 
 #ifndef DNS_CONFNDC_H
 #define DNS_CONFNDC_H 1
@@ -47,7 +47,7 @@ typedef struct dns_c_ndckey		dnc_c_ndckey_t;
 struct  dns_c_ndcctx {
 	isc_uint32_t		magic;
 	isc_mem_t	       *mem;
-	
+
 	dns_c_ndcopts_t	       *opts;
 	dns_c_ndcserverlist_t  *servers;
 	dns_c_kdeflist_t       *keys;
@@ -67,7 +67,7 @@ struct dns_c_ndcserverlist {
 
 	ISC_LIST(dns_c_ndcserver_t)	list;
 };
-	
+
 struct dns_c_ndcserver {
 	isc_uint32_t			magic;
 	isc_mem_t		       *mem;
diff --git a/lib/dns/include/dns/confparser.h b/lib/dns/include/dns/confparser.h
index 3076e13ef3..e3f8b46cde 100644
--- a/lib/dns/include/dns/confparser.h
+++ b/lib/dns/include/dns/confparser.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: confparser.h,v 1.11 2000/07/27 09:47:41 tale Exp $ */
+/* $Id: confparser.h,v 1.12 2000/08/01 01:23:58 tale Exp $ */
 
 #ifndef DNS_CONFPARSER_H
 #define DNS_CONFPARSER_H 1
@@ -42,7 +42,7 @@
  *
  * Resources:
  * 	Long-term memory allocation done with memory allocator supplied by
- * 	caller. 
+ * 	caller.
  *
  * Security:
  * 	
@@ -62,11 +62,11 @@
 #include 
 
 /*
- * Typedefs for the callbacks done while parsing. If the callback functions 
+ * Typedefs for the callbacks done while parsing. If the callback functions
  * return anything other than ISC_R_SUCCESS, then the parse routine
  * terminates with an error.
  */
- 
+
 typedef isc_result_t (*dns_c_zonecbk_t)(dns_c_ctx_t *ctx,
 					dns_c_zone_t *zone,
 					dns_c_view_t *view,
diff --git a/lib/dns/include/dns/confresolv.h b/lib/dns/include/dns/confresolv.h
index 224508ff07..42dc5a96c9 100644
--- a/lib/dns/include/dns/confresolv.h
+++ b/lib/dns/include/dns/confresolv.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: confresolv.h,v 1.9 2000/07/27 09:47:42 tale Exp $ */
+/* $Id: confresolv.h,v 1.10 2000/08/01 01:24:00 tale Exp $ */
 
 #ifndef DNS_CONFRESOLV_H
 #define DNS_CONFRESOLV_H 1
@@ -33,7 +33,7 @@
  *
  * MP:
  *	Client must do necessary locking.
- *      
+ *
  * Reliability:
  *
  *	No problems.
@@ -45,7 +45,7 @@
  * Security:
  *
  *	N/A
- *      
+ *
  */
 
 /***
@@ -81,11 +81,11 @@ dns_c_resolv_new(isc_mem_t *mem, dns_c_resolv_t **cfgres);
  * Requires:
  *	mem be a pointer to a valid memory manager.
  *	newres be a valid non-NULL pointer.
- * 
+ *
  * Returns:
  *	ISC_R_SUCCESS		-- all is well
  *	ISC_R_NOMEMORY		-- out of memory
- * 
+ *
  */
 
 isc_result_t
@@ -96,10 +96,10 @@ dns_c_resolv_delete(dns_c_resolv_t **cfgres);
  * Requires:
  *	cfgres be a valid non-NULL pointer. The pointer it points to
  *	can be NULL or must be a valid dns_c_resolv_t object.
- * 
+ *
  * Returns:
  *	ISC_R_SUCCESS		-- all is well
- * 
+ *
  */
 
 ISC_LANG_ENDDECLS
diff --git a/lib/dns/include/dns/confrrset.h b/lib/dns/include/dns/confrrset.h
index 0531a18a24..a632a75bb5 100644
--- a/lib/dns/include/dns/confrrset.h
+++ b/lib/dns/include/dns/confrrset.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: confrrset.h,v 1.13 2000/07/27 09:47:43 tale Exp $ */
+/* $Id: confrrset.h,v 1.14 2000/08/01 01:24:01 tale Exp $ */
 
 #ifndef DNS_CONFRRSET_H
 #define DNS_CONFRRSET_H 1
@@ -25,21 +25,21 @@
  *****/
 
 /*
- * 
+ *
  * MP:
- *	
+ *
  *
  * Reliability:
- *	
+ *
  *
  * Resources:
- *	
+ *
  *
  * Security:
- *	
+ *
  *
  * Standards:
- *	
+ *
  */
 
 /***
@@ -68,9 +68,9 @@ typedef struct dns_c_rrso_list		dns_c_rrsolist_t;
 
 struct dns_c_rrso {
 	isc_uint32_t		magic;
-	
+
 	isc_mem_t	       *mem;
-	
+
 	dns_rdataclass_t	oclass;
 	dns_rdatatype_t		otype;
 	char		       *name;
diff --git a/lib/dns/include/dns/confview.h b/lib/dns/include/dns/confview.h
index 8ee6010755..006900d504 100644
--- a/lib/dns/include/dns/confview.h
+++ b/lib/dns/include/dns/confview.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: confview.h,v 1.35 2000/07/31 21:07:06 explorer Exp $ */
+/* $Id: confview.h,v 1.36 2000/08/01 01:24:02 tale Exp $ */
 
 #ifndef DNS_CONFVIEW_H
 #define DNS_CONFVIEW_H 1
@@ -25,7 +25,7 @@
  *****/
 
 /*
- * Zones as seen by the config file parser. The data structures here define 
+ * Zones as seen by the config file parser. The data structures here define
  * the zone data as it is in the config file. The data structures here do
  * *not* define the things like red-black trees for named's internal data
  * structures.
@@ -36,7 +36,7 @@
  *
  * MP:
  *      Client must do necessary locking.
- *      
+ *
  * Reliability:
  *
  *      No problems.
@@ -48,7 +48,7 @@
  * Security:
  *
  *      N/A
- *      
+ *
  */
 
 /***
@@ -81,7 +81,7 @@ typedef struct dns_c_viewtable          dns_c_viewtable_t;
 
 struct dns_c_viewtable {
         isc_uint32_t            magic;
-        
+
         isc_mem_t              *mem;
 
         ISC_LIST(dns_c_view_t)  views;
@@ -90,11 +90,11 @@ struct dns_c_viewtable {
 struct dns_c_view {
         isc_uint32_t            magic;
         isc_mem_t              *mem;
-        
+
         char                   *name;
 
         dns_rdataclass_t        viewclass;
-        
+
         dns_c_zonelist_t       *zonelist;
 
         dns_c_forw_t           *forward;
@@ -111,9 +111,9 @@ struct dns_c_view {
         dns_c_ipmatchlist_t    *matchclients;
 
         dns_c_rrsolist_t       *ordering; /* XXX not parsed yet */
-        
+
         dns_severity_t         *check_names[DNS_C_TRANSCOUNT];
-        
+
         /*
          * XXX to implement now.
          */
@@ -150,7 +150,7 @@ struct dns_c_view {
 
         dns_c_tkeylist_t       *trusted_keys;
 
-#if 0   
+#if 0
         /*
          * To implement later.
          */
diff --git a/lib/dns/include/dns/confzone.h b/lib/dns/include/dns/confzone.h
index 5e8da632bc..56f3032af9 100644
--- a/lib/dns/include/dns/confzone.h
+++ b/lib/dns/include/dns/confzone.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: confzone.h,v 1.38 2000/07/27 09:47:45 tale Exp $ */
+/* $Id: confzone.h,v 1.39 2000/08/01 01:24:03 tale Exp $ */
 
 #ifndef DNS_CONFZONE_H
 #define DNS_CONFZONE_H 1
@@ -25,7 +25,7 @@
  *****/
 
 /*
- * Zones as seen by the config file parser. The data structures here define 
+ * Zones as seen by the config file parser. The data structures here define
  * the zone data as it is in the config file. The data structures here do
  * *not* define the things like red-black trees for named's internal data
  * structures.
@@ -36,7 +36,7 @@
  *
  * MP:
  *	Client must do necessary locking.
- *	
+ *
  * Reliability:
  *
  *	No problems.
@@ -48,7 +48,7 @@
  * Security:
  *
  *	N/A
- *	
+ *
  */
 
 /***
@@ -162,8 +162,8 @@ struct dns_c_stub_zone {
 	dns_c_pklist_t	       *pubkeylist;
 	in_port_t		master_port;
 	dns_c_iplist_t	       *master_ips;
-	isc_sockaddr_t		transfer_source; 
-	isc_sockaddr_t		transfer_source_v6; 
+	isc_sockaddr_t		transfer_source;
+	isc_sockaddr_t		transfer_source_v6;
 	isc_uint32_t		max_trans_time_in;
 	isc_uint32_t		max_trans_idle_in;
 
@@ -191,19 +191,19 @@ struct dns_c_hint_zone {
 
 struct dns_c_zone {
 	isc_int32_t			magic;
-	
+
 	isc_mem_t		       *mem;
 	isc_uint8_t			refcount;
-	
+
 	char			       *name; /* e.g. "foo.com" */
 	char			       *internalname; /* e.g. "foo.com.ext" */
 	char			       *database;
-	dns_rdataclass_t		zclass; 
+	dns_rdataclass_t		zclass;
 	dns_c_view_t		       *view;
 	isc_boolean_t		       *enabled;
-	
+
 	dns_c_zonetype_t		ztype;
-	union 
+	union
 	{
 		dns_c_masterzone_t	mzone;
 		dns_c_slavezone_t	szone;
diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h
index 83fcc5c36e..ec46793e42 100644
--- a/lib/dns/include/dns/db.h
+++ b/lib/dns/include/dns/db.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: db.h,v 1.52 2000/07/27 09:47:46 tale Exp $ */
+/* $Id: db.h,v 1.53 2000/08/01 01:24:04 tale Exp $ */
 
 #ifndef DNS_DB_H
 #define DNS_DB_H 1
@@ -75,7 +75,7 @@ typedef struct dns_dbmethods {
 	isc_result_t	(*beginload)(dns_db_t *db, dns_addrdatasetfunc_t *addp,
 				     dns_dbload_t **dbloadp);
 	isc_result_t	(*endload)(dns_db_t *db, dns_dbload_t **dbloadp);
-	isc_result_t	(*dump)(dns_db_t *db, dns_dbversion_t *version, 
+	isc_result_t	(*dump)(dns_db_t *db, dns_dbversion_t *version,
 				const char *filename);
 	void		(*currentversion)(dns_db_t *db,
 					  dns_dbversion_t **versionp);
@@ -498,7 +498,7 @@ dns_db_newversion(dns_db_t *db, dns_dbversion_t **versionp);
  * Ensures:
  *
  *	On success, '*versionp' is attached to the current version.
- * 
+ *
  * Returns:
  *
  *	ISC_R_SUCCESS
@@ -943,7 +943,7 @@ dns_db_findrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
  *
  *	ISC_R_SUCCESS
  *	ISC_R_NOTFOUND
- *	
+ *
  *	Other results are possible, depending upon the database
  *	implementation used.
  */
@@ -981,7 +981,7 @@ dns_db_allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
  *
  *	ISC_R_SUCCESS
  *	ISC_R_NOTFOUND
- *	
+ *
  *	Other results are possible, depending upon the database
  *	implementation used.
  */
@@ -1036,7 +1036,7 @@ dns_db_addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
  *	ISC_R_SUCCESS
  *	DNS_R_UNCHANGED			The operation did not change anything.
  *	ISC_R_NOMEMORY
- *	
+ *
  *	Other results are possible, depending upon the database
  *	implementation used.
  */
@@ -1052,7 +1052,7 @@ dns_db_subtractrdataset(dns_db_t *db, dns_dbnode_t *node,
  * Notes:
  *
  *	If 'newrdataset' is not NULL, then it will be attached to the
- *	resulting new rdataset in the database, unless the rdataset has 
+ *	resulting new rdataset in the database, unless the rdataset has
  *	become nonexistent.
  *
  * Requires:
@@ -1075,7 +1075,7 @@ dns_db_subtractrdataset(dns_db_t *db, dns_dbnode_t *node,
  *	DNS_R_UNCHANGED			The operation did not change anything.
  *	DNS_R_NXRRSET			All rdata of the same type as those
  *					in 'rdataset' have been deleted.
- *	
+ *
  *	Other results are possible, depending upon the database
  *	implementation used.
  */
@@ -1114,7 +1114,7 @@ dns_db_deleterdataset(dns_db_t *db, dns_dbnode_t *node,
  *	ISC_R_SUCCESS
  *	DNS_R_UNCHANGED			No rdatasets of 'type' existed before
  *					the operation was attempted.
- *	
+ *
  *	Other results are possible, depending upon the database
  *	implementation used.
  */
diff --git a/lib/dns/include/dns/dbiterator.h b/lib/dns/include/dns/dbiterator.h
index edcf040c4a..4bccb653c8 100644
--- a/lib/dns/include/dns/dbiterator.h
+++ b/lib/dns/include/dns/dbiterator.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dbiterator.h,v 1.13 2000/07/27 09:47:48 tale Exp $ */
+/* $Id: dbiterator.h,v 1.14 2000/08/01 01:24:05 tale Exp $ */
 
 #ifndef DNS_DBITERATOR_H
 #define DNS_DBITERATOR_H 1
@@ -42,7 +42,7 @@
  * MP:
  *	The iterator itself is not locked.  The caller must ensure
  *	synchronization.
- *	
+ *
  *	The iterator methods ensure appropriate database locking.
  *
  * Reliability:
diff --git a/lib/dns/include/dns/dbtable.h b/lib/dns/include/dns/dbtable.h
index e81f7ce6a5..6af2724e11 100644
--- a/lib/dns/include/dns/dbtable.h
+++ b/lib/dns/include/dns/dbtable.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dbtable.h,v 1.14 2000/07/27 09:47:49 tale Exp $ */
+/* $Id: dbtable.h,v 1.15 2000/08/01 01:24:07 tale Exp $ */
 
 #ifndef DNS_DBTABLE_H
 #define DNS_DBTABLE_H 1
diff --git a/lib/dns/include/dns/dispatch.h b/lib/dns/include/dns/dispatch.h
index 2e5df6ccb3..3068b1a563 100644
--- a/lib/dns/include/dns/dispatch.h
+++ b/lib/dns/include/dns/dispatch.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dispatch.h,v 1.34 2000/07/27 09:47:50 tale Exp $ */
+/* $Id: dispatch.h,v 1.35 2000/08/01 01:24:08 tale Exp $ */
 
 #ifndef DNS_DISPATCH_H
 #define DNS_DISPATCH_H 1
@@ -278,7 +278,7 @@ dns_dispatch_detach(dns_dispatch_t **dispp);
  *	< mumble >
  */
 
-void    
+void
 dns_dispatch_starttcp(dns_dispatch_t *disp);
 /*
  * Start processing of a TCP dispatch once the socket connects.
diff --git a/lib/dns/include/dns/dnssec.h b/lib/dns/include/dns/dnssec.h
index ecef66bc59..2df7bf9f8e 100644
--- a/lib/dns/include/dns/dnssec.h
+++ b/lib/dns/include/dns/dnssec.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec.h,v 1.17 2000/07/27 09:47:51 tale Exp $ */
+/* $Id: dnssec.h,v 1.18 2000/08/01 01:24:09 tale Exp $ */
 
 #ifndef DNS_DNSSEC_H
 #define DNS_DNSSEC_H 1
diff --git a/lib/dns/include/dns/events.h b/lib/dns/include/dns/events.h
index 2e6c9330e0..ee9cc3cd7a 100644
--- a/lib/dns/include/dns/events.h
+++ b/lib/dns/include/dns/events.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: events.h,v 1.27 2000/07/27 09:47:52 tale Exp $ */
+/* $Id: events.h,v 1.28 2000/08/01 01:24:10 tale Exp $ */
 
 #ifndef DNS_EVENTS_H
 #define DNS_EVENTS_H 1
diff --git a/lib/dns/include/dns/fixedname.h b/lib/dns/include/dns/fixedname.h
index 7c852dbd6d..4b9e0ae921 100644
--- a/lib/dns/include/dns/fixedname.h
+++ b/lib/dns/include/dns/fixedname.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: fixedname.h,v 1.9 2000/07/27 09:47:53 tale Exp $ */
+/* $Id: fixedname.h,v 1.10 2000/08/01 01:24:11 tale Exp $ */
 
 #ifndef DNS_FIXEDNAME_H
 #define DNS_FIXEDNAME_H 1
diff --git a/lib/dns/include/dns/journal.h b/lib/dns/include/dns/journal.h
index e903377e30..973c734c73 100644
--- a/lib/dns/include/dns/journal.h
+++ b/lib/dns/include/dns/journal.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: journal.h,v 1.18 2000/07/27 09:47:54 tale Exp $ */
+/* $Id: journal.h,v 1.19 2000/08/01 01:24:12 tale Exp $ */
 
 #ifndef DNS_JOURNAL_H
 #define DNS_JOURNAL_H 1
@@ -47,13 +47,13 @@
  * A dns_difftuple_t represents a single RR being added or deleted.
  * The RR type and class are in the 'rdata' member; the class is always
  * the real one, not a DynDNS meta-class, so that the rdatas can be
- * compared using dns_rdata_compare().  The TTL is significant 
+ * compared using dns_rdata_compare().  The TTL is significant
  * even for deletions, because a deletion/addition pair cannot
  * be canceled out if the TTL differs (it might be an explicit
  * TTL update).
  *
  * Tuples are also used to represent complete RRs with owner
- * names for a couple of other purposes, such as the 
+ * names for a couple of other purposes, such as the
  * individual RRs of a "RRset exists (value dependent)"
  * prerequisite set.  In this case, op==DNS_DIFFOP_EXISTS,
  * and the TTL is ignored.
@@ -73,7 +73,7 @@ typedef struct dns_difftuple dns_difftuple_t;
 struct dns_difftuple {
         unsigned int			magic;
 	isc_mem_t			*mctx;
-	dns_diffop_t			op;        
+	dns_diffop_t			op;
 	dns_name_t			name;
 	dns_ttl_t			ttl;
 	dns_rdata_t			rdata;
@@ -83,7 +83,7 @@ struct dns_difftuple {
 
 /*
  * A dns_diff_t represents a set of changes being applied to
- * a zone.  Diffs are also used to represent "RRset exists 
+ * a zone.  Diffs are also used to represent "RRset exists
  * (value dependent)" prerequisites.
  */
 typedef struct dns_diff dns_diff_t;
@@ -158,7 +158,7 @@ dns_difftuple_copy(dns_difftuple_t *orig, dns_difftuple_t **copyp);
  * Copy a tuple.
  *
  * Requires:
- * 	'orig' points to a valid tuple 
+ * 	'orig' points to a valid tuple
  *	copyp != NULL && *copyp == NULL
  */
 
@@ -173,7 +173,7 @@ dns_diff_init(isc_mem_t *mctx, dns_diff_t *diff);
  *
  * Ensures:
  *    '*diff' is a valid, empty diff.
- */ 
+ */
 
 void
 dns_diff_clear(dns_diff_t *diff);
@@ -230,7 +230,7 @@ dns_diff_sort(dns_diff_t *diff, dns_diff_compare_func *compare);
  * Sort 'diff' in-place according to the comparison function 'compare'.
  */
 
-isc_result_t 
+isc_result_t
 dns_diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver);
 /*
  * Apply 'diff' to the database 'db'.
@@ -241,12 +241,12 @@ dns_diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver);
  *
  * Requires:
  *	*diff is a valid diff (possibly empty), containing
- *   	tuples of type DNS_DIFFOP_ADD and/or 
+ *   	tuples of type DNS_DIFFOP_ADD and/or
  *   	For DNS_DIFFOP_DEL tuples, the TTL is ignored.
  *
  */
 
-isc_result_t 
+isc_result_t
 dns_diff_load(dns_diff_t *diff, dns_addrdatasetfunc_t addfunc,
 	      void *add_private);
 /*
@@ -257,7 +257,7 @@ dns_diff_load(dns_diff_t *diff, dns_addrdatasetfunc_t addfunc,
  * Requires:
  * 	'addfunc' is a valid dns_addradatasetfunc_t obtained from
  * 	dns_db_beginload()
- * 
+ *
  *	'add_private' points to a corresponding dns_dbload_t *
  *      (XXX why is it a void pointer, then?)
  */
@@ -265,7 +265,7 @@ dns_diff_load(dns_diff_t *diff, dns_addrdatasetfunc_t addfunc,
 isc_result_t
 dns_diff_print(dns_diff_t *diff, FILE *file);
 
-/* 
+/*
  * Print the differences to 'file' or if 'file' is NULL via the
  * logging system.
  *
@@ -279,9 +279,9 @@ dns_diff_print(dns_diff_t *diff, FILE *file);
  *	ISC_R_UNEXPECTED
  *	any error from dns_rdataset_totext()
  */
-	
+
 /**************************************************************************/
-/* 
+/*
  * Misc. utilities
  * XXX these belong in a general-purpose DNS library
  */
@@ -290,7 +290,7 @@ isc_uint32_t
 dns_soa_getserial(dns_rdata_t *rdata);
 /*
  * Extract the serial number from the rdata of a SOA record.
- *  
+ *
  * Requires:
  *	rdata refers to the rdata of a well-formed SOA record.
  */
@@ -316,7 +316,7 @@ dns_db_createsoatuple(dns_db_t *db, dns_dbversion_t *ver, isc_mem_t *mctx,
 #define DNS_SERIAL_GT(a, b) ((int)(((a) - (b)) & 0xFFFFFFFF) > 0)
 #define DNS_SERIAL_GE(a, b) ((int)(((a) - (b)) & 0xFFFFFFFF) >= 0)
 /*
- * Compare SOA serial numbers.  DNS_SERIAL_GT(a, b) returns true iff 
+ * Compare SOA serial numbers.  DNS_SERIAL_GT(a, b) returns true iff
  * a is "greater than" b where "greater than" is as defined in RFC1982.
  * DNS_SERIAL_GE(a, b) returns true iff a is "greater than or equal to" b.
  */
@@ -332,10 +332,10 @@ dns_journal_open(isc_mem_t *mctx, const char *filename, isc_boolean_t write,
 /*
  * Open the journal file 'filename' and create a dns_journal_t object for it.
  *
- * If 'write' is ISC_TRUE, the journal is open for writing.  If it does 
+ * If 'write' is ISC_TRUE, the journal is open for writing.  If it does
  * not exist, it is created.
  *
- * If 'write' is ISC_FALSE, the journal is open for reading.  If it does 
+ * If 'write' is ISC_FALSE, the journal is open for reading.  If it does
  * not exist, ISC_R_NOTFOUND is returned.
  */
 
@@ -367,7 +367,7 @@ dns_journal_writediff(dns_journal_t *j, dns_diff_t *diff);
  * Requires:
  *      'j' is open for writing and dns_journal_begin_transaction()
  * 	has been called.
- * 
+ *
  * 	'diff' is a full or partial, correctly ordered IXFR
  *      difference sequence.
  */
@@ -423,7 +423,7 @@ dns_journal_iter_init(dns_journal_t *j,
  * from SOA serial number 'begin_serial' to 'end_serial'.
  *
  * Returns:
- *	ISC_R_SUCCESS	
+ *	ISC_R_SUCCESS
  *	ISC_R_RANGE	begin_serial is outside the addressable range.
  *	ISC_R_NOTFOUND	begin_serial is within the range of adressable
  *			serial numbers covered by the journal, but
@@ -494,7 +494,7 @@ dns_db_diff(isc_mem_t *mctx,
  * the order).  This journal entry will consist of a single,
  * possibly very large transaction.  Append the journal
  * entry to the journal file specified by 'journal_filename'.
- */ 
+ */
 
 
 ISC_LANG_ENDDECLS
diff --git a/lib/dns/include/dns/keyflags.h b/lib/dns/include/dns/keyflags.h
index 02831f5ab9..bcec393ae7 100644
--- a/lib/dns/include/dns/keyflags.h
+++ b/lib/dns/include/dns/keyflags.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keyflags.h,v 1.7 2000/07/27 09:47:55 tale Exp $ */
+/* $Id: keyflags.h,v 1.8 2000/08/01 01:24:13 tale Exp $ */
 
 #ifndef DNS_KEYFLAGS_H
 #define DNS_KEYFLAGS_H 1
@@ -32,7 +32,7 @@ dns_keyflags_fromtext(dns_keyflags_t *flagsp, isc_textregion_t *source);
  * Convert the text 'source' refers to into a DNSSEC KEY flags value.
  * The text may contain either a set of flag mnemonics separated by
  * vertical bars or a decimal flags value.  For compatibility with
- * older versions of BIND and the DNSSEC signer, octal values 
+ * older versions of BIND and the DNSSEC signer, octal values
  * prefixed with a zero and hexadecimal values prefixed with "0x"
  * are also accepted.
  *
diff --git a/lib/dns/include/dns/keytable.h b/lib/dns/include/dns/keytable.h
index c86e0fd45f..894814f11f 100644
--- a/lib/dns/include/dns/keytable.h
+++ b/lib/dns/include/dns/keytable.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keytable.h,v 1.8 2000/07/27 09:47:56 tale Exp $ */
+/* $Id: keytable.h,v 1.9 2000/08/01 01:24:14 tale Exp $ */
 
 #ifndef DNS_KEYTABLE_H
 #define DNS_KEYTABLE_H 1
@@ -155,7 +155,7 @@ dns_keytable_findkeynode(dns_keytable_t *keytable, dns_name_t *name,
  *	Any other result indicates an error.
  */
 
-isc_result_t 
+isc_result_t
 dns_keytable_findnextkeynode(dns_keytable_t *keytable, dns_keynode_t *keynode,
 		                             dns_keynode_t **nextnodep);
 /*
diff --git a/lib/dns/include/dns/keyvalues.h b/lib/dns/include/dns/keyvalues.h
index 3e8e3a31ef..738ce886c7 100644
--- a/lib/dns/include/dns/keyvalues.h
+++ b/lib/dns/include/dns/keyvalues.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keyvalues.h,v 1.8 2000/07/27 09:47:58 tale Exp $ */
+/* $Id: keyvalues.h,v 1.9 2000/08/01 01:24:15 tale Exp $ */
 
 #ifndef DNS_KEYVALUES_H
 #define DNS_KEYVALUES_H 1
diff --git a/lib/dns/include/dns/lib.h b/lib/dns/include/dns/lib.h
index a13af1b604..3784c098dd 100644
--- a/lib/dns/include/dns/lib.h
+++ b/lib/dns/include/dns/lib.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lib.h,v 1.4 2000/07/27 09:47:59 tale Exp $ */
+/* $Id: lib.h,v 1.5 2000/08/01 01:24:16 tale Exp $ */
 
 #ifndef DNS_LIB_H
 #define DNS_LIB_H 1
diff --git a/lib/dns/include/dns/log.h b/lib/dns/include/dns/log.h
index bc5cc7d58d..01987968d4 100644
--- a/lib/dns/include/dns/log.h
+++ b/lib/dns/include/dns/log.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log.h,v 1.22 2000/07/27 09:48:00 tale Exp $ */
+/* $Id: log.h,v 1.23 2000/08/01 01:24:17 tale Exp $ */
 
 /* Principal Authors: DCL */
 
diff --git a/lib/dns/include/dns/master.h b/lib/dns/include/dns/master.h
index 6c5678df43..59b241f4c1 100644
--- a/lib/dns/include/dns/master.h
+++ b/lib/dns/include/dns/master.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: master.h,v 1.21 2000/07/27 09:48:01 tale Exp $ */
+/* $Id: master.h,v 1.22 2000/08/01 01:24:19 tale Exp $ */
 
 #ifndef DNS_MASTER_H
 #define DNS_MASTER_H 1
@@ -72,7 +72,7 @@ dns_master_loadbuffer(isc_buffer_t *buffer,
  *
  * If 'age_ttl' is ISC_TRUE and the master file contains one or more
  * $DATE directives, the TTLs of the data will be aged accordingly.
- * 
+ *
  * 'callbacks->commit' is assumed to call 'callbacks->error' or
  * 'callbacks->warn' to generate any error messages required.
  *
diff --git a/lib/dns/include/dns/masterdump.h b/lib/dns/include/dns/masterdump.h
index 97a5853d74..5fb740a197 100644
--- a/lib/dns/include/dns/masterdump.h
+++ b/lib/dns/include/dns/masterdump.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: masterdump.h,v 1.11 2000/07/27 09:48:02 tale Exp $ */
+/* $Id: masterdump.h,v 1.12 2000/08/01 01:24:20 tale Exp $ */
 
 #ifndef DNS_MASTERDUMP_H
 #define DNS_MASTERDUMP_H 1
@@ -37,7 +37,7 @@
 /*
  * Style options for masterfile dumps.  This struct is currently
  * opaque, so applications cannot define their own style but have
- * to choose a predefined style.  A more flexible interface may 
+ * to choose a predefined style.  A more flexible interface may
  * be exported in the future.
  */
 
@@ -50,7 +50,7 @@ ISC_LANG_BEGINDECLS
  ***/
 
 /*
- * The default masterfile style.  
+ * The default masterfile style.
  */
 extern const dns_master_style_t dns_master_style_default;
 
@@ -64,14 +64,14 @@ dns_master_dumptostream(isc_mem_t *mctx, dns_db_t *db,
 			dns_dbversion_t *version,
 			const dns_master_style_t *style, FILE *f);
 /*
- * Dump the database 'db' to the steam 'f' in RFC1035 master 
+ * Dump the database 'db' to the steam 'f' in RFC1035 master
  * file format, in the style defined by 'style'
  * (e.g., &dns_default_master_style_default)
  *
  * Temporary dynamic memory may be allocated from 'mctx'.
  *
  * Returns:
- *	ISC_R_SUCCESS 
+ *	ISC_R_SUCCESS
  *	ISC_R_NOMEMORY
  * 	Any database or rrset iterator error.
  *	Any dns_rdata_totext() error code.
@@ -82,14 +82,14 @@ dns_master_dump(isc_mem_t *mctx, dns_db_t *db,
 		dns_dbversion_t *version,
 		const dns_master_style_t *style, const char *filename);
 /*
- * Dump the database 'db' to the file 'filename' in RFC1035 master 
+ * Dump the database 'db' to the file 'filename' in RFC1035 master
  * file format, in the style defined by 'style'
  * (e.g., &dns_default_master_style_default)
  *
  * Temporary dynamic memory may be allocated from 'mctx'.
  *
  * Returns:
- *	ISC_R_SUCCESS 
+ *	ISC_R_SUCCESS
  *	ISC_R_NOMEMORY
  * 	Any database or rrset iterator error.
  *	Any dns_rdata_totext() error code.
diff --git a/lib/dns/include/dns/message.h b/lib/dns/include/dns/message.h
index 6faf0302f8..9984a92655 100644
--- a/lib/dns/include/dns/message.h
+++ b/lib/dns/include/dns/message.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: message.h,v 1.74 2000/07/27 09:48:03 tale Exp $ */
+/* $Id: message.h,v 1.75 2000/08/01 01:24:21 tale Exp $ */
 
 #ifndef DNS_MESSAGE_H
 #define DNS_MESSAGE_H 1
@@ -221,7 +221,7 @@ ISC_LANG_BEGINDECLS
 
 isc_result_t
 dns_message_create(isc_mem_t *mctx, unsigned int intent, dns_message_t **msgp);
-		   
+
 /*
  * Create msg structure.
  *
@@ -289,7 +289,7 @@ dns_message_pseudosectiontotext(dns_message_t *msg,
 				dns_messagetextflag_t flags,
 				isc_buffer_t *target);
 /*
- * Convert section 'section' or 'pseudosection' of message 'msg' to 
+ * Convert section 'section' or 'pseudosection' of message 'msg' to
  * a cleartext representation
  *
  * Notes:
@@ -317,7 +317,7 @@ dns_message_pseudosectiontotext(dns_message_t *msg,
  *	ISC_R_NOSPACE
  *	ISC_R_NOMORE
  *
- *	Note: On error return, *target may be partially filled with data. 
+ *	Note: On error return, *target may be partially filled with data.
 */
 
 isc_result_t
@@ -373,8 +373,8 @@ dns_message_parse(dns_message_t *msg, isc_buffer_t *source,
  * and the order of the RRs in the message is preserved.
  * Otherwise, only one dns_name_t object will be created for each unique
  * owner name in the section, and each such dns_name_t will have a list
- * of rdatasets.  To access the names and their data, use 
- * dns_message_firstname() and dns_message_nextname(). 
+ * of rdatasets.  To access the names and their data, use
+ * dns_message_firstname() and dns_message_nextname().
  *
  * OPT and TSIG records are always handled specially, regardless of the
  * 'preserve_order' setting.
@@ -542,7 +542,7 @@ dns_message_renderend(dns_message_t *msg);
  * Returns:
  *	ISC_R_SUCCESS		-- all is well.
  */
-		      
+
 void
 dns_message_renderreset(dns_message_t *msg);
 /*
@@ -564,7 +564,7 @@ dns_message_firstname(dns_message_t *msg, dns_section_t section);
  * Set internal per-section name pointer to the beginning of the section.
  *
  * The functions dns_message_firstname() and dns_message_nextname() may
- * be used for iterating over the owner names in a section. 
+ * be used for iterating over the owner names in a section.
  *
  * Requires:
  *
@@ -877,7 +877,7 @@ dns_message_reply(dns_message_t *msg, isc_boolean_t want_question_section);
  * Requires:
  *
  *	'msg' is a valid message with parsing intent, and contains a query.
- * 
+ *
  * Ensures:
  *
  *	The message will have a rendering intent.  If 'want_question_section'
diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h
index 9f1336842b..2d22d5f48d 100644
--- a/lib/dns/include/dns/name.h
+++ b/lib/dns/include/dns/name.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: name.h,v 1.77 2000/07/31 23:09:47 tale Exp $ */
+/* $Id: name.h,v 1.78 2000/08/01 01:24:22 tale Exp $ */
 
 #ifndef DNS_NAME_H
 #define DNS_NAME_H 1
@@ -250,7 +250,7 @@ dns_name_reset(dns_name_t *name);
  *
  *	+ If any buffer is associated with 'name' (via dns_name_setbuffer()
  *	  or by being part of a dns_fixedname_t) the link to the buffer
- *	  is retained but the buffer itself is cleared.  
+ *	  is retained but the buffer itself is cleared.
  *
  *	+ Of the attributes associated with 'name', all are retained except
  *	  DNS_NAMEATTR_ABSOLUTE.
@@ -603,7 +603,7 @@ dns_name_depth(const dns_name_t *name);
 /***
  *** Labels
  ***/
-	
+
 unsigned int
 dns_name_countlabels(const dns_name_t *name);
 /*
@@ -676,7 +676,7 @@ dns_name_clone(dns_name_t *source, dns_name_t *target);
  *
  *	This call is functionally equivalent to:
  *
- *		dns_name_getlabelsequence(source, 0, 
+ *		dns_name_getlabelsequence(source, 0,
  *					  dns_label_countlabels(source),
  *					  target);
  *
@@ -786,7 +786,7 @@ dns_name_towire(dns_name_t *name, dns_compress_t *cctx, isc_buffer_t *target);
 /*
  * Convert 'name' into wire format, compressing it as specified by the
  * compression context 'cctx', and storing the result in 'target'.
- *	
+ *
  * Notes:
  *	If the compression context allows global compression, then the
  *	global compression table may be updated.
@@ -872,7 +872,7 @@ dns_name_totext(dns_name_t *name, isc_boolean_t omit_final_dot,
 		isc_buffer_t *target);
 /*
  * Convert 'name' into text format, storing the result in 'target'.
- *	
+ *
  * Notes:
  *	If 'omit_final_dot' is true, then the final '.' in absolute
  *	names other than the root name will be omitted.
@@ -1070,9 +1070,9 @@ dns_name_dup(dns_name_t *source, isc_mem_t *mctx, dns_name_t *target);
  * Requires:
  *
  *	'source' is a valid non-empty name.
- *	
+ *
  *	'target' is a valid name that is not read-only.
- *	
+ *
  *	'mctx' is a valid memory context.
  */
 
@@ -1086,11 +1086,11 @@ dns_name_dupwithoffsets(dns_name_t *source, isc_mem_t *mctx,
  * Requires:
  *
  *	'source' is a valid non-empty name.
- *	
+ *
  *	'target' is a valid name that is not read-only.
  *
  *	'target' has no offsets table.
- *	
+ *
  *	'mctx' is a valid memory context.
  */
 
@@ -1135,7 +1135,7 @@ dns_name_digest(dns_name_t *name, dns_digestfunc_t digest, void *arg);
  *	ISC_R_SUCCESS
  *
  *	Many other results are possible if not successful.
- *	
+ *
  */
 
 isc_boolean_t
@@ -1179,7 +1179,7 @@ dns_name_format(dns_name_t *name, char *cp, unsigned int size);
  * 'size' bytes.  The resulting string is guaranteed to be
  * null terminated.
  *
- * The formatted name will have a terminating dot only if it is 
+ * The formatted name will have a terminating dot only if it is
  * the root.
  *
  * This function cannot fail, instead any errors are indicated
diff --git a/lib/dns/include/dns/namedconf.h b/lib/dns/include/dns/namedconf.h
index a4d9155342..7bce93b115 100644
--- a/lib/dns/include/dns/namedconf.h
+++ b/lib/dns/include/dns/namedconf.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: namedconf.h,v 1.7 2000/07/27 09:48:05 tale Exp $ */
+/* $Id: namedconf.h,v 1.8 2000/08/01 01:24:23 tale Exp $ */
 
 #ifndef DNS_NAMEDCONF_H
 #define DNS_NAMEDCONF_H 1
diff --git a/lib/dns/include/dns/ncache.h b/lib/dns/include/dns/ncache.h
index ac7d291c2b..0a8cc5503a 100644
--- a/lib/dns/include/dns/ncache.h
+++ b/lib/dns/include/dns/ncache.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ncache.h,v 1.10 2000/07/27 09:48:07 tale Exp $ */
+/* $Id: ncache.h,v 1.11 2000/08/01 01:24:24 tale Exp $ */
 
 #ifndef DNS_NCACHE_H
 #define DNS_NCACHE_H 1
diff --git a/lib/dns/include/dns/nxt.h b/lib/dns/include/dns/nxt.h
index 067c3b6b14..43647cfaf6 100644
--- a/lib/dns/include/dns/nxt.h
+++ b/lib/dns/include/dns/nxt.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nxt.h,v 1.9 2000/07/27 09:48:08 tale Exp $ */
+/* $Id: nxt.h,v 1.10 2000/08/01 01:24:25 tale Exp $ */
 
 #ifndef DNS_NXT_H
 #define DNS_NXT_H 1
diff --git a/lib/dns/include/dns/peer.h b/lib/dns/include/dns/peer.h
index 4da40f7a07..ced0e98480 100644
--- a/lib/dns/include/dns/peer.h
+++ b/lib/dns/include/dns/peer.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: peer.h,v 1.11 2000/07/27 09:48:09 tale Exp $ */
+/* $Id: peer.h,v 1.12 2000/08/01 01:24:26 tale Exp $ */
 
 #ifndef DNS_PEER_H
 #define DNS_PEER_H 1
@@ -51,7 +51,7 @@
 struct dns_peerlist {
 	isc_uint32_t		magic;
 	isc_uint32_t		refs;
-	
+
 	isc_mem_t	       *mem;
 
 	ISC_LIST(dns_peer_t) elements;
@@ -73,7 +73,7 @@ struct dns_peer {
 	dns_name_t	       *key;
 
 	isc_uint32_t		bitflags;
-	
+
 	ISC_LINK(dns_peer_t)	next;
 };
 
diff --git a/lib/dns/include/dns/rbt.h b/lib/dns/include/dns/rbt.h
index a2f46042e2..c7eec5f038 100644
--- a/lib/dns/include/dns/rbt.h
+++ b/lib/dns/include/dns/rbt.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbt.h,v 1.45 2000/07/31 23:27:25 tale Exp $ */
+/* $Id: rbt.h,v 1.46 2000/08/01 01:24:28 tale Exp $ */
 
 #ifndef DNS_RBT_H
 #define DNS_RBT_H 1
@@ -211,7 +211,7 @@ dns_rbt_create(isc_mem_t *mctx, void (*deleter)(void *, void *),
  *	responsible for cleaning up any memory associated with the data
  *	pointer of a node when the node is deleted.  It is passed the
  *	deleted node's data pointer as its first argument and deleter_arg
- *	as its second argument.  
+ *	as its second argument.
  *
  * Requires:
  * 	mctx is a pointer to a valid memory context.
@@ -361,7 +361,7 @@ dns_rbt_findnode(dns_rbt_t *rbt, dns_name_t *name, dns_name_t *foundname,
  *
  *	If the chain parameter is non-NULL, then the path through the tree
  *	to the DNSSEC predecessor of the searched for name is maintained,
- *	unless the DNS_RBTFIND_NOPREDECESSOR or DNS_RBTFIND_NOEXACT option 
+ *	unless the DNS_RBTFIND_NOPREDECESSOR or DNS_RBTFIND_NOEXACT option
  *	is used. (For more details on those options, see below.)
  *
  *	If there is no predecessor, then the chain will point to nowhere, as
@@ -408,7 +408,7 @@ dns_rbt_findnode(dns_rbt_t *rbt, dns_name_t *name, dns_name_t *foundname,
  *	will not point to the DNSSEC predecessor, but will instead point
  *	to the exact match, if there was any.  Thus the preceding paragraphs
  *	should have "exact match" substituted for "predecessor" to describe
- *	how the various elements of the chain are set.  This was done to 
+ *	how the various elements of the chain are set.  This was done to
  * 	ensure that the chain's state was sane, and to prevent problems that
  *	occurred when running the predecessor location code under conditions
  *	it was not designed for.  It is not clear *where* the chain should
@@ -592,7 +592,7 @@ dns_rbt_printall(dns_rbt_t *rbt);
  *
  * Notes:
  *	The name stored at each node, along with the node's color, is printed.
- *	Then the down pointer, left and right pointers are displayed 
+ *	Then the down pointer, left and right pointers are displayed
  *	recursively in turn.  NULL down pointers are silently omitted;
  *	NULL left and right pointers are printed.
  */
@@ -677,7 +677,7 @@ dns_rbtnodechain_current(dns_rbtnodechain_t *chain, dns_name_t *name,
  *	'origin', if non-NULL, is the sequence of labels in the levels
  *	above the terminal level, such as "isc.org." in the above example.
  *	'origin' is always "." for the root node.
- *	
+ *
  *
  * Returns:
  *	ISC_R_SUCCESS		name, origin & node were successfully set.
diff --git a/lib/dns/include/dns/rcode.h b/lib/dns/include/dns/rcode.h
index 6e8ad1077f..b0a301d2c3 100644
--- a/lib/dns/include/dns/rcode.h
+++ b/lib/dns/include/dns/rcode.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rcode.h,v 1.10 2000/07/27 09:48:11 tale Exp $ */
+/* $Id: rcode.h,v 1.11 2000/08/01 01:24:29 tale Exp $ */
 
 #ifndef DNS_RCODE_H
 #define DNS_RCODE_H 1
diff --git a/lib/dns/include/dns/rdata.h b/lib/dns/include/dns/rdata.h
index 1a191b6c57..9b05c0e220 100644
--- a/lib/dns/include/dns/rdata.h
+++ b/lib/dns/include/dns/rdata.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdata.h,v 1.39 2000/07/27 09:48:12 tale Exp $ */
+/* $Id: rdata.h,v 1.40 2000/08/01 01:24:30 tale Exp $ */
 
 #ifndef DNS_RDATA_H
 #define DNS_RDATA_H 1
@@ -244,7 +244,7 @@ dns_rdata_towire(dns_rdata_t *rdata, dns_compress_t *cctx,
 /*
  * Convert 'rdata' into wire format, compressing it as specified by the
  * compression context 'cctx', and storing the result in 'target'.
- *	
+ *
  * Notes:
  *	If the compression context allows global compression, then the
  *	global compression table may be updated.
@@ -348,7 +348,7 @@ isc_result_t
 dns_rdata_tofmttext(dns_rdata_t *rdata, dns_name_t *origin, unsigned int flags,
 		    unsigned int width, char *linebreak, isc_buffer_t *target);
 /*
- * Like dns_rdata_totext, but do formatted output suitable for 
+ * Like dns_rdata_totext, but do formatted output suitable for
  * database dumps.  This is intended for use by dns_db_dump();
  * library users are discouraged from calling it directly.
  *
@@ -358,16 +358,16 @@ dns_rdata_tofmttext(dns_rdata_t *rdata, dns_name_t *origin, unsigned int flags,
  * are added when necessary.  Because RRs contain unbreakable elements
  * such as domain names whose length is variable, unpredictable, and
  * potentially large, there is no guarantee that the lines will
- * not exceed 'width' anyway.  
+ * not exceed 'width' anyway.
  *
  * If (flags & DNS_STYLEFLAG_MULTILINE) == 0, the rdata is always
  * printed as a single line, and no parentheses are used.
  * The 'width' and 'linebreak' arguments are ignored.
  *
  * If (flags & DNS_STYLEFLAG_COMMENT) != 0, output explanatory
- * comments next to things like the SOA timer fields.  Some 
+ * comments next to things like the SOA timer fields.  Some
  * comments (e.g., the SOA ones) are only printed when multiline
- * output is selected. 
+ * output is selected.
  */
 
 isc_result_t
@@ -406,7 +406,7 @@ isc_result_t
 dns_rdata_tostruct(dns_rdata_t *rdata, void *target, isc_mem_t *mctx);
 /*
  * Convert an rdata into its C structure representation.
- *	
+ *
  * If 'mctx' is NULL then 'rdata' must persist while 'target' is being used.
  *
  * If 'mctx' is non NULL then memory will be allocated if required.
diff --git a/lib/dns/include/dns/rdataclass.h b/lib/dns/include/dns/rdataclass.h
index e9453a4588..04e0a99649 100644
--- a/lib/dns/include/dns/rdataclass.h
+++ b/lib/dns/include/dns/rdataclass.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdataclass.h,v 1.13 2000/07/27 09:48:14 tale Exp $ */
+/* $Id: rdataclass.h,v 1.14 2000/08/01 01:24:31 tale Exp $ */
 
 #ifndef DNS_RDATACLASS_H
 #define DNS_RDATACLASS_H 1
diff --git a/lib/dns/include/dns/rdatalist.h b/lib/dns/include/dns/rdatalist.h
index e367b8e42e..a9865a4aba 100644
--- a/lib/dns/include/dns/rdatalist.h
+++ b/lib/dns/include/dns/rdatalist.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdatalist.h,v 1.11 2000/07/27 09:48:15 tale Exp $ */
+/* $Id: rdatalist.h,v 1.12 2000/08/01 01:24:32 tale Exp $ */
 
 #ifndef DNS_RDATALIST_H
 #define DNS_RDATALIST_H 1
diff --git a/lib/dns/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h
index 64ef5c3287..10ba9d1ac7 100644
--- a/lib/dns/include/dns/rdataset.h
+++ b/lib/dns/include/dns/rdataset.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdataset.h,v 1.34 2000/07/27 09:48:16 tale Exp $ */
+/* $Id: rdataset.h,v 1.35 2000/08/01 01:24:33 tale Exp $ */
 
 #ifndef DNS_RDATASET_H
 #define DNS_RDATASET_H 1
@@ -223,7 +223,7 @@ dns_rdataset_count(dns_rdataset_t *rdataset);
  *	'rdataset' is a valid, associated rdataset.
  *
  * Returns:
- *	The number of records in 'rdataset'.	
+ *	The number of records in 'rdataset'.
  */
 
 isc_result_t
diff --git a/lib/dns/include/dns/rdatasetiter.h b/lib/dns/include/dns/rdatasetiter.h
index 3aad61c93e..f85b7d4b9d 100644
--- a/lib/dns/include/dns/rdatasetiter.h
+++ b/lib/dns/include/dns/rdatasetiter.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdatasetiter.h,v 1.11 2000/07/27 09:48:17 tale Exp $ */
+/* $Id: rdatasetiter.h,v 1.12 2000/08/01 01:24:34 tale Exp $ */
 
 #ifndef DNS_RDATASETITER_H
 #define DNS_RDATASETITER_H 1
@@ -34,7 +34,7 @@
  * it, an implementation of the class is required.  This implementation is
  * supplied by the database.
  *
- * It is the client's responsibility to call dns_rdataset_disassociate() 
+ * It is the client's responsibility to call dns_rdataset_disassociate()
  * on all rdatasets returned.
  *
  * XXX  XXX
@@ -42,7 +42,7 @@
  * MP:
  *	The iterator itself is not locked.  The caller must ensure
  *	synchronization.
- *	
+ *
  *	The iterator methods ensure appropriate database locking.
  *
  * Reliability:
diff --git a/lib/dns/include/dns/rdataslab.h b/lib/dns/include/dns/rdataslab.h
index e34e62637b..2b061e448f 100644
--- a/lib/dns/include/dns/rdataslab.h
+++ b/lib/dns/include/dns/rdataslab.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdataslab.h,v 1.13 2000/07/27 09:48:18 tale Exp $ */
+/* $Id: rdataslab.h,v 1.14 2000/08/01 01:24:36 tale Exp $ */
 
 #ifndef DNS_RDATASLAB_H
 #define DNS_RDATASLAB_H 1
diff --git a/lib/dns/include/dns/rdatatype.h b/lib/dns/include/dns/rdatatype.h
index 00373cfc46..a3d0d0e280 100644
--- a/lib/dns/include/dns/rdatatype.h
+++ b/lib/dns/include/dns/rdatatype.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdatatype.h,v 1.12 2000/07/27 09:48:19 tale Exp $ */
+/* $Id: rdatatype.h,v 1.13 2000/08/01 01:24:37 tale Exp $ */
 
 #ifndef DNS_RDATATYPE_H
 #define DNS_RDATATYPE_H 1
diff --git a/lib/dns/include/dns/request.h b/lib/dns/include/dns/request.h
index 1e4220b746..885abe5b15 100644
--- a/lib/dns/include/dns/request.h
+++ b/lib/dns/include/dns/request.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: request.h,v 1.12 2000/07/27 09:48:20 tale Exp $ */
+/* $Id: request.h,v 1.13 2000/08/01 01:24:38 tale Exp $ */
 
 #ifndef DNS_REQUEST_H
 #define DNS_REQUEST_H 1
diff --git a/lib/dns/include/dns/resolver.h b/lib/dns/include/dns/resolver.h
index 1dbc8bc35f..6a024b1fe9 100644
--- a/lib/dns/include/dns/resolver.h
+++ b/lib/dns/include/dns/resolver.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.h,v 1.30 2000/07/27 09:48:21 tale Exp $ */
+/* $Id: resolver.h,v 1.31 2000/08/01 01:24:39 tale Exp $ */
 
 #ifndef DNS_RESOLVER_H
 #define DNS_RESOLVER_H 1
@@ -265,7 +265,7 @@ dns_resolver_createfetch(dns_resolver_t *res, dns_name_t *name,
 			 unsigned int options, isc_task_t *task,
 			 isc_taskaction_t action, void *arg,
 			 dns_rdataset_t *rdataset,
-			 dns_rdataset_t *sigrdataset, 
+			 dns_rdataset_t *sigrdataset,
 			 dns_fetch_t **fetchp);
 /*
  * Recurse to answer a question.
@@ -276,13 +276,13 @@ dns_resolver_createfetch(dns_resolver_t *res, dns_name_t *name,
  *
  *	The 'domain' is a parent domain of 'name' for which
  *	a set of name servers 'nameservers' is known.  If no
- *	such name server information is available, set 
+ *	such name server information is available, set
  * 	'domain' and 'nameservers' to NULL.
  *
  *	'forwarders' is unimplemented, and subject to change when
  *	we figure out how selective forwarding will work.
  *
- *	When the fetch completes (successfully or otherwise), a 
+ *	When the fetch completes (successfully or otherwise), a
  *	DNS_EVENT_FETCHDONE event with action 'action' and arg 'arg' will be
  *	posted to 'task'.
  *
diff --git a/lib/dns/include/dns/result.h b/lib/dns/include/dns/result.h
index ca2ae877df..e9da0a2587 100644
--- a/lib/dns/include/dns/result.h
+++ b/lib/dns/include/dns/result.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: result.h,v 1.63 2000/07/27 09:48:22 tale Exp $ */
+/* $Id: result.h,v 1.64 2000/08/01 01:24:40 tale Exp $ */
 
 #ifndef DNS_RESULT_H
 #define DNS_RESULT_H 1
diff --git a/lib/dns/include/dns/rootns.h b/lib/dns/include/dns/rootns.h
index 74e50f1709..af872edb34 100644
--- a/lib/dns/include/dns/rootns.h
+++ b/lib/dns/include/dns/rootns.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rootns.h,v 1.6 2000/07/27 09:48:23 tale Exp $ */
+/* $Id: rootns.h,v 1.7 2000/08/01 01:24:41 tale Exp $ */
 
 #ifndef DNS_ROOTNS_H
 #define DNS_ROOTNS_H 1
diff --git a/lib/dns/include/dns/secalg.h b/lib/dns/include/dns/secalg.h
index de7e408d51..fe34f4e401 100644
--- a/lib/dns/include/dns/secalg.h
+++ b/lib/dns/include/dns/secalg.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: secalg.h,v 1.10 2000/07/27 09:48:24 tale Exp $ */
+/* $Id: secalg.h,v 1.11 2000/08/01 01:24:42 tale Exp $ */
 
 #ifndef DNS_SECALG_H
 #define DNS_SECALG_H 1
diff --git a/lib/dns/include/dns/secproto.h b/lib/dns/include/dns/secproto.h
index e664bcaa60..e7e8cd5887 100644
--- a/lib/dns/include/dns/secproto.h
+++ b/lib/dns/include/dns/secproto.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: secproto.h,v 1.7 2000/07/27 09:48:26 tale Exp $ */
+/* $Id: secproto.h,v 1.8 2000/08/01 01:24:43 tale Exp $ */
 
 #ifndef DNS_SECPROTO_H
 #define DNS_SECPROTO_H 1
diff --git a/lib/dns/include/dns/ssu.h b/lib/dns/include/dns/ssu.h
index 9de4d1b282..f35a253267 100644
--- a/lib/dns/include/dns/ssu.h
+++ b/lib/dns/include/dns/ssu.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ssu.h,v 1.9 2000/07/27 09:48:27 tale Exp $ */
+/* $Id: ssu.h,v 1.10 2000/08/01 01:24:44 tale Exp $ */
 
 #ifndef DNS_SSU_H
 #define DNS_SSU_H 1
diff --git a/lib/dns/include/dns/tcpmsg.h b/lib/dns/include/dns/tcpmsg.h
index 1086ad26e3..67fcd45b02 100644
--- a/lib/dns/include/dns/tcpmsg.h
+++ b/lib/dns/include/dns/tcpmsg.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tcpmsg.h,v 1.13 2000/07/27 09:48:28 tale Exp $ */
+/* $Id: tcpmsg.h,v 1.14 2000/08/01 01:24:45 tale Exp $ */
 
 #ifndef DNS_TCPMSG_H
 #define DNS_TCPMSG_H 1
diff --git a/lib/dns/include/dns/time.h b/lib/dns/include/dns/time.h
index c8c040b2a7..c315a8f4fa 100644
--- a/lib/dns/include/dns/time.h
+++ b/lib/dns/include/dns/time.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: time.h,v 1.7 2000/07/27 09:48:29 tale Exp $ */
+/* $Id: time.h,v 1.8 2000/08/01 01:24:46 tale Exp $ */
 
 #ifndef DNS_TIME_H
 #define DNS_TIME_H 1
@@ -37,9 +37,9 @@ isc_result_t
 dns_time64_fromtext(char *source, isc_int64_t *target);
 /*
  * Convert a date and time in YYYYMMDDHHMMSS text format at 'source'
- * into to a 64-bit count of seconds since Jan 1 1970 0:00 GMT.  
+ * into to a 64-bit count of seconds since Jan 1 1970 0:00 GMT.
  * Store the count at 'target'.
- */ 
+ */
 
 isc_result_t
 dns_time32_fromtext(char *source, isc_uint32_t *target);
@@ -47,12 +47,12 @@ dns_time32_fromtext(char *source, isc_uint32_t *target);
  * Like dns_time64_fromtext, but returns the second count modulo 2^32
  * as per RFC2535.
  */
-	
+
 
 isc_result_t
 dns_time64_totext(isc_int64_t value, isc_buffer_t *target);
 /*
- * Convert a 64-bit count of seconds since Jan 1 1970 0:00 GMT into 
+ * Convert a 64-bit count of seconds since Jan 1 1970 0:00 GMT into
  * a YYYYMMDDHHMMSS text representation and append it to 'target'.
  */
 
@@ -63,7 +63,7 @@ dns_time32_totext(isc_uint32_t value, isc_buffer_t *target);
  * Of those dates whose counts of seconds since Jan 1 1970 0:00 GMT
  * are congruent with 'value' modulo 2^32, the one closest to the
  * current date is chosen.
- */ 
+ */
 
 ISC_LANG_ENDDECLS
 
diff --git a/lib/dns/include/dns/tkey.h b/lib/dns/include/dns/tkey.h
index 1e1acfa641..1916822faa 100644
--- a/lib/dns/include/dns/tkey.h
+++ b/lib/dns/include/dns/tkey.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tkey.h,v 1.14 2000/07/27 09:48:30 tale Exp $ */
+/* $Id: tkey.h,v 1.15 2000/08/01 01:24:47 tale Exp $ */
 
 #ifndef DNS_TKEY_H
 #define DNS_TKEY_H 1
diff --git a/lib/dns/include/dns/tkeyconf.h b/lib/dns/include/dns/tkeyconf.h
index bd4beac695..257a7becc5 100644
--- a/lib/dns/include/dns/tkeyconf.h
+++ b/lib/dns/include/dns/tkeyconf.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tkeyconf.h,v 1.5 2000/07/27 09:48:31 tale Exp $ */
+/* $Id: tkeyconf.h,v 1.6 2000/08/01 01:24:49 tale Exp $ */
 
 #ifndef DNS_TKEYCONF_H
 #define DNS_TKEYCONF_H 1
@@ -45,7 +45,7 @@ dns_tkeyctx_fromconfig(dns_c_ctx_t *cfg, isc_mem_t *mctx, isc_entropy_t *ectx,
  *		ISC_R_SUCCESS
  *		ISC_R_NOMEMORY
  */
- 
+
 ISC_LANG_ENDDECLS
 
 #endif /* DNS_TKEYCONF_H */
diff --git a/lib/dns/include/dns/tsig.h b/lib/dns/include/dns/tsig.h
index 0031163d1f..3344d27362 100644
--- a/lib/dns/include/dns/tsig.h
+++ b/lib/dns/include/dns/tsig.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tsig.h,v 1.30 2000/07/28 23:27:01 bwelling Exp $ */
+/* $Id: tsig.h,v 1.31 2000/08/01 01:24:50 tale Exp $ */
 
 #ifndef DNS_TSIG_H
 #define DNS_TSIG_H 1
@@ -45,7 +45,7 @@ struct dns_tsig_keyring {
 	dns_rbt_t *keys;
 	isc_rwlock_t lock;
 	isc_mem_t *mctx;
-}; 
+};
 
 struct dns_tsigkey {
 	/* Unlocked */
diff --git a/lib/dns/include/dns/tsigconf.h b/lib/dns/include/dns/tsigconf.h
index 97bf2ecca3..f9689a524b 100644
--- a/lib/dns/include/dns/tsigconf.h
+++ b/lib/dns/include/dns/tsigconf.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tsigconf.h,v 1.5 2000/07/27 09:48:33 tale Exp $ */
+/* $Id: tsigconf.h,v 1.6 2000/08/01 01:24:51 tale Exp $ */
 
 #ifndef DNS_TSIGCONF_H
 #define DNS_TSIGCONF_H 1
@@ -43,7 +43,7 @@ dns_tsigkeyring_fromconfig(dns_c_view_t *confview, dns_c_ctx_t *confctx,
  *		ISC_R_SUCCESS
  *		ISC_R_NOMEMORY
  */
- 
+
 ISC_LANG_ENDDECLS
 
 #endif /* DNS_TSIGCONF_H */
diff --git a/lib/dns/include/dns/ttl.h b/lib/dns/include/dns/ttl.h
index 5c2ab7b519..0937b5fe2c 100644
--- a/lib/dns/include/dns/ttl.h
+++ b/lib/dns/include/dns/ttl.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ttl.h,v 1.10 2000/07/27 09:48:34 tale Exp $ */
+/* $Id: ttl.h,v 1.11 2000/08/01 01:24:52 tale Exp $ */
 
 #ifndef DNS_TTL_H
 #define DNS_TTL_H 1
@@ -43,7 +43,7 @@ dns_ttl_totext(isc_uint32_t src, isc_boolean_t verbose,
  *
  * If 'verbose' is ISC_FALSE, use the terse BIND 8 style, like "1w2d3h4m5s".
  *
- * If 'verbose' is ISC_TRUE, use a verbose style like the SOA comments 
+ * If 'verbose' is ISC_TRUE, use a verbose style like the SOA comments
  * in "dig", like "1 week 2 days 3 hours 4 minutes 5 seconds".
  *
  * Returns:
diff --git a/lib/dns/include/dns/types.h b/lib/dns/include/dns/types.h
index 4942b2bb14..bd373b7452 100644
--- a/lib/dns/include/dns/types.h
+++ b/lib/dns/include/dns/types.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: types.h,v 1.90 2000/07/27 09:48:35 tale Exp $ */
+/* $Id: types.h,v 1.91 2000/08/01 01:24:53 tale Exp $ */
 
 #ifndef DNS_TYPES_H
 #define DNS_TYPES_H 1
diff --git a/lib/dns/include/dns/validator.h b/lib/dns/include/dns/validator.h
index 50215e8573..eab27df709 100644
--- a/lib/dns/include/dns/validator.h
+++ b/lib/dns/include/dns/validator.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: validator.h,v 1.11 2000/07/27 09:48:37 tale Exp $ */
+/* $Id: validator.h,v 1.12 2000/08/01 01:24:54 tale Exp $ */
 
 #ifndef DNS_VALIDATOR_H
 #define DNS_VALIDATOR_H 1
@@ -92,13 +92,13 @@ dns_validator_create(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type,
  *
  * The complete response message may be given in 'message',
  * to make available any authority section NXTs that may be
- * needed for validation of a response resulting from a 
- * wildcard expansion (though no such wildcard validation 
+ * needed for validation of a response resulting from a
+ * wildcard expansion (though no such wildcard validation
  * is implemented yet).  If the complete response message
  * is not available, 'message' is NULL.
  *
  * To validate a negative response, the complete negative response
- * message is given in 'message'.  The 'rdataset', and 
+ * message is given in 'message'.  The 'rdataset', and
  * 'sigrdataset' arguments must be NULL, but the 'name' and 'type'
  * arguments must be provided.
  *
@@ -118,7 +118,7 @@ dns_validator_cancel(dns_validator_t *validator);
  * Cancel a DNSSEC validation in progress.
  *
  * Requires:
- *	'validator' points to a valid DNSSEC validator, which 
+ *	'validator' points to a valid DNSSEC validator, which
  *	may or may not already have completed.
  *
  * Ensures:
diff --git a/lib/dns/include/dns/view.h b/lib/dns/include/dns/view.h
index 01bfd76cb6..750cfba1ba 100644
--- a/lib/dns/include/dns/view.h
+++ b/lib/dns/include/dns/view.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: view.h,v 1.46 2000/07/31 21:07:07 explorer Exp $ */
+/* $Id: view.h,v 1.47 2000/08/01 01:24:55 tale Exp $ */
 
 #ifndef DNS_VIEW_H
 #define DNS_VIEW_H 1
@@ -116,7 +116,7 @@ struct dns_view {
 	 * locked by server configuration lock.
 	 */
 	dns_acl_t *			matchclients;
-	
+
 	/* Locked by lock. */
 	unsigned int			references;
 	unsigned int			weakrefs;
@@ -390,7 +390,7 @@ dns_view_find(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type,
  *	'type' is a valid dns_rdatatype_t, and is not a meta query type
  *	(e.g. dns_rdatatype_any), or dns_rdatatype_sig.
  *
- *	'foundname' is 
+ *	'foundname' is
  *
  *	'rdataset' is a valid, disassociated rdataset.
  *
@@ -488,7 +488,7 @@ dns_view_findzonecut(dns_view_t *view, dns_name_t *name, dns_name_t *fname,
  *	covers 'type', then 'sigrdataset' will be bound to it.
  *
  *	If the DNS_DBFIND_NOEXACT option is set, then the zonecut returned
- *	(if any) will be the deepest known ancestor of 'name'. 
+ *	(if any) will be the deepest known ancestor of 'name'.
  *
  * Requires:
  *
@@ -525,7 +525,7 @@ dns_view_load(dns_view_t *view, isc_boolean_t stop);
 /*
  * Load all zones attached to this view.  If 'stop' is ISC_TRUE,
  * stop on the first error and return it.  If 'stop'
- * is ISC_FALSE, ignore errors. 
+ * is ISC_FALSE, ignore errors.
  *
  * Requires:
  *
diff --git a/lib/dns/include/dns/xfrin.h b/lib/dns/include/dns/xfrin.h
index 64c9f7d7fa..c6fe8baa6f 100644
--- a/lib/dns/include/dns/xfrin.h
+++ b/lib/dns/include/dns/xfrin.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xfrin.h,v 1.15 2000/07/27 09:48:39 tale Exp $ */
+/* $Id: xfrin.h,v 1.16 2000/08/01 01:24:56 tale Exp $ */
 
 #ifndef DNS_XFRIN_H
 #define DNS_XFRIN_H 1
@@ -59,7 +59,7 @@ dns_xfrin_create(dns_zone_t *zone, dns_rdatatype_t xfrtype,
 		 dns_xfrindone_t done, dns_xfrin_ctx_t **xfrp);
 /*
  * Attempt to start an incoming zone transfer of 'zone'
- * from 'masteraddr', creating a dns_xfrin_ctx_t object to 
+ * from 'masteraddr', creating a dns_xfrin_ctx_t object to
  * manage it.  Attach '*xfrp' to the newly created object.
  *
  * Iff ISC_R_SUCCESS is returned, '*done' is guaranteed to be
@@ -84,9 +84,9 @@ dns_xfrin_shutdown(dns_xfrin_ctx_t *xfr);
 void
 dns_xfrin_detach(dns_xfrin_ctx_t **xfrp);
 /*
- * Detach a reference to a zone transfer object.  
+ * Detach a reference to a zone transfer object.
  *
- * (Because there is no attach() method, there can currently 
+ * (Because there is no attach() method, there can currently
  * only be one reference).
  */
 
diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h
index b32bb8f058..87d71c54d2 100644
--- a/lib/dns/include/dns/zone.h
+++ b/lib/dns/include/dns/zone.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.h,v 1.63 2000/07/27 09:48:40 tale Exp $ */
+/* $Id: zone.h,v 1.64 2000/08/01 01:24:58 tale Exp $ */
 
 #ifndef DNS_ZONE_H
 #define DNS_ZONE_H 1
@@ -79,7 +79,7 @@ dns_zone_setclass(dns_zone_t *zone, dns_rdataclass_t rdclass);
  *	dns_zone_setclass() not to have been called since the zone was
  *	created.
  *	'rdclass' != dns_rdataclass_none.
- */	
+ */
 
 dns_rdataclass_t
 dns_zone_getclass(dns_zone_t *zone);
@@ -110,7 +110,7 @@ dns_zone_setview(dns_zone_t *zone, dns_view_t *view);
  *
  * Require:
  *	'zone' to be a valid zone.
- */	
+ */
 
 dns_view_t *
 dns_zone_getview(dns_zone_t *zone);
@@ -147,7 +147,7 @@ dns_zone_getorigin(dns_zone_t *zone);
 isc_result_t
 dns_zone_setdatabase(dns_zone_t *zone, const char *database);
 /*
- *	Sets the name of the database to be loaded. 
+ *	Sets the name of the database to be loaded.
  *	For databases loaded from MASTER files this corresponds to the
  *	file name of the MASTER file.
  *
@@ -202,7 +202,7 @@ dns_zone_detach(dns_zone_t **zonep);
 void
 dns_zone_iattach(dns_zone_t *source, dns_zone_t **target);
 /*
- *	Attach '*target' to 'source' incrementing its internal 
+ *	Attach '*target' to 'source' incrementing its internal
  * 	reference count.  This is intended for use by operations
  * 	such as zone transfers that need to prevent the zone
  * 	object from being freed but not from shutting down.
@@ -212,7 +212,7 @@ dns_zone_iattach(dns_zone_t *source, dns_zone_t **target);
  *	'zone' to be a valid zone.
  *	'target' to be non NULL and '*target' to be NULL.
  */
- 
+
 void
 dns_zone_idetach(dns_zone_t **zonep);
 /*
@@ -221,7 +221,7 @@ dns_zone_idetach(dns_zone_t **zonep);
  * 	zone, it will be freed.
  *
  * Require:
- *	The caller is running in the context of the zone's task. 
+ *	The caller is running in the context of the zone's task.
  *	'zonep' to point to a valid zone.
  */
 
@@ -278,7 +278,7 @@ isc_result_t
 dns_zone_setdbtype(dns_zone_t *zone, const char *db_type);
 /*
  *	Sets the database type. Current database types are: "rbt", "rbt64".
- *	'db_type' is not checked to see if it is a valid database type. 
+ *	'db_type' is not checked to see if it is a valid database type.
  *
  * Require:
  *	'zone' to be a valid zone.
@@ -289,7 +289,7 @@ dns_zone_setdbtype(dns_zone_t *zone, const char *db_type);
  *	ISC_R_SUCCESS
  */
 
-void 
+void
 dns_zone_markdirty(dns_zone_t *zone);
 /*
  *	Mark a zone as 'dirty'.
@@ -705,7 +705,7 @@ dns_zone_setjournal(dns_zone_t *zone, const char *journal);
  *
  * Returns:
  *	ISC_R_SUCCESS
- *	ISC_R_NOMEMORY 
+ *	ISC_R_NOMEMORY
  */
 
 char *
@@ -882,7 +882,7 @@ dns_zone_getmgr(dns_zone_t *zone);
  * Requires:
  *	'zone' to be a valid zone.
  */
-  
+
 void
 dns_zone_setsigvalidityinterval(dns_zone_t *zone, isc_uint32_t interval);
 /*
@@ -959,7 +959,7 @@ dns_zonemgr_attach(dns_zonemgr_t *source, dns_zonemgr_t **target);
  *	'zone' to be a valid zone.
  *	'target' to be non NULL and '*target' to be NULL.
  */
-	
+
 void
 dns_zonemgr_detach(dns_zonemgr_t **zmgrp);
 /*
diff --git a/lib/dns/include/dns/zoneconf.h b/lib/dns/include/dns/zoneconf.h
index 4cb86be221..5326b3c9b9 100644
--- a/lib/dns/include/dns/zoneconf.h
+++ b/lib/dns/include/dns/zoneconf.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zoneconf.h,v 1.12 2000/07/27 09:48:41 tale Exp $ */
+/* $Id: zoneconf.h,v 1.13 2000/08/01 01:24:59 tale Exp $ */
 
 #ifndef DNS_ZONECONF_H
 #define DNS_ZONECONF_H 1
diff --git a/lib/dns/include/dns/zt.h b/lib/dns/include/dns/zt.h
index 4dfdfa4a1d..3b9d8cb291 100644
--- a/lib/dns/include/dns/zt.h
+++ b/lib/dns/include/dns/zt.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zt.h,v 1.20 2000/07/27 09:48:42 tale Exp $ */
+/* $Id: zt.h,v 1.21 2000/08/01 01:25:00 tale Exp $ */
 
 #ifndef DNS_ZT_H
 #define DNS_ZT_H 1
diff --git a/lib/dns/journal.c b/lib/dns/journal.c
index 8db3bde1a3..58a92a6694 100644
--- a/lib/dns/journal.c
+++ b/lib/dns/journal.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: journal.c,v 1.56 2000/07/27 09:46:08 tale Exp $ */
+/* $Id: journal.c,v 1.57 2000/08/01 01:22:25 tale Exp $ */
 
 #include 
 
@@ -80,7 +80,7 @@ decode_uint32(unsigned char *p) {
 		(p[3] <<  0));
 }
 
-static inline void 
+static inline void
 encode_uint32(isc_uint32_t val, unsigned char *p) {
 	p[0] = (isc_uint8_t)(val >> 24);
 	p[1] = (isc_uint8_t)(val >> 16);
@@ -103,7 +103,7 @@ dns_soa_getserial(dns_rdata_t *rdata) {
 	 * (it starts 20 bytes from the end).  This is a bit of
 	 * a kludge, but the alternative approach of using
 	 * dns_rdata_tostruct() and dns_rdata_fromstruct()
-	 * would involve a lot of unnecessary work (like 
+	 * would involve a lot of unnecessary work (like
 	 * building domain names and allocating temporary memory)
 	 * when all we really want to do is to change 32 bits of
 	 * fixed-sized data.  Besides, fromstruct_soa() is not
@@ -129,20 +129,20 @@ dns_db_createsoatuple(dns_db_t *db, dns_dbversion_t *ver, isc_mem_t *mctx,
 	dns_rdataset_t rdataset;
 	dns_rdata_t rdata;
 	dns_name_t *zonename;
-	
+
 	zonename = dns_db_origin(db);
-	
+
 	node = NULL;
 	result = dns_db_findnode(db, zonename, ISC_FALSE, &node);
 	if (result != ISC_R_SUCCESS)
 		goto nonode;
-	
+
 	dns_rdataset_init(&rdataset);
 	result = dns_db_findrdataset(db, node, ver, dns_rdatatype_soa, 0,
 				     (isc_stdtime_t)0, &rdataset, NULL);
  	if (result != ISC_R_SUCCESS)
 		goto freenode;
-	
+
 	result = dns_rdataset_first(&rdataset);
  	if (result != ISC_R_SUCCESS)
 		goto freenode;
@@ -178,7 +178,7 @@ dns_difftuple_create(isc_mem_t *mctx,
 	unsigned char *datap;
 
 	REQUIRE(tp != NULL && *tp == NULL);
-	
+
 	/*
 	 * Create a new tuple.  The variable-size wire-format name data and
 	 * rdata immediately follow the dns_difftuple_t structure
@@ -192,13 +192,13 @@ dns_difftuple_create(isc_mem_t *mctx,
 	t->op = op;
 
 	datap = (unsigned char *)(t + 1);
-	
+
 	memcpy(datap, name->ndata, name->length);
 	dns_name_init(&t->name, NULL);
 	dns_name_clone(name, &t->name);
 	t->name.ndata = datap;
 	datap += name->length;
-	
+
 	t->ttl = ttl;
 
 	memcpy(datap, rdata->data, rdata->length);
@@ -207,7 +207,7 @@ dns_difftuple_create(isc_mem_t *mctx,
 	t->rdata.rdclass = rdata->rdclass;
 	t->rdata.type = rdata->type;
 	datap += rdata->length;
-	
+
 	ISC_LINK_INIT(&t->rdata, link);
 	t->magic = DNS_DIFFTUPLE_MAGIC;
 
@@ -276,9 +276,9 @@ dns_diff_appendminimal(dns_diff_t *diff, dns_difftuple_t **tuplep)
 	 * that we never delete nonexistent data or add existing
 	 * data).
 	 *
-	 * If we find an old update of the same kind as 
+	 * If we find an old update of the same kind as
 	 * the one we are doing, there must be a programming
-	 * error.  We report it but try to continue anyway. 
+	 * error.  We report it but try to continue anyway.
 	 */
 	for (ot = ISC_LIST_HEAD(diff->tuples); ot != NULL;
 	     ot = next_ot)
@@ -288,7 +288,7 @@ dns_diff_appendminimal(dns_diff_t *diff, dns_difftuple_t **tuplep)
 		    dns_rdata_compare(&ot->rdata, &(*tuplep)->rdata) == 0 &&
 		    ot->ttl == (*tuplep)->ttl)
 		{
-			ISC_LIST_UNLINK(diff->tuples, ot, link); 
+			ISC_LIST_UNLINK(diff->tuples, ot, link);
 			if ((*tuplep)->op == ot->op) {
 				UNEXPECTED_ERROR(__FILE__, __LINE__,
 					 "unexpected non-minimal diff");
@@ -308,16 +308,16 @@ dns_diff_appendminimal(dns_diff_t *diff, dns_difftuple_t **tuplep)
 	ENSURE(*tuplep == NULL);
 }
 
-isc_result_t 
+isc_result_t
 dns_diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver)
 {
 	dns_difftuple_t *t;
 	dns_dbnode_t *node = NULL;
 	isc_result_t result;
-	
+
 	REQUIRE(DNS_DIFF_VALID(diff));
 	REQUIRE(DNS_DB_VALID(db));
-	
+
 	t = ISC_LIST_HEAD(diff->tuples);
 	while (t != NULL) {
 		dns_name_t *name;
@@ -326,10 +326,10 @@ dns_diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver)
 		name = &t->name;
 		/*
 		 * Find the node.
-		 * We create the node if it does not exist.  
-		 * This will cause an empty node to be created if the diff 
+		 * We create the node if it does not exist.
+		 * This will cause an empty node to be created if the diff
 		 * contains a deletion of an RR at a nonexistent name,
-		 * but such diffs should never be created in the first 
+		 * but such diffs should never be created in the first
 		 * place.
 		 */
 		node = NULL;
@@ -343,10 +343,10 @@ dns_diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver)
 
 			op = t->op;
 			type = t->rdata.type;
-			covers = rdata_covers(&t->rdata); 
+			covers = rdata_covers(&t->rdata);
 
 			/*
-			 * Collect a contiguous set of updates with 
+			 * Collect a contiguous set of updates with
 			 * the same operation (add/delete) and RR type
 			 * into a single rdatalist so that the
 			 * database rrset merging/subtraction code
@@ -438,8 +438,8 @@ dns_diff_apply(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *ver)
 }
 
 /* XXX this duplicates lots of code in dns_diff_apply(). */
-   
-isc_result_t 
+
+isc_result_t
 dns_diff_load(dns_diff_t *diff, dns_addrdatasetfunc_t addfunc,
 	      void *add_private)
 {
@@ -447,7 +447,7 @@ dns_diff_load(dns_diff_t *diff, dns_addrdatasetfunc_t addfunc,
 	isc_result_t result;
 
 	REQUIRE(DNS_DIFF_VALID(diff));
-	
+
 	t = ISC_LIST_HEAD(diff->tuples);
 	while (t != NULL) {
 		dns_name_t *name;
@@ -517,7 +517,7 @@ dns_diff_sort(dns_diff_t *diff, dns_diff_compare_func *compare) {
 	dns_difftuple_t **v;
 	dns_difftuple_t *p;
 	REQUIRE(DNS_DIFF_VALID(diff));
-	
+
 	for (p = ISC_LIST_HEAD(diff->tuples);
 	     p != NULL;
 	     p = ISC_LIST_NEXT(p, link))
@@ -556,7 +556,7 @@ diff_tuple_tordataset(dns_difftuple_t *t, dns_rdatalist_t *rdl,
 	REQUIRE(DNS_DIFFTUPLE_VALID(t));
 	REQUIRE(rdl != NULL);
 	REQUIRE(rds != NULL);
-	
+
 	rdl->type = t->rdata.type;
 	rdl->rdclass = t->rdata.rdclass;
 	rdl->ttl = t->ttl;
@@ -587,7 +587,7 @@ dns_diff_print(dns_diff_t *diff, FILE *file) {
 		isc_region_t r;
 
 		dns_rdatalist_t rdl;
-		dns_rdataset_t rds;		
+		dns_rdataset_t rds;
 
 		result = diff_tuple_tordataset(t, &rdl, &rds);
 		if (result != ISC_R_SUCCESS) {
@@ -633,7 +633,7 @@ dns_diff_print(dns_diff_t *diff, FILE *file) {
 					      t->op == DNS_DIFFOP_ADD ?
 					      "add" : "del",
 					      (int) r.length, (char *) r.base);
-		} else 
+		} else
 			goto cleanup;
 	}
 	result = ISC_R_SUCCESS;
@@ -655,25 +655,25 @@ dns_diff_print(dns_diff_t *diff, FILE *file) {
  *
  *   - The index.  This is an unordered array of index entries
  *     of type journal_rawpos_t giving the locations
- *     of some arbitrary subset of the journal's addressable 
- *     transactions.  The index entries are used as hints to 
- *     speed up the process of locating a transaction with a given 
+ *     of some arbitrary subset of the journal's addressable
+ *     transactions.  The index entries are used as hints to
+ *     speed up the process of locating a transaction with a given
  *     serial number.  Unused index entries have an "offset"
- *     field of zero.  The size of the index can vary between 
+ *     field of zero.  The size of the index can vary between
  *     journal files, but does not change during the lifetime
  *     of a file.  The size can be zero.
  *
  *   - The journal data.  This  consists of one or more transactions.
  *     Each transaction begins with a transaction header of type
- *     journal_rawxhdr_t.  The transaction header is followed by a 
- *     sequence of RRs, similar in structure to an IXFR difference 
+ *     journal_rawxhdr_t.  The transaction header is followed by a
+ *     sequence of RRs, similar in structure to an IXFR difference
  *     sequence (RFC1995).  That is, the pre-transaction SOA,
- *     zero or more other deleted RRs, the post-transaction SOA, 
- *     and zero or more other added RRs.  Unlike in IXFR, each RR 
+ *     zero or more other deleted RRs, the post-transaction SOA,
+ *     and zero or more other added RRs.  Unlike in IXFR, each RR
  *     is prefixed with a 32-bit length.
  *
  *     The journal data part grows as new transactions are
- *     appended to the file.  Only those transactions 
+ *     appended to the file.  Only those transactions
  *     whose serial number is current-(2^31-1) to current
  *     are considered "addressable" and may be pointed
  *     to from the header or index.  They may be preceded
@@ -683,7 +683,7 @@ dns_diff_print(dns_diff_t *diff, FILE *file) {
  *     the "end" position in the header.  The latter will
  *     be overwritten when new transactions are added.
  */
- 
+
 /*
  * On-disk representation of a "pointer" to a journal entry.
  * These are used in the journal header to locate the beginning
@@ -720,7 +720,7 @@ typedef union {
 		/* Position of the first addressable transaction */
 		journal_rawpos_t 	begin;
 		/* Position of the next (yet nonexistent) transaction. */
-		journal_rawpos_t 	end;	    
+		journal_rawpos_t 	end;
 		/* Number of index entries following the header. */
 		unsigned char 		index_size[4];
 	} h;
@@ -770,8 +770,8 @@ typedef struct {
 
 typedef struct {
 	isc_uint32_t	size;
-	isc_uint32_t	serial0;	
-	isc_uint32_t	serial1;	
+	isc_uint32_t	serial0;
+	isc_uint32_t	serial1;
 } journal_xhdr_t;
 
 /*
@@ -788,11 +788,11 @@ typedef struct {
  *
  * The header starts with the magic string ";BIND LOG V9\n"
  * to identify the file as a BIND 9 journal file.  An ASCII
- * identification string is used rather than a binary magic 
+ * identification string is used rather than a binary magic
  * number to be consistent with BIND 8 (BIND 8 journal files
  * are ASCII text files).
  */
-   
+
 static journal_header_t
 initial_journal_header = { ";BIND LOG V9\n", { 0, 0 }, { 0, 0 }, 0 };
 
@@ -822,7 +822,7 @@ struct dns_journal {
 		unsigned int	n_soa;		/* Number of SOAs seen */
 		journal_pos_t	pos[2];		/* Begin/end position */
 	} x;
-	
+
 	/* Iteration state (when reading). */
 	struct {
 		/* These define the part of the journal we iterate over. */
@@ -862,7 +862,7 @@ static void
 journal_header_decode(journal_rawheader_t *raw, journal_header_t *cooked) {
 	INSIST(sizeof(cooked->format) == sizeof(raw->h.format));
 	memcpy(cooked->format, raw->h.format, sizeof(cooked->format));
-	journal_pos_decode(&raw->h.begin, &cooked->begin); 
+	journal_pos_decode(&raw->h.begin, &cooked->begin);
 	journal_pos_decode(&raw->h.end, &cooked->end);
 	cooked->index_size = decode_uint32(raw->h.index_size);
 }
@@ -872,7 +872,7 @@ journal_header_encode(journal_header_t *cooked, journal_rawheader_t *raw) {
 	INSIST(sizeof(cooked->format) == sizeof(raw->h.format));
 	memset(raw->pad, 0, sizeof(raw->pad));
 	memcpy(raw->h.format, cooked->format, sizeof(raw->h.format));
-	journal_pos_encode(&raw->h.begin, &cooked->begin); 
+	journal_pos_encode(&raw->h.begin, &cooked->begin);
 	journal_pos_encode(&raw->h.end, &cooked->end);
 	encode_uint32(cooked->index_size, raw->h.index_size);
 }
@@ -922,7 +922,7 @@ journal_write(dns_journal_t *j, void *mem, size_t nbytes) {
 			      j->filename, isc_result_totext(result));
 		return (ISC_R_UNEXPECTED);
 	}
-	j->offset += nbytes;	
+	j->offset += nbytes;
 	return (ISC_R_SUCCESS);
 }
 
@@ -949,7 +949,7 @@ journal_fsync(dns_journal_t *j) {
 /*
  * Read/write a transaction header at the current file position.
  */
-   
+
 static isc_result_t
 journal_read_xhdr(dns_journal_t *j, journal_xhdr_t *xhdr) {
 	journal_rawxhdr_t raw;
@@ -978,7 +978,7 @@ journal_write_xhdr(dns_journal_t *j, isc_uint32_t size,
 /*
  * Read an RR header at the current file position.
  */
-   
+
 static isc_result_t
 journal_read_rrhdr(dns_journal_t *j, journal_rrhdr_t *rrhdr) {
 	journal_rawrrhdr_t raw;
@@ -1001,7 +1001,7 @@ journal_file_create(isc_mem_t *mctx, const char *filename) {
 	void *mem; /* Memory for temporary index image. */
 
 	INSIST(sizeof(journal_rawheader_t) == JOURNAL_HEADER_SIZE);
-	
+
 	result = isc_stdio_open(filename, "w", &fp);
 	if (result != ISC_R_SUCCESS) {
 		isc_log_write(JOURNAL_COMMON_LOGARGS, ISC_LOG_ERROR,
@@ -1032,12 +1032,12 @@ journal_file_create(isc_mem_t *mctx, const char *filename) {
 				 "%s: write: %s",
 				 filename, isc_result_totext(result));
 		(void)isc_stdio_close(fp);
-		(void)isc_file_remove(filename);		
-		isc_mem_put(mctx, mem, size); 
+		(void)isc_file_remove(filename);
+		isc_mem_put(mctx, mem, size);
 		return (ISC_R_UNEXPECTED);
 	}
-	isc_mem_put(mctx, mem, size); 	
-	
+	isc_mem_put(mctx, mem, size);
+
 	result = isc_stdio_close(fp);
 	if (result != ISC_R_SUCCESS) {
 		isc_log_write(JOURNAL_COMMON_LOGARGS, ISC_LOG_ERROR,
@@ -1049,7 +1049,7 @@ journal_file_create(isc_mem_t *mctx, const char *filename) {
 
 	return (ISC_R_SUCCESS);
 }
-				    
+
 
 isc_result_t
 dns_journal_open(isc_mem_t *mctx, const char *filename, isc_boolean_t write,
@@ -1058,12 +1058,12 @@ dns_journal_open(isc_mem_t *mctx, const char *filename, isc_boolean_t write,
 	isc_result_t result;
 	journal_rawheader_t rawheader;
 	dns_journal_t *j;
-	
+
 	INSIST(journalp != NULL && *journalp == NULL);
 	j = isc_mem_get(mctx, sizeof(*j));
 	if (j == NULL)
 		return (ISC_R_NOMEMORY);
-	
+
 	j->mctx = mctx;
 	j->state = JOURNAL_STATE_INVALID;
 	j->fp = NULL;
@@ -1101,7 +1101,7 @@ dns_journal_open(isc_mem_t *mctx, const char *filename, isc_boolean_t write,
 	/*
 	 * Set magic early so that seek/read can succeed.
 	 */
-	j->magic = DNS_JOURNAL_MAGIC; 
+	j->magic = DNS_JOURNAL_MAGIC;
 
 	CHECK(journal_seek(j, 0));
 	CHECK(journal_read(j, &rawheader, sizeof(rawheader)));
@@ -1126,7 +1126,7 @@ dns_journal_open(isc_mem_t *mctx, const char *filename, isc_boolean_t write,
 			      j->filename);
 		FAIL(ISC_R_UNEXPECTED);
 	}
-	
+
 	/*
 	 * If there is an index, read the raw index into a dynamically
 	 * allocated buffer and then convert it into a cooked index.
@@ -1135,14 +1135,14 @@ dns_journal_open(isc_mem_t *mctx, const char *filename, isc_boolean_t write,
 		unsigned int i;
 		unsigned int rawbytes;
 		unsigned char *p;
-			
+
 		rawbytes = j->header.index_size * sizeof(journal_rawpos_t);
 		j->rawindex = isc_mem_get(mctx, rawbytes);
 		if (j->rawindex == NULL)
 			FAIL(ISC_R_NOMEMORY);
-		
+
 		CHECK(journal_read(j, j->rawindex, rawbytes));
-		
+
 		j->index = isc_mem_get(mctx, j->header.index_size *
 				       sizeof(journal_pos_t));
 		if (j->index == NULL)
@@ -1164,7 +1164,7 @@ dns_journal_open(isc_mem_t *mctx, const char *filename, isc_boolean_t write,
 	 */
 	dns_name_init(&j->it.name, NULL);
 	dns_rdata_init(&j->it.rdata);
-	
+
 	/*
 	 * Set up empty initial buffers for uncheched and checked
 	 * wire format RR data.  They will be reallocated
@@ -1176,7 +1176,7 @@ dns_journal_open(isc_mem_t *mctx, const char *filename, isc_boolean_t write,
 
 	j->state =
 		write ? JOURNAL_STATE_WRITE : JOURNAL_STATE_READ;
-	
+
 	*journalp = j;
 	return (ISC_R_SUCCESS);
 
@@ -1189,7 +1189,7 @@ dns_journal_open(isc_mem_t *mctx, const char *filename, isc_boolean_t write,
 	}
 	if (j->fp != NULL)
 		(void)isc_stdio_close(j->fp);
-	isc_mem_put(j->mctx, j, sizeof(*j));		
+	isc_mem_put(j->mctx, j, sizeof(*j));
 	return (result);
 }
 
@@ -1205,7 +1205,7 @@ dns_journal_open(isc_mem_t *mctx, const char *filename, isc_boolean_t write,
  * server receiving the IXFR - it may help reduce the amount of
  * rdataset merging it has to do.
  */
-static int 
+static int
 ixfr_order(const void *av, const void *bv) {
 	dns_difftuple_t * const *ap = av;
 	dns_difftuple_t * const *bp = bv;
@@ -1216,7 +1216,7 @@ ixfr_order(const void *av, const void *bv) {
 	r = (b->op == DNS_DIFFOP_DEL) - (a->op == DNS_DIFFOP_DEL);
 	if (r != 0)
 		return (r);
-	
+
 	r = (b->rdata.type == dns_rdatatype_soa) -
 		(a->rdata.type == dns_rdatatype_soa);
 	if (r != 0)
@@ -1228,7 +1228,7 @@ ixfr_order(const void *av, const void *bv) {
 
 /*
  * Advance '*pos' to the next journal transaction.
- * 
+ *
  * Requires:
  *	*pos refers to a valid journal transaction.
  *
@@ -1238,7 +1238,7 @@ ixfr_order(const void *av, const void *bv) {
  *
  * Returns one of:
  *
- *    ISC_R_SUCCESS 
+ *    ISC_R_SUCCESS
  *    ISC_R_NOMORE 	*pos pointed at the last transaction
  *    Other results due to file errors are possible.
  */
@@ -1247,7 +1247,7 @@ journal_next(dns_journal_t *j, journal_pos_t *pos) {
 	isc_result_t result;
 	journal_xhdr_t xhdr;
 	REQUIRE(DNS_JOURNAL_VALID(j));
-	
+
 	result = journal_seek(j, pos->offset);
 	if (result != ISC_R_SUCCESS)
 		return (result);
@@ -1278,9 +1278,9 @@ journal_next(dns_journal_t *j, journal_pos_t *pos) {
 	    < pos->offset) {
 		isc_log_write(JOURNAL_COMMON_LOGARGS, ISC_LOG_ERROR,
 			      "%s: offset too large", j->filename);
-		return (ISC_R_UNEXPECTED);		
+		return (ISC_R_UNEXPECTED);
 	}
-	
+
 	pos->offset += sizeof(journal_rawxhdr_t) + xhdr.size;
 	pos->serial = xhdr.serial1;
 	return (ISC_R_SUCCESS);
@@ -1311,7 +1311,7 @@ index_find(dns_journal_t *j, isc_uint32_t serial, journal_pos_t *best_guess) {
  * the odd-numbered entries and compacting the others into the first
  * half of the index.  This decimates old index entries exponentially
  * over time, so that the index always contains a much larger fraction
- * of recent serial numbers than of old ones.  This is deliberate - 
+ * of recent serial numbers than of old ones.  This is deliberate -
  * most index searches are for outgoing IXFR, and IXFR tends to request
  * recent versions more often than old ones.
  */
@@ -1341,7 +1341,7 @@ index_add(dns_journal_t *j, journal_pos_t *pos) {
 			k++;
 		}
 	}
-	INSIST(i < j->header.index_size); 
+	INSIST(i < j->header.index_size);
 	INSIST(! POS_VALID(j->index[i]));
 
 	/*
@@ -1372,24 +1372,24 @@ index_invalidate(dns_journal_t *j, isc_uint32_t serial) {
  * If found, store its position at '*pos' and return ISC_R_SUCCESS.
  *
  * If 'serial' is current (= the ending serial number of the
- * last transaction in the journal), set '*pos' to 
+ * last transaction in the journal), set '*pos' to
  * the position immediately following the last transaction and
  * return ISC_R_SUCCESS.
  *
- * If 'serial' is within the range of addressable serial numbers 
+ * If 'serial' is within the range of addressable serial numbers
  * covered by the journal but that particular serial number is missing
  * (from the journal, not just from the index), return ISC_R_NOTFOUND.
  *
  * If 'serial' is outside the range of addressable serial numbers
  * covered by the journal, return ISC_R_RANGE.
- * 
+ *
  */
 static isc_result_t
 journal_find(dns_journal_t *j, isc_uint32_t serial, journal_pos_t *pos) {
 	isc_result_t result;
 	journal_pos_t current_pos;
 	REQUIRE(DNS_JOURNAL_VALID(j));
-	
+
 	if (DNS_SERIAL_GT(j->header.begin.serial, serial))
 		return (ISC_R_RANGE);
 	if (DNS_SERIAL_GT(serial, j->header.end.serial))
@@ -1401,7 +1401,7 @@ journal_find(dns_journal_t *j, isc_uint32_t serial, journal_pos_t *pos) {
 
 	current_pos = j->header.begin;
 	index_find(j, serial, ¤t_pos);
-	
+
 	while (current_pos.serial != serial) {
 		if (DNS_SERIAL_GT(current_pos.serial, serial))
 			return (ISC_R_NOTFOUND);
@@ -1418,10 +1418,10 @@ dns_journal_begin_transaction(dns_journal_t *j) {
 	isc_uint32_t offset;
 	isc_result_t result;
 	journal_rawxhdr_t hdr;
-		
+
 	REQUIRE(DNS_JOURNAL_VALID(j));
 	REQUIRE(j->state == JOURNAL_STATE_WRITE);
-	
+
 	/*
 	 * Find the file offset where the new transaction should
 	 * be written, and seek there.
@@ -1437,7 +1437,7 @@ dns_journal_begin_transaction(dns_journal_t *j) {
 	j->x.n_soa = 0;
 
 	CHECK(journal_seek(j, offset));
-	
+
 	/*
 	 * Write a dummy transaction header of all zeroes to reserve
 	 * space.  It will be filled in when the transaction is
@@ -1451,7 +1451,7 @@ dns_journal_begin_transaction(dns_journal_t *j) {
 	result = ISC_R_SUCCESS;
  failure:
 	return (result);
-}	
+}
 
 isc_result_t
 dns_journal_writediff(dns_journal_t *j, dns_diff_t *diff) {
@@ -1461,10 +1461,10 @@ dns_journal_writediff(dns_journal_t *j, dns_diff_t *diff) {
 	unsigned int size;
 	isc_result_t result;
 	isc_region_t used;
-	
+
 	REQUIRE(DNS_DIFF_VALID(diff));
 	REQUIRE(j->state == JOURNAL_STATE_TRANSACTION);
-	
+
 	isc_log_write(JOURNAL_DEBUG_LOGARGS(3), "writing to journal");
 	dns_diff_print(diff, NULL);
 
@@ -1480,7 +1480,7 @@ dns_journal_writediff(dns_journal_t *j, dns_diff_t *diff) {
 			if (j->x.n_soa < 2)
 				j->x.pos[j->x.n_soa].serial =
 					dns_soa_getserial(&t->rdata);
-			j->x.n_soa++; 
+			j->x.n_soa++;
 		}
 		size += sizeof(journal_rawrrhdr_t);
 		size += t->name.length; /* XXX should have access macro? */
@@ -1491,7 +1491,7 @@ dns_journal_writediff(dns_journal_t *j, dns_diff_t *diff) {
 	mem = isc_mem_get(j->mctx, size);
 	if (mem == NULL)
 		return (ISC_R_NOMEMORY);
-	
+
 	isc_buffer_init(&buffer, mem, size);
 
 	/*
@@ -1517,12 +1517,12 @@ dns_journal_writediff(dns_journal_t *j, dns_diff_t *diff) {
 		INSIST(isc_buffer_availablelength(&buffer) >= t->rdata.length);
 		isc_buffer_putmem(&buffer, t->rdata.data, t->rdata.length);
 	}
-	
+
 	isc_buffer_usedregion(&buffer, &used);
 	INSIST(used.length == size);
 
 	j->x.pos[1].offset += used.length;
-		
+
 	/*
 	 * Write the buffer contents to the journal file.
 	 */
@@ -1534,17 +1534,17 @@ dns_journal_writediff(dns_journal_t *j, dns_diff_t *diff) {
 	if (mem != NULL)
 		isc_mem_put(j->mctx, mem, size);
 	return (result);
-	
+
 }
 
 isc_result_t
 dns_journal_commit(dns_journal_t *j) {
 	isc_result_t result;
 	journal_rawheader_t rawheader;
-	
+
 	REQUIRE(DNS_JOURNAL_VALID(j));
 	REQUIRE(j->state == JOURNAL_STATE_TRANSACTION);
-	
+
 	/*
 	 * Perform some basic consistency checks.
 	 */
@@ -1560,7 +1560,7 @@ dns_journal_commit(dns_journal_t *j) {
 	{
 		isc_log_write(JOURNAL_COMMON_LOGARGS, ISC_LOG_ERROR,
 			      "malformed transaction: serial number "
-			      "would decrease"); 
+			      "would decrease");
 		return (ISC_R_UNEXPECTED);
 	}
 	if (! JOURNAL_EMPTY(&j->header)) {
@@ -1575,7 +1575,7 @@ dns_journal_commit(dns_journal_t *j) {
 			return (ISC_R_UNEXPECTED);
 		}
 	}
-	
+
 	/*
 	 * Some old journal entries may become non-addressable
 	 * when we increment the current serial number.  Purge them
@@ -1615,10 +1615,10 @@ dns_journal_commit(dns_journal_t *j) {
 		j->header.begin = j->x.pos[0];
 	}
 	j->header.end = j->x.pos[1];
-	journal_header_encode(&j->header, &rawheader);	
+	journal_header_encode(&j->header, &rawheader);
 	CHECK(journal_seek(j, 0));
 	CHECK(journal_write(j, &rawheader, sizeof(rawheader)));
-	
+
 	/*
 	 * Update the index.
 	 */
@@ -1634,7 +1634,7 @@ dns_journal_commit(dns_journal_t *j) {
 		unsigned int rawbytes;
 
 		rawbytes = j->header.index_size * sizeof(journal_rawpos_t);
-		
+
 		p = j->rawindex;
 		for (i = 0; i < j->header.index_size; i++) {
 			encode_uint32(j->index[i].serial, p);
@@ -1643,7 +1643,7 @@ dns_journal_commit(dns_journal_t *j) {
 			p += 4;
 		}
 		INSIST(p == j->rawindex + rawbytes);
-		
+
 		CHECK(journal_write(j, j->index, rawbytes));
 	}
 
@@ -1656,7 +1656,7 @@ dns_journal_commit(dns_journal_t *j) {
 	 * We no longer have a transaction open.
 	 */
 	j->state = JOURNAL_STATE_WRITE;
-	
+
 	result = ISC_R_SUCCESS;
 
  failure:
@@ -1700,7 +1700,7 @@ dns_journal_destroy(dns_journal_t **journalp) {
 	isc_mem_put(j->mctx, j, sizeof(*j));
 	*journalp = NULL;
 }
-	
+
 /*
  * Roll the open journal 'j' into the database 'db'.
  * A new database version will be created.
@@ -1720,12 +1720,12 @@ roll_forward(dns_journal_t *j, dns_db_t *db) {
 	dns_diff_t diff;
 	unsigned int n_soa = 0;
 	unsigned int n_put = 0;
-	
+
 	REQUIRE(DNS_JOURNAL_VALID(j));
 	REQUIRE(DNS_DB_VALID(db));
-	
+
 	dns_diff_init(j->mctx, &diff);
-	
+
 	/*
 	 * Set up empty initial buffers for uncheched and checked
 	 * wire format transaction data.  They will be reallocated
@@ -1772,11 +1772,11 @@ roll_forward(dns_journal_t *j, dns_db_t *db) {
 		isc_uint32_t ttl;
 		dns_rdata_t *rdata;
 		dns_difftuple_t *tuple = NULL;
-		
+
 		name = NULL;
 		rdata = NULL;
 		dns_journal_current_rr(j, &name, &ttl, &rdata);
-		
+
 		if (rdata->type == dns_rdatatype_soa)
 			n_soa++;
 
@@ -1813,7 +1813,7 @@ roll_forward(dns_journal_t *j, dns_db_t *db) {
 		CHECK(dns_diff_apply(&diff, db, ver));
 		dns_diff_clear(&diff);
 	}
-	
+
  failure:
 	if (ver != NULL)
 		dns_db_closeversion(db, &ver, result == ISC_R_SUCCESS ?
@@ -1825,7 +1825,7 @@ roll_forward(dns_journal_t *j, dns_db_t *db) {
 		isc_mem_put(j->mctx, target.base, target.length);
 
 	dns_diff_clear(&diff);
-	
+
 	return (result);
 }
 
@@ -1836,7 +1836,7 @@ dns_journal_rollforward(isc_mem_t *mctx, dns_db_t *db, const char *filename) {
 
 	REQUIRE(DNS_DB_VALID(db));
 	REQUIRE(filename != NULL);
-	
+
 	j = NULL;
 	result = dns_journal_open(mctx, filename, ISC_FALSE, &j);
 	if (result == ISC_R_NOTFOUND) {
@@ -1864,7 +1864,7 @@ dns_journal_print(isc_mem_t *mctx, const char *filename, FILE *file) {
 	dns_diff_t diff;
 	unsigned int n_soa = 0;
 	unsigned int n_put = 0;
-	
+
 	REQUIRE(filename != NULL);
 
 	j = NULL;
@@ -1879,9 +1879,9 @@ dns_journal_print(isc_mem_t *mctx, const char *filename, FILE *file) {
 			      "journal open failure");
 		return (result);
 	}
-	
+
 	dns_diff_init(j->mctx, &diff);
-	
+
 	/*
 	 * Set up empty initial buffers for uncheched and checked
 	 * wire format transaction data.  They will be reallocated
@@ -1903,11 +1903,11 @@ dns_journal_print(isc_mem_t *mctx, const char *filename, FILE *file) {
 		isc_uint32_t ttl;
 		dns_rdata_t *rdata;
 		dns_difftuple_t *tuple = NULL;
-		
+
 		name = NULL;
 		rdata = NULL;
 		dns_journal_current_rr(j, &name, &ttl, &rdata);
-		
+
 		if (rdata->type == dns_rdatatype_soa)
 			n_soa++;
 
@@ -1941,7 +1941,7 @@ dns_journal_print(isc_mem_t *mctx, const char *filename, FILE *file) {
 		dns_diff_clear(&diff);
 	}
 	goto cleanup;
-	
+
  failure:
 	isc_log_write(JOURNAL_COMMON_LOGARGS, ISC_LOG_ERROR,
 		      "%s: cannot print: journal file corrupt", j->filename);
@@ -1954,7 +1954,7 @@ dns_journal_print(isc_mem_t *mctx, const char *filename, FILE *file) {
 
 	dns_diff_clear(&diff);
 	dns_journal_destroy(&j);
-	
+
 	return (result);
 }
 
@@ -2013,11 +2013,11 @@ dns_journal_iter_init(dns_journal_t *j,
 		      isc_uint32_t begin_serial, isc_uint32_t end_serial)
 {
 	isc_result_t result;
-	
-	CHECK(journal_find(j, begin_serial, &j->it.bpos)); 
+
+	CHECK(journal_find(j, begin_serial, &j->it.bpos));
 	INSIST(j->it.bpos.serial == begin_serial);
 
-	CHECK(journal_find(j, end_serial, &j->it.epos)); 
+	CHECK(journal_find(j, end_serial, &j->it.epos));
 	INSIST(j->it.epos.serial == end_serial);
 
 	result = ISC_R_SUCCESS;
@@ -2031,8 +2031,8 @@ isc_result_t
 dns_journal_first_rr(dns_journal_t *j) {
 	isc_result_t result;
 
-	/* 
-	 * Seek to the beginning of the first transaction we are 
+	/*
+	 * Seek to the beginning of the first transaction we are
 	 * interested in.
 	 */
 	CHECK(journal_seek(j, j->it.bpos.offset));
@@ -2042,7 +2042,7 @@ dns_journal_first_rr(dns_journal_t *j) {
 	j->it.xpos = 0;	  /* ...and haven't used any of it. */
 
 	return (read_one_rr(j));
-	
+
  failure:
 	return (result);
 }
@@ -2050,7 +2050,7 @@ dns_journal_first_rr(dns_journal_t *j) {
 static isc_result_t
 read_one_rr(dns_journal_t *j) {
 	isc_result_t result;
-	
+
 	dns_rdatatype_t rdtype;
 	dns_rdataclass_t rdclass;
 	unsigned int rdlen;
@@ -2100,25 +2100,25 @@ read_one_rr(dns_journal_t *j) {
 				 "(%d bytes)", j->filename, rrhdr.size);
 		FAIL(ISC_R_UNEXPECTED);
 	}
-	
+
 	CHECK(size_buffer(j->mctx, &j->it.source, rrhdr.size));
 	CHECK(journal_read(j, j->it.source.base, rrhdr.size));
 	isc_buffer_add(&j->it.source, rrhdr.size);
 
-	/* 
+	/*
 	 * The target buffer is made the same size
 	 * as the source buffer, with the assumption that when
 	 * no compression in present, the output of dns_*_fromwire()
 	 * is no larger than the input.
 	 */
 	CHECK(size_buffer(j->mctx, &j->it.target, rrhdr.size));
-	
+
 	/*
 	 * Parse the owner name.  We don't know where it
 	 * ends yet, so we make the entire "remaining"
 	 * part of the buffer "active".
 	 */
-	isc_buffer_setactive(&j->it.source, 
+	isc_buffer_setactive(&j->it.source,
 			     j->it.source.used - j->it.source.current);
 	CHECK(dns_name_fromwire(&j->it.name, &j->it.source,
 				&j->it.dctx, ISC_FALSE, &j->it.target));
@@ -2128,7 +2128,7 @@ read_one_rr(dns_journal_t *j) {
 	 */
 	if (isc_buffer_remaininglength(&j->it.source) < 10)
 		FAIL(DNS_R_FORMERR);
-	
+
 	rdtype = isc_buffer_getuint16(&j->it.source);
 	rdclass = isc_buffer_getuint16(&j->it.source);
 	ttl = isc_buffer_getuint32(&j->it.source);
@@ -2148,7 +2148,7 @@ read_one_rr(dns_journal_t *j) {
 		/* XXX could do additional consistency checks here */
 		j->it.current_serial = dns_soa_getserial(&j->it.rdata);
 	}
-		
+
 	result = ISC_R_SUCCESS;
 
  failure:
@@ -2199,7 +2199,7 @@ get_name_diff(dns_db_t *db, dns_dbversion_t *ver, isc_stdtime_t now,
 	result = dns_dbiterator_current(dbit, &node, name);
 	if (result != ISC_R_SUCCESS)
 		return (result);
-	
+
 	result = dns_db_allrdatasets(db, node, ver, now, &rdsiter);
 	if (result != ISC_R_SUCCESS)
 		goto cleanup_node;
@@ -2234,7 +2234,7 @@ get_name_diff(dns_db_t *db, dns_dbversion_t *ver, isc_stdtime_t now,
 	}
 	if (result != ISC_R_NOMORE)
 		goto cleanup_iterator;
-	
+
 	result = ISC_R_SUCCESS;
 
  cleanup_iterator:
@@ -2279,7 +2279,7 @@ dns_diff_subtract(dns_diff_t diff[2], dns_diff_t *r) {
 		p[1] = ISC_LIST_HEAD(diff[1].tuples);
 		if (p[0] == NULL && p[1] == NULL)
 			break;
-		
+
 		for (i = 0; i < 2; i++)
 			if (p[!i] == NULL) {
 				ISC_LIST_UNLINK(diff[i].tuples, p[i], link);
@@ -2337,11 +2337,11 @@ dns_db_diff(isc_mem_t *mctx,
 
 	db[0] = dba, db[1] = dbb;
 	ver[0] = dbvera, ver[1] = dbverb;
-	
+
 	dns_diff_init(mctx, &diff[0]);
 	dns_diff_init(mctx, &diff[1]);
 	dns_diff_init(mctx, &resultdiff);
-	
+
 	dns_fixedname_init(&fixname[0]);
 	dns_fixedname_init(&fixname[1]);
 
@@ -2366,7 +2366,7 @@ dns_db_diff(isc_mem_t *mctx,
 				have[i] = ISC_TRUE;
 			}
 		}
-		
+
 		if (! have[0] && ! have[1]) {
 			INSIST(ISC_LIST_EMPTY(diff[0].tuples));
 			INSIST(ISC_LIST_EMPTY(diff[1].tuples));
@@ -2382,7 +2382,7 @@ dns_db_diff(isc_mem_t *mctx,
 				goto next;
 			}
 		}
-		
+
 		t = dns_name_compare(dns_fixedname_name(&fixname[0]),
 				     dns_fixedname_name(&fixname[1]));
 		if (t < 0) {
@@ -2419,7 +2419,7 @@ dns_db_diff(isc_mem_t *mctx,
 	INSIST(ISC_LIST_EMPTY(diff[0].tuples));
 	INSIST(ISC_LIST_EMPTY(diff[1].tuples));
 	dns_diff_clear(&resultdiff);
-	
+
  failure:
 	dns_dbiterator_destroy(&dbit[0]);
 	dns_dbiterator_destroy(&dbit[1]);
diff --git a/lib/dns/keytable.c b/lib/dns/keytable.c
index 374b57ced0..ea1a4687a0 100644
--- a/lib/dns/keytable.c
+++ b/lib/dns/keytable.c
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keytable.c,v 1.20 2000/07/27 09:46:09 tale Exp $ */
+/* $Id: keytable.c,v 1.21 2000/08/01 01:22:26 tale Exp $ */
 
 #include 
 
@@ -39,7 +39,7 @@ struct dns_keytable {
 	isc_uint32_t		active_nodes;
 	/* Locked by rwlock. */
 	isc_uint32_t		references;
-	dns_rbt_t		*table; 
+	dns_rbt_t		*table;
 };
 
 #define KEYTABLE_MAGIC			0x4b54626cU	/* KTbl */
@@ -160,7 +160,7 @@ dns_keytable_detach(dns_keytable_t **keytablep) {
 	keytable = *keytablep;
 
 	RWLOCK(&keytable->rwlock, isc_rwlocktype_write);
-	
+
 	INSIST(keytable->references > 0);
 	keytable->references--;
 	LOCK(&keytable->lock);
diff --git a/lib/dns/lib.c b/lib/dns/lib.c
index 67f44d6009..dba4671308 100644
--- a/lib/dns/lib.c
+++ b/lib/dns/lib.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lib.c,v 1.6 2000/07/27 09:46:10 tale Exp $ */
+/* $Id: lib.c,v 1.7 2000/08/01 01:22:27 tale Exp $ */
 
 #include 
 
diff --git a/lib/dns/log.c b/lib/dns/log.c
index 78c80f9512..b79051f6a9 100644
--- a/lib/dns/log.c
+++ b/lib/dns/log.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log.c,v 1.25 2000/07/27 09:46:11 tale Exp $ */
+/* $Id: log.c,v 1.26 2000/08/01 01:22:28 tale Exp $ */
 
 /* Principal Authors: DCL */
 
diff --git a/lib/dns/master.c b/lib/dns/master.c
index b6c0b21baf..5a6aa22c69 100644
--- a/lib/dns/master.c
+++ b/lib/dns/master.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: master.c,v 1.60 2000/07/30 20:28:07 bwelling Exp $ */
+/* $Id: master.c,v 1.61 2000/08/01 01:22:30 tale Exp $ */
 
 #include 
 
@@ -43,7 +43,7 @@
  *
  * RDLSZ reflects the number of different types with the same name expected.
  * RDSZ reflects the number of rdata expected at a give name that can fit into
- * 64k. 
+ * 64k.
  */
 
 #define RDLSZ 32
@@ -55,7 +55,7 @@
 /*
  * Target buffer size and minimum target size.
  * MINTSIZ must be big enough to hold the largest rdata record.
- * 
+ *
  * TSIZ >= MINTSIZ
  */
 #define TSIZ (128*1024)
@@ -63,10 +63,10 @@
  * max message size - header - root - type - class - ttl - rdlen
  */
 #define MINTSIZ (65535 - 12 - 1 - 2 - 2 - 4 - 2)
-/* 
- * Size for tokens in the presentation format, 
+/*
+ * Size for tokens in the presentation format,
  * The largest tokens are the base64 blocks in KEY and CERT records,
- * Largest key allowed is about 1372 bytes but 
+ * Largest key allowed is about 1372 bytes but
  * there is no fixed upper bound on CERT records.
  * 2K is too small for some X.509s, 8K is overkill.
  */
@@ -78,7 +78,7 @@ typedef ISC_LIST(dns_rdatalist_t) rdatalist_head_t;
  * Master file loading state that persists across $INCLUDEs.
  */
 typedef struct {
-	isc_boolean_t 	ttl_known; 
+	isc_boolean_t 	ttl_known;
 	isc_boolean_t 	default_ttl_known;
 	isc_uint32_t 	ttl;
 	isc_uint32_t 	default_ttl;
@@ -177,7 +177,7 @@ loadctx_init(loadctx_t *ctx) {
 	ctx->default_ttl = 0;
 	ctx->warn_1035 = ISC_TRUE;	/* XXX Argument? */
 }
-	     
+
 static isc_result_t
 load(isc_lex_t *lex, dns_name_t *top, dns_name_t *origin,
      dns_rdataclass_t zclass, isc_boolean_t age_ttl,
@@ -200,7 +200,7 @@ load(isc_lex_t *lex, dns_name_t *top, dns_name_t *origin,
 	isc_boolean_t initialws;
 	char *include_file = NULL;
 	isc_token_t token;
-	isc_result_t result = ISC_R_UNEXPECTED; 
+	isc_result_t result = ISC_R_UNEXPECTED;
 	rdatalist_head_t glue_list;
 	rdatalist_head_t current_list;
 	dns_rdatalist_t *this;
@@ -331,7 +331,7 @@ load(isc_lex_t *lex, dns_name_t *top, dns_name_t *origin,
 				if (ttl_offset != 0) {
 					(callbacks->error)(callbacks,
 					   "%s: %s:%lu: $INCLUDE "
-					   "may not be used with $DATE", 
+					   "may not be used with $DATE",
 					   "dns_master_load",
 					   isc_lex_getsourcename(lex),
 					   isc_lex_getsourceline(lex));
@@ -408,10 +408,10 @@ load(isc_lex_t *lex, dns_name_t *top, dns_name_t *origin,
 				ttl_offset = current_time - dump_time;
 				read_till_eol = ISC_TRUE;
 				continue;
-			} else if (strncasecmp(token.value.as_pointer, 
+			} else if (strncasecmp(token.value.as_pointer,
 					       "$", 1) == 0) {
-				(callbacks->error)(callbacks, 
-						   "%s: %s:%lu: " 
+				(callbacks->error)(callbacks,
+						   "%s: %s:%lu: "
 						   "unknown $ directive '%s'",
 						   "dns_master_load",
 						   isc_lex_getsourcename(lex),
@@ -622,7 +622,7 @@ load(isc_lex_t *lex, dns_name_t *top, dns_name_t *origin,
 					   isc_lex_getsourcename(lex),
 					   isc_lex_getsourceline(lex));
 			ctx->warn_1035 = ISC_FALSE;
-		} 
+		}
 
 		if (token.type != isc_tokentype_string) {
 			UNEXPECTED_ERROR(__FILE__, __LINE__,
@@ -630,7 +630,7 @@ load(isc_lex_t *lex, dns_name_t *top, dns_name_t *origin,
 			result = ISC_R_UNEXPECTED;
 			goto cleanup;
 		}
-			
+
 		if (rdclass == 0 &&
 		    dns_rdataclass_fromtext(&rdclass,
 					    &token.value.as_textregion)
@@ -700,7 +700,7 @@ load(isc_lex_t *lex, dns_name_t *top, dns_name_t *origin,
 			/*
 			 * Adjust the TTL for $DATE.  If the RR has already
 			 * expired, ignore it without even parsing the rdata
-			 * part (good for performance, bad for catching 
+			 * part (good for performance, bad for catching
 			 * syntax errors).
 			 */
 			if (ctx->ttl < ttl_offset) {
@@ -850,9 +850,9 @@ load(isc_lex_t *lex, dns_name_t *top, dns_name_t *origin,
 		isc_lex_close(lex);
 		isc_lex_destroy(&lex);
 	}
-	while ((this = ISC_LIST_HEAD(current_list)) != NULL) 
+	while ((this = ISC_LIST_HEAD(current_list)) != NULL)
 		ISC_LIST_UNLINK(current_list, this, link);
-	while ((this = ISC_LIST_HEAD(glue_list)) != NULL) 
+	while ((this = ISC_LIST_HEAD(glue_list)) != NULL)
 		ISC_LIST_UNLINK(glue_list, this, link);
 	if (rdatalist != NULL)
 		isc_mem_put(mctx, rdatalist,
@@ -943,7 +943,7 @@ dns_master_loadbuffer(isc_buffer_t *buffer, dns_name_t *top,
 	REQUIRE(buffer != NULL);
 
 	loadctx_init(&ctx);
-	
+
 	result = isc_lex_create(mctx, TOKENSIZ, &lex);
 	if (result != ISC_R_SUCCESS)
 		return (result);
@@ -1046,7 +1046,7 @@ grow_rdata(int new_len, dns_rdata_t *old, int old_len,
 		}
 		this = ISC_LIST_NEXT(this, link);
 	}
-	
+
 	/*
 	 * Copy glue relinking.
 	 */
diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c
index a6fad91eac..0cb3fae5de 100644
--- a/lib/dns/masterdump.c
+++ b/lib/dns/masterdump.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: masterdump.c,v 1.28 2000/07/27 09:46:13 tale Exp $ */
+/* $Id: masterdump.c,v 1.29 2000/08/01 01:22:31 tale Exp $ */
 
 #include 
 
@@ -59,23 +59,23 @@ struct dns_master_style {
  * define the formatting of the rdata part and are defined in
  * rdata.h.
  */
- 
+
 /* Omit the owner name when possible. */
 #define DNS_STYLEFLAG_OMIT_OWNER	0x00010000U
 
 /*
- * Omit the TTL when possible.  If DNS_STYLEFLAG_TTL is 
+ * Omit the TTL when possible.  If DNS_STYLEFLAG_TTL is
  * also set, this means no TTLs are ever printed
  * because $TTL directives are generated before every
- * change in the TTL.  In this case, no columns need to 
+ * change in the TTL.  In this case, no columns need to
  * be reserved for the TTL.  Master files generated with
  * these options will be rejected by BIND 4.x because it
  * does not recognize the $TTL directive.
  *
- * If DNS_STYLEFLAG_TTL is not also set, the TTL will be 
+ * If DNS_STYLEFLAG_TTL is not also set, the TTL will be
  * omitted when it is equal to the previous TTL.
- * This is correct according to RFC1035, but the 
- * TTLs may be silently misinterpreted by older 
+ * This is correct according to RFC1035, but the
+ * TTLs may be silently misinterpreted by older
  * versions of BIND which use the SOA MINTTL as a
  * default TTL value.
  */
@@ -93,14 +93,14 @@ struct dns_master_style {
  */
 #define DNS_STYLEFLAG_REL_OWNER		0x00100000U
 
-/* Print domain names in RR data in relative form when possible. 
+/* Print domain names in RR data in relative form when possible.
    For this to take effect, DNS_STYLEFLAG_REL_OWNER must also be set. */
 #define DNS_STYLEFLAG_REL_DATA		0x00200000U
 
 
 /*
  * The maximum length of the newline+indentation that is output
- * when inserting a line break in an RR.  This effectively puts an 
+ * when inserting a line break in an RR.  This effectively puts an
  * upper limits on the value of "rdata_column", because if it is
  * very large, the tabs and spaces needed to reach it will not fit.
  */
@@ -126,7 +126,7 @@ typedef struct dns_totext_ctx {
  * Because the TTL is always omitted, and the class is almost always
  * omitted, neither is allocated any columns.
  */
-const dns_master_style_t 
+const dns_master_style_t
 dns_master_style_default = {
 	DNS_STYLEFLAG_OMIT_OWNER |
 	DNS_STYLEFLAG_OMIT_CLASS |
@@ -136,13 +136,13 @@ dns_master_style_default = {
 	DNS_STYLEFLAG_TTL |
 	DNS_STYLEFLAG_COMMENT |
 	DNS_STYLEFLAG_MULTILINE,
-	24, 24, 24, 32, 80, 8 
+	24, 24, 24, 32, 80, 8
 };
 
 /*
  * A style suitable for dns_rdataset_totext().
  */
-dns_master_style_t 
+dns_master_style_t
 dns_masterfile_style_debug = {
         DNS_STYLEFLAG_REL_OWNER,
 	24, 32, 40, 48, 80, 8
@@ -158,7 +158,7 @@ static char tabs[N_TABS+1] = "\t\t\t\t\t\t\t\t\t\t";
 
 
 /*
- * Output tabs and spaces to go from column '*current' to 
+ * Output tabs and spaces to go from column '*current' to
  * column 'to', and update '*current' to reflect the new
  * current column.
  */
@@ -177,7 +177,7 @@ indent(unsigned int *current, unsigned int to, int tabwidth,
 		to = from + 1;
 
 	ntabs = to / tabwidth - from / tabwidth;
-	if (ntabs < 0) 
+	if (ntabs < 0)
 		ntabs = 0;
 
 	if (ntabs > 0) {
@@ -185,7 +185,7 @@ indent(unsigned int *current, unsigned int to, int tabwidth,
 		if (r.length < (unsigned) ntabs)
 			return (ISC_R_NOSPACE);
 		p = r.base;
-	
+
 		t = ntabs;
 		while (t) {
 			int n = t;
@@ -207,7 +207,7 @@ indent(unsigned int *current, unsigned int to, int tabwidth,
 		return (ISC_R_NOSPACE);
 	p = r.base;
 
-	t = nspaces;	
+	t = nspaces;
 	while (t) {
 		int n = t;
 		if (n > N_SPACES)
@@ -216,7 +216,7 @@ indent(unsigned int *current, unsigned int to, int tabwidth,
 		p += n;
 		t -= n;
 	}
-	isc_buffer_add(target, nspaces);	
+	isc_buffer_add(target, nspaces);
 
 	*current = to;
 	return (ISC_R_SUCCESS);
@@ -225,12 +225,12 @@ indent(unsigned int *current, unsigned int to, int tabwidth,
 static isc_result_t
 totext_ctx_init(const dns_master_style_t *style, dns_totext_ctx_t *ctx) {
 	isc_result_t result;
-	
+
 	REQUIRE(style->tab_width != 0);
 
 	ctx->style = *style;
 	ctx->class_printed = ISC_FALSE;
-	
+
 	dns_fixedname_init(&ctx->origin_fixname);
 
 	/*
@@ -243,19 +243,19 @@ totext_ctx_init(const dns_master_style_t *style, dns_totext_ctx_t *ctx) {
 
 		isc_buffer_init(&buf, ctx->linebreak_buf,
 				sizeof(ctx->linebreak_buf));
-		
+
 		isc_buffer_availableregion(&buf, &r);
 		if (r.length < 1)
 			return (DNS_R_TEXTTOOLONG);
 		r.base[0] = '\n';
 		isc_buffer_add(&buf, 1);
 
-		result = indent(&col, ctx->style.rdata_column, 
+		result = indent(&col, ctx->style.rdata_column,
 				ctx->style.tab_width, &buf);
 		/*
 		 * Do not return ISC_R_NOSPACE if the line break string
-		 * buffer is too small, because that would just make 
-		 * dump_rdataset() retry indenfinitely with ever 
+		 * buffer is too small, because that would just make
+		 * dump_rdataset() retry indenfinitely with ever
 		 * bigger target buffers.  That's a different buffer,
 		 * so it won't help.  Use DNS_R_TEXTTOOLONG as a substitute.
 		 */
@@ -263,7 +263,7 @@ totext_ctx_init(const dns_master_style_t *style, dns_totext_ctx_t *ctx) {
 			return (DNS_R_TEXTTOOLONG);
 		if (result != ISC_R_SUCCESS)
 			return (result);
-		
+
 		isc_buffer_availableregion(&buf, &r);
 		if (r.length < 1)
 			return (DNS_R_TEXTTOOLONG);
@@ -277,7 +277,7 @@ totext_ctx_init(const dns_master_style_t *style, dns_totext_ctx_t *ctx) {
 	ctx->origin = NULL;
 	ctx->current_ttl = 0;
 	ctx->current_ttl_valid = ISC_FALSE;
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -309,9 +309,9 @@ rdataset_totext(dns_rdataset_t *rdataset,
 	isc_boolean_t first = ISC_TRUE;
 	isc_uint32_t current_ttl;
 	isc_boolean_t current_ttl_valid;
-	
+
 	REQUIRE(DNS_RDATASET_VALID(rdataset));
-	
+
 	result = dns_rdataset_first(rdataset);
 	REQUIRE(result == ISC_R_SUCCESS);
 
@@ -320,7 +320,7 @@ rdataset_totext(dns_rdataset_t *rdataset,
 
 	do {
 		column = 0;
-		
+
 		/*
 		 * Owner name.
 		 */
@@ -357,7 +357,7 @@ rdataset_totext(dns_rdataset_t *rdataset,
 			column += length;
 
 			/*
-			 * If the $TTL directive is not in use, the TTL we 
+			 * If the $TTL directive is not in use, the TTL we
 			 * just printed becomes the default for subsequent RRs.
 			 */
 			if ((ctx->style.flags & DNS_STYLEFLAG_TTL) == 0) {
@@ -397,7 +397,7 @@ rdataset_totext(dns_rdataset_t *rdataset,
 
 		/*
 		 * Rdata.
-		 */ 
+		 */
 		{
 			dns_rdata_t rdata;
 			isc_region_t r;
@@ -429,10 +429,10 @@ rdataset_totext(dns_rdataset_t *rdataset,
 
 	/*
 	 * Update the ctx state to reflect what we just printed.
-	 * This is done last, only when we are sure we will return 
-	 * success, because this function may be called multiple 
+	 * This is done last, only when we are sure we will return
+	 * success, because this function may be called multiple
 	 * times with increasing buffer sizes until it succeeds,
-	 * and failed attempts must not update the state prematurely. 
+	 * and failed attempts must not update the state prematurely.
 	 */
 	ctx->class_printed = ISC_TRUE;
 	ctx->current_ttl= current_ttl;
@@ -505,7 +505,7 @@ question_totext(dns_rdataset_t *rdataset,
 
 /*
  * Provide a backwards compatible interface for printing a
- * single rdataset or question section.  This is now used 
+ * single rdataset or question section.  This is now used
  * only by wire_test.c.
  */
 isc_result_t
@@ -532,36 +532,36 @@ dns_rdataset_totext(dns_rdataset_t *rdataset,
 	 */
 	if (dns_name_countlabels(owner_name) == 0)
 		owner_name = NULL;
-	
+
 	if (no_rdata_or_ttl)
-		return (question_totext(rdataset, owner_name, &ctx, 
+		return (question_totext(rdataset, owner_name, &ctx,
 					omit_final_dot, target));
 	else
-		return (rdataset_totext(rdataset, owner_name, &ctx, 
+		return (rdataset_totext(rdataset, owner_name, &ctx,
 					omit_final_dot, target));
 }
 
 /*
  * Print an rdataset.  'buffer' is a scratch buffer, which must have been
- * dynamically allocated by the caller.  It must be large enough to 
+ * dynamically allocated by the caller.  It must be large enough to
  * hold the result from dns_ttl_totext().  If more than that is needed,
  * the buffer will be grown automatically.
  */
 
 static isc_result_t
 dump_rdataset(isc_mem_t *mctx, dns_name_t *name, dns_rdataset_t *rdataset,
-	      dns_totext_ctx_t *ctx, 
+	      dns_totext_ctx_t *ctx,
 	      isc_buffer_t *buffer, FILE *f)
 {
 	isc_region_t r;
 	isc_result_t result;
-	
+
 	REQUIRE(buffer->length > 0);
 
 	/*
 	 * Output a $TTL directive if needed.
 	 */
-	
+
 	if ((ctx->style.flags & DNS_STYLEFLAG_TTL) != 0) {
 		if (ctx->current_ttl_valid == ISC_FALSE ||
 		    ctx->current_ttl != rdataset->ttl)
@@ -582,13 +582,13 @@ dump_rdataset(isc_mem_t *mctx, dns_name_t *name, dns_rdataset_t *rdataset,
 			ctx->current_ttl_valid = ISC_TRUE;
 		}
 	}
-	
+
 	isc_buffer_clear(buffer);
 
 	/*
 	 * Generate the text representation of the rdataset into
 	 * the buffer.  If the buffer is too small, grow it.
-	 */ 
+	 */
 	for (;;) {
 		int newlength;
 		void *newmem;
@@ -619,7 +619,7 @@ dump_rdataset(isc_mem_t *mctx, dns_name_t *name, dns_rdataset_t *rdataset,
 				 isc_result_totext(result));
 		return (result);
 	}
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -627,13 +627,13 @@ dump_rdataset(isc_mem_t *mctx, dns_name_t *name, dns_rdataset_t *rdataset,
  * Dump all the rdatasets of a domain name to a master file.
  */
 static isc_result_t
-dump_rdatasets(isc_mem_t *mctx, dns_name_t *name, dns_rdatasetiter_t *rdsiter, 
+dump_rdatasets(isc_mem_t *mctx, dns_name_t *name, dns_rdatasetiter_t *rdsiter,
 	       dns_totext_ctx_t *ctx,
 	       isc_buffer_t *buffer, FILE *f)
 {
 	isc_result_t result;
 	dns_rdataset_t rdataset;
-	
+
 	dns_rdataset_init(&rdataset);
 	result = dns_rdatasetiter_first(rdsiter);
 	while (result == ISC_R_SUCCESS) {
@@ -664,12 +664,12 @@ dump_rdatasets(isc_mem_t *mctx, dns_name_t *name, dns_rdatasetiter_t *rdsiter,
 
 /*
  * Initial size of text conversion buffer.  The buffer is used
- * for several purposes: converting origin names, rdatasets, 
+ * for several purposes: converting origin names, rdatasets,
  * $DATE timestamps, and comment strings for $TTL directives.
  *
  * When converting rdatasets, it is dynamically resized, but
- * when converting origins, timestamps, etc it is not.  Therefore, 
- * the  initial size must large enough to hold the longest possible 
+ * when converting origins, timestamps, etc it is not.  Therefore,
+ * the  initial size must large enough to hold the longest possible
  * text representation of any domain name (for $ORIGIN).
  */
 static const int initial_buffer_length = 1200;
@@ -708,13 +708,13 @@ dns_master_dumptostream(isc_mem_t *mctx, dns_db_t *db,
 	bufmem = isc_mem_get(mctx, initial_buffer_length);
 	if (bufmem == NULL)
 		return (ISC_R_NOMEMORY);
-	
+
 	isc_buffer_init(&buffer, bufmem, initial_buffer_length);
 
 	/*
 	 * If the database has cache semantics, output an RFC2540
 	 * $DATE directive so that the TTLs can be adjusted when
-	 * it is reloaded.  For zones it is not really needed, and 
+	 * it is reloaded.  For zones it is not really needed, and
 	 * it would make the file incompatible with pre-RFC2540
 	 * software, so we omit it in the zone case.
 	 */
@@ -726,7 +726,7 @@ dns_master_dumptostream(isc_mem_t *mctx, dns_db_t *db,
 	}
 
 	result = dns_db_createiterator(db,
-		       ((ctx.style.flags & DNS_STYLEFLAG_REL_OWNER) != 0) ? 
+		       ((ctx.style.flags & DNS_STYLEFLAG_REL_OWNER) != 0) ?
 		           ISC_TRUE : ISC_FALSE,
 		       &dbiter);
 	if (result != ISC_R_SUCCESS)
@@ -773,10 +773,10 @@ dns_master_dumptostream(isc_mem_t *mctx, dns_db_t *db,
 		goto iter_failure;
 
 	result = ISC_R_SUCCESS;
-	
+
  iter_failure:
 	dns_dbiterator_destroy(&dbiter);
-	
+
  create_iter_failure:
 	isc_mem_put(mctx, buffer.base, buffer.length);
 	return (result);
diff --git a/lib/dns/message.c b/lib/dns/message.c
index 53fccf7a98..191085278a 100644
--- a/lib/dns/message.c
+++ b/lib/dns/message.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: message.c,v 1.137 2000/07/27 09:46:15 tale Exp $ */
+/* $Id: message.c,v 1.138 2000/08/01 01:22:32 tale Exp $ */
 
 /***
  *** Imports
@@ -843,7 +843,7 @@ getrdata(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
 		 * the const attribute of a string, for compilers that
 		 * would warn about such things.
 		 */
-		rdata->data = (unsigned char *)1; 
+		rdata->data = (unsigned char *)1;
 		rdata->length = 0;
 		rdata->rdclass = rdclass;
 		rdata->type = rdtype;
@@ -1116,7 +1116,7 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
 		 * established a class.  Do so now.
 		 */
 		if (msg->state == DNS_SECTION_ANY) {
-			if ((msg->opcode != dns_opcode_update) && 
+			if ((msg->opcode != dns_opcode_update) &&
 			    (rdclass == 0 || rdclass == dns_rdataclass_any)) {
 				result = DNS_R_FORMERR;
 				goto cleanup;
@@ -1124,7 +1124,7 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
 			msg->rdclass = rdclass;
 			msg->state = DNS_SECTION_QUESTION;
 		}
-		   
+
 		/*
 		 * If this class is different than the one in the question
 		 * section, bail.
@@ -1192,7 +1192,7 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
 				goto cleanup;
 			}
 		}
-		
+
 		/*
 		 * ... now get ttl and rdatalen, and check buffer.
 		 */
@@ -1205,7 +1205,7 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
 		}
 
 		/*
-		 * Read the rdata from the wire format.  Interpret the 
+		 * Read the rdata from the wire format.  Interpret the
 		 * rdata according to its actual class, even if it had a
 		 * DynDNS meta-class in the packet (unless this is a TSIG).
 		 * Then put the meta-class back into the finished rdata.
@@ -1408,7 +1408,7 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
 		INSIST(free_name == ISC_FALSE);
 		INSIST(free_rdataset == ISC_FALSE);
 	}
-	
+
 	return (ISC_R_SUCCESS);
 
  cleanup:
@@ -1942,7 +1942,7 @@ dns_message_nextname(dns_message_t *msg, dns_section_t section) {
 	REQUIRE(DNS_MESSAGE_VALID(msg));
 	REQUIRE(VALID_NAMED_SECTION(section));
 	REQUIRE(msg->cursors[section] != NULL);
-	
+
 	msg->cursors[section] = ISC_LIST_NEXT(msg->cursors[section], link);
 
 	if (msg->cursors[section] == NULL)
@@ -2226,7 +2226,7 @@ dns_message_getopt(dns_message_t *msg) {
 	 */
 
 	REQUIRE(DNS_MESSAGE_VALID(msg));
-	
+
 	return (msg->opt);
 }
 
@@ -2349,7 +2349,7 @@ dns_message_setquerytsig(dns_message_t *msg, isc_buffer_t *querytsig) {
 	result = dns_message_gettemprdata(msg, &rdata);
 	if (result != ISC_R_SUCCESS)
 		goto cleanup;
-	
+
 	result = dns_message_gettemprdatalist(msg, &list);
 	if (result != ISC_R_SUCCESS)
 		goto cleanup;
@@ -2546,7 +2546,7 @@ dns_message_signer(dns_message_t *msg, dns_name_t *signer) {
 		result = dns_rdata_tostruct(&rdata, &sig, NULL);
 		if (result != ISC_R_SUCCESS)
 			return (result);
-		
+
 		if (msg->verified_sig && msg->sig0status == dns_rcode_noerror)
 			result = ISC_R_SUCCESS;
 		else
diff --git a/lib/dns/name.c b/lib/dns/name.c
index 49210c13ef..ccb91d30c6 100644
--- a/lib/dns/name.c
+++ b/lib/dns/name.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: name.c,v 1.99 2000/07/31 23:09:49 tale Exp $ */
+/* $Id: name.c,v 1.100 2000/08/01 01:22:33 tale Exp $ */
 
 #include 
 
@@ -177,7 +177,7 @@ static struct dns_constname root = {
 	{
 		DNS_NAME_MAGIC,
 		root.const_ndata, 1, 1,
-		DNS_NAMEATTR_READONLY | DNS_NAMEATTR_ABSOLUTE, 
+		DNS_NAMEATTR_READONLY | DNS_NAMEATTR_ABSOLUTE,
 		root.const_offsets, NULL,
 		{(void *)-1, (void *)-1},
 		{NULL, NULL}
@@ -220,7 +220,7 @@ compact(dns_name_t *name, unsigned char *offsets);
 static inline unsigned int
 get_bit(unsigned char *array, unsigned int idx) {
 	unsigned int byte, shift;
-	
+
 	byte = array[idx / 8];
 	shift = 7 - (idx % 8);
 
@@ -230,7 +230,7 @@ get_bit(unsigned char *array, unsigned int idx) {
 static inline void
 set_bit(unsigned char *array, unsigned int idx, unsigned int bit) {
 	unsigned int shift, mask;
-	
+
 	shift = 7 - (idx % 8);
 	mask = 1 << shift;
 
@@ -250,7 +250,7 @@ dns_label_type(dns_label_t *label) {
 	REQUIRE(label->length > 0);
 	REQUIRE(label->base[0] <= 63 ||
 		label->base[0] == DNS_LABELTYPE_BITSTRING);
-     
+
 	if (label->base[0] <= 63)
 		return (dns_labeltype_ordinary);
 	else
@@ -272,7 +272,7 @@ dns_label_countbits(dns_label_t *label) {
 	count = label->base[1];
 	if (count == 0)
 		count = 256;
-	
+
 	return (count);
 }
 
@@ -308,7 +308,7 @@ dns_name_init(dns_name_t *name, unsigned char *offsets) {
 	/*
 	 * Initialize 'name'.
 	 */
-	 
+
 	name->magic = DNS_NAME_MAGIC;
 	name->ndata = NULL;
 	name->length = 0;
@@ -694,7 +694,7 @@ dns_name_compare(const dns_name_t *name1, const dns_name_t *name2) {
 	 * compared the caller must ensure that they are both relative to the
 	 * same domain.
 	 */
-	
+
 	(void)dns_name_fullcompare(name1, name2, &order, &nlabels, &nbits);
 
 	return (order);
@@ -958,12 +958,12 @@ dns_name_getlabel(const dns_name_t *name, unsigned int n, dns_label_t *label) {
 	/*
 	 * Make 'label' refer to the 'n'th least significant label of 'name'.
 	 */
-	
+
 	REQUIRE(VALID_NAME(name));
 	REQUIRE(name->labels > 0);
 	REQUIRE(n < name->labels);
 	REQUIRE(label != NULL);
-	
+
 	SETUP_OFFSETS(name, offsets, odata);
 
 	label->base = &name->ndata[offsets[n]];
@@ -1139,7 +1139,7 @@ dns_name_fromtext(dns_name_t *name, isc_buffer_t *source,
 	}
 
 	REQUIRE(BINDABLE(name));
-	
+
 	INIT_OFFSETS(name, offsets, odata);
 	offsets[0] = 0;
 
@@ -1156,7 +1156,7 @@ dns_name_fromtext(dns_name_t *name, isc_buffer_t *source,
 	tbcount = 0;
 	bitlength = 0;
 	maxlength = 0;
-	kind = ft_init;	
+	kind = ft_init;
 
 	/*
 	 * Make 'name' empty in case of failure.
@@ -1204,7 +1204,7 @@ dns_name_fromtext(dns_name_t *name, isc_buffer_t *source,
 				state = ft_at;
 				break;
 			}
-				
+
 			/* FALLTHROUGH */
 		case ft_start:
 			label = ndata;
@@ -1670,7 +1670,7 @@ dns_name_fromtext(dns_name_t *name, isc_buffer_t *source,
 			}
 			if ((origin->attributes & DNS_NAMEATTR_ABSOLUTE) != 0)
 				name->attributes |= DNS_NAMEATTR_ABSOLUTE;
-		}		
+		}
 	} else
 		name->attributes |= DNS_NAMEATTR_ABSOLUTE;
 
@@ -1855,7 +1855,7 @@ dns_name_totext(dns_name_t *name, isc_boolean_t omit_final_dot,
 				    "Unexpected label type %02x", count);
 			/* NOTREACHED */
 		}
-					 
+
 		/*
 		 * The following assumes names are absolute.  If not, we
 		 * fix things up later.  Note that this means that in some
@@ -1884,7 +1884,7 @@ dns_name_downcase(dns_name_t *source, dns_name_t *name, isc_buffer_t *target) {
 	unsigned char *sndata, *ndata;
 	unsigned int nlen, count, bytes, labels;
 	isc_buffer_t buffer;
- 
+
 	/*
 	 * Downcase 'source'.
 	 */
@@ -2216,10 +2216,10 @@ dns_name_fromwire(dns_name_t *name, isc_buffer_t *source,
 	hops = 0;
 	saw_bitstring = ISC_FALSE;
 	done = ISC_FALSE;
-	
+
 	ndata = isc_buffer_used(target);
 	nused = 0;
-	
+
 	/*
 	 * Find the maximum number of uncompressed target name
 	 * bytes we are willing to generate.  This is the smaller
@@ -2229,10 +2229,10 @@ dns_name_fromwire(dns_name_t *name, isc_buffer_t *source,
 	nmax = isc_buffer_availablelength(target);
 	if (nmax > 255)
 		nmax = 255;
-	
+
 	cdata = isc_buffer_current(source);
 	cused = 0;
-	
+
 	current = source->current;
 	biggest_pointer = current;
 
@@ -2363,7 +2363,7 @@ dns_name_fromwire(dns_name_t *name, isc_buffer_t *source,
 
 	isc_buffer_forward(source, cused);
 	isc_buffer_add(target, name->length);
-	
+
 	return (ISC_R_SUCCESS);
 
  full:
@@ -2379,7 +2379,7 @@ dns_name_fromwire(dns_name_t *name, isc_buffer_t *source,
 		 * big enough buffer.
 		 */
 		return (ISC_R_NOSPACE);
-		
+
 }
 
 isc_result_t
@@ -3063,13 +3063,13 @@ dns_name_digest(dns_name_t *name, dns_digestfunc_t digest, void *arg) {
 
 	dns_name_init(&downname, NULL);
 	isc_buffer_init(&buffer, data, sizeof(data));
-	
+
 	result = dns_name_downcase(name, &downname, &buffer);
 	if (result != ISC_R_SUCCESS)
 		return (result);
-	
+
 	isc_buffer_usedregion(&buffer, &r);
-	
+
 	return ((digest)(arg, &r));
 }
 
@@ -3114,7 +3114,7 @@ dns_name_format(dns_name_t *name, char *cp, unsigned int size) {
 	isc_buffer_t buf;
 
 	REQUIRE(size > 0);
-	
+
 	/*
 	 * Leave room for null termination after buffer.
 	 */
diff --git a/lib/dns/ncache.c b/lib/dns/ncache.c
index 3a8bb01725..f1d4358174 100644
--- a/lib/dns/ncache.c
+++ b/lib/dns/ncache.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ncache.c,v 1.20 2000/07/27 09:46:17 tale Exp $ */
+/* $Id: ncache.c,v 1.21 2000/08/01 01:22:35 tale Exp $ */
 
 #include 
 
@@ -336,7 +336,7 @@ dns_ncache_towire(dns_rdataset_t *rdataset, dns_compress_t *cctx,
 			 */
 			rdlen = *target;
 			isc_buffer_add(target, 2);
-			
+
 			/*
 			 * Write the rdata.
 			 */
@@ -360,7 +360,7 @@ dns_ncache_towire(dns_rdataset_t *rdataset, dns_compress_t *cctx,
 	} while (remaining.length > 0);
 
 	*countp = count;
-		
+
 	return (ISC_R_SUCCESS);
 
  rollback:
diff --git a/lib/dns/nxt.c b/lib/dns/nxt.c
index e4c0e95f3b..63bb7134c3 100644
--- a/lib/dns/nxt.c
+++ b/lib/dns/nxt.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nxt.c,v 1.19 2000/07/27 09:46:18 tale Exp $ */
+/* $Id: nxt.c,v 1.20 2000/08/01 01:22:36 tale Exp $ */
 
 #include 
 
@@ -123,7 +123,7 @@ dns_buildnxtrdata(dns_db_t *db, dns_dbversion_t *version,
 
 	r.length += ((max_type + 7) / 8);
 	INSIST(r.length <= DNS_NXT_BUFFERSIZE);
-	dns_rdata_fromregion(rdata, 
+	dns_rdata_fromregion(rdata,
 			     dns_db_class(db),
 			     dns_rdatatype_nxt,
 			     &r);
@@ -141,13 +141,13 @@ dns_buildnxt(dns_db_t *db, dns_dbversion_t *version, dns_dbnode_t *node,
 	unsigned char data[DNS_NXT_BUFFERSIZE];
 	dns_rdatalist_t rdatalist;
 	dns_rdataset_t rdataset;
-	
+
 	dns_rdataset_init(&rdataset);
 
 	result = dns_buildnxtrdata(db, version, node,
 					  target, data, &rdata);
 	check_result(result, "dns_buildnxtrdata");
-	
+
 	rdatalist.rdclass = dns_rdataclass_in;
 	rdatalist.type = dns_rdatatype_nxt;
 	rdatalist.covers = 0;
diff --git a/lib/dns/peer.c b/lib/dns/peer.c
index 81f4547ace..f955ccf8d1 100644
--- a/lib/dns/peer.c
+++ b/lib/dns/peer.c
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: peer.c,v 1.9 2000/07/27 09:46:20 tale Exp $ */
+/* $Id: peer.c,v 1.10 2000/08/01 01:22:37 tale Exp $ */
 
 #include 
 
@@ -45,21 +45,21 @@ dns_peer_delete(dns_peer_t **peer);
 isc_result_t
 dns_peerlist_new(isc_mem_t *mem, dns_peerlist_t **list) {
 	dns_peerlist_t *l;
-	
+
 	REQUIRE(list != NULL);
-	
+
 	l = isc_mem_get(mem, sizeof *l);
 	if (l == NULL) {
 		return (ISC_R_NOMEMORY);
 	}
-	
+
 	ISC_LIST_INIT(l->elements);
 	l->mem = mem;
 	l->refs = 1;
 	l->magic = DNS_PEERLIST_MAGIC;
-	
+
 	*list = l;
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -71,7 +71,7 @@ dns_peerlist_attach(dns_peerlist_t *source, dns_peerlist_t **target) {
 	REQUIRE(*target == NULL);
 
 	source->refs++;
-	
+
 	ENSURE(source->refs != 0xffffffffU);
 
 	*target = source;
@@ -80,7 +80,7 @@ dns_peerlist_attach(dns_peerlist_t *source, dns_peerlist_t **target) {
 void
 dns_peerlist_detach(dns_peerlist_t **list) {
 	dns_peerlist_t *plist;
-	
+
 	REQUIRE(list != NULL);
 	REQUIRE(*list != NULL);
 	REQUIRE(DNS_PEERLIST_VALID(*list));
@@ -105,11 +105,11 @@ dns_peerlist_delete(dns_peerlist_t **list) {
 
 	REQUIRE(list != NULL);
 	REQUIRE(DNS_PEERLIST_VALID(*list));
-	
+
 	l = *list;
 
 	REQUIRE(l->refs == 0);
-	
+
 	server = ISC_LIST_HEAD(l->elements);
 	while (server != NULL) {
 		stmp = ISC_LIST_NEXT(server, next);
@@ -118,15 +118,15 @@ dns_peerlist_delete(dns_peerlist_t **list) {
 		if (r != ISC_R_SUCCESS) {
 			return (r);
 		}
-		
+
 		server = stmp;
 	}
-	
+
 	l->magic = 0;
 	isc_mem_put(l->mem, l, sizeof *l);
-	
+
 	*list = NULL;
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -135,36 +135,36 @@ dns_peerlist_addpeer(dns_peerlist_t *peers, dns_peer_t *peer) {
 	dns_peer_t *p = NULL;
 
 	dns_peer_attach(peer, &p);
-	
+
 	ISC_LIST_APPEND(peers->elements, peer, next);
 }
-	
+
 isc_result_t
 dns_peerlist_peerbyaddr(dns_peerlist_t *servers,
 			isc_netaddr_t *addr, dns_peer_t **retval)
 {
 	dns_peer_t *server;
 	isc_result_t res;
-	
+
 	REQUIRE(retval != NULL);
 	REQUIRE(DNS_PEERLIST_VALID(servers));
-	
+
 	server = ISC_LIST_HEAD(servers->elements);
 	while (server != NULL) {
 		if (isc_netaddr_equal(addr, &server->address)) {
 			break;
 		}
-		
+
 		server = ISC_LIST_NEXT(server, next);
 	}
-	
+
 	if (server != NULL) {
 		*retval = server;
 		res = ISC_R_SUCCESS;
 	} else {
 		res = ISC_R_NOTFOUND;
 	}
-	
+
 	return (res);
 }
 
@@ -180,18 +180,18 @@ dns_peerlist_currpeer(dns_peerlist_t *peers, dns_peer_t **retval) {
 
 	return (ISC_R_SUCCESS);
 }
-	
+
 isc_result_t
 dns_peer_new(isc_mem_t *mem, isc_netaddr_t *addr, dns_peer_t **peerptr) {
 	dns_peer_t *peer;
-	
+
 	REQUIRE(peerptr != NULL);
-	
+
 	peer = isc_mem_get(mem, sizeof *peer);
 	if (peer == NULL) {
 		return (ISC_R_NOMEMORY);
 	}
-	
+
 	peer->magic = DNS_PEER_MAGIC;
 	peer->address = *addr;
 	peer->mem = mem;
@@ -202,13 +202,13 @@ dns_peer_new(isc_mem_t *mem, isc_netaddr_t *addr, dns_peer_t **peerptr) {
 	peer->provide_ixfr = ISC_FALSE;
 	peer->key = NULL;
 	peer->refs = 1;
-	
+
 	memset(&peer->bitflags, 0x0, sizeof peer->bitflags);
-	
+
 	ISC_LINK_INIT(peer, next);
-	
+
 	*peerptr = peer;
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -219,7 +219,7 @@ dns_peer_attach(dns_peer_t *source, dns_peer_t **target) {
 	REQUIRE(*target == NULL);
 
 	source->refs++;
-	
+
 	ENSURE(source->refs != 0xffffffffU);
 
 	*target = source;
@@ -230,7 +230,7 @@ dns_peer_attach(dns_peer_t *source, dns_peer_t **target) {
 isc_result_t
 dns_peer_detach(dns_peer_t **peer) {
 	dns_peer_t *p;
-	
+
 	REQUIRE(peer != NULL);
 	REQUIRE(*peer != NULL);
 	REQUIRE(DNS_PEER_VALID(*peer));
@@ -253,41 +253,41 @@ static isc_result_t
 dns_peer_delete(dns_peer_t **peer) {
 	dns_peer_t *p;
 	isc_mem_t *mem;
-	
+
 	REQUIRE(peer != NULL);
 	REQUIRE(DNS_PEER_VALID(*peer));
-	
+
 	p = *peer;
 
 	REQUIRE(p->refs == 0);
-	
+
 	mem = p->mem;
 	p->mem = NULL;
 	p->magic = 0;
-	
+
 	if (p->key != NULL) {
 		dns_name_free(p->key, mem);
 		isc_mem_put(mem, p->key, sizeof(dns_name_t));
 	}
-	
+
 	isc_mem_put(mem, p, sizeof *p);
-	
+
 	*peer = NULL;
-	
+
 	return (ISC_R_SUCCESS);
 }
 
 isc_result_t
 dns_peer_setbogus(dns_peer_t *peer, isc_boolean_t newval) {
 	isc_boolean_t existed;
-	
+
 	REQUIRE(DNS_PEER_VALID(peer));
-	
+
 	existed = DNS_BIT_CHECK(BOGUS_BIT, &peer->bitflags);
-	
+
 	peer->bogus = newval;
 	DNS_BIT_SET(BOGUS_BIT, &peer->bitflags);
-	
+
 	return (existed ? ISC_R_EXISTS : ISC_R_SUCCESS);
 }
 
@@ -295,7 +295,7 @@ isc_result_t
 dns_peer_getbogus(dns_peer_t *peer, isc_boolean_t *retval) {
 	REQUIRE(DNS_PEER_VALID(peer));
 	REQUIRE(retval != NULL);
-	
+
 	if (DNS_BIT_CHECK(BOGUS_BIT, &peer->bitflags)) {
 		*retval = peer->bogus;
 		return (ISC_R_SUCCESS);
@@ -307,14 +307,14 @@ dns_peer_getbogus(dns_peer_t *peer, isc_boolean_t *retval) {
 isc_result_t
 dns_peer_setprovideixfr(dns_peer_t *peer, isc_boolean_t newval) {
 	isc_boolean_t existed;
-	
+
 	REQUIRE(DNS_PEER_VALID(peer));
-	
+
 	existed = DNS_BIT_CHECK(PROVIDE_IXFR_BIT, &peer->bitflags);
-	
+
 	peer->provide_ixfr = newval;
 	DNS_BIT_SET(PROVIDE_IXFR_BIT, &peer->bitflags);
-	
+
 	return (existed ? ISC_R_EXISTS : ISC_R_SUCCESS);
 }
 
@@ -322,7 +322,7 @@ isc_result_t
 dns_peer_getprovideixfr(dns_peer_t *peer, isc_boolean_t *retval) {
 	REQUIRE(DNS_PEER_VALID(peer));
 	REQUIRE(retval != NULL);
-	
+
 	if (DNS_BIT_CHECK(PROVIDE_IXFR_BIT, &peer->bitflags)) {
 		*retval = peer->provide_ixfr;
 		return (ISC_R_SUCCESS);
@@ -334,14 +334,14 @@ dns_peer_getprovideixfr(dns_peer_t *peer, isc_boolean_t *retval) {
 isc_result_t
 dns_peer_setrequestixfr(dns_peer_t *peer, isc_boolean_t newval) {
 	isc_boolean_t existed;
-	
+
 	REQUIRE(DNS_PEER_VALID(peer));
-	
+
 	existed = DNS_BIT_CHECK(REQUEST_IXFR_BIT, &peer->bitflags);
-	
+
 	peer->request_ixfr = newval;
 	DNS_BIT_SET(REQUEST_IXFR_BIT, &peer->bitflags);
-	
+
 	return (existed ? ISC_R_EXISTS : ISC_R_SUCCESS);
 }
 
@@ -349,7 +349,7 @@ isc_result_t
 dns_peer_getrequestixfr(dns_peer_t *peer, isc_boolean_t *retval) {
 	REQUIRE(DNS_PEER_VALID(peer));
 	REQUIRE(retval != NULL);
-	
+
 	if (DNS_BIT_CHECK(REQUEST_IXFR_BIT, &peer->bitflags)) {
 		*retval = peer->request_ixfr;
 		return (ISC_R_SUCCESS);
@@ -360,14 +360,14 @@ dns_peer_getrequestixfr(dns_peer_t *peer, isc_boolean_t *retval) {
 isc_result_t
 dns_peer_settransfers(dns_peer_t *peer, isc_int32_t newval) {
 	isc_boolean_t existed;
-	
+
 	REQUIRE(DNS_PEER_VALID(peer));
-	
+
 	existed = DNS_BIT_CHECK(TRANSFERS_BIT, &peer->bitflags);
-	
+
 	peer->transfers = newval;
 	DNS_BIT_SET(TRANSFERS_BIT, &peer->bitflags);
-	
+
 	return (existed ? ISC_R_EXISTS : ISC_R_SUCCESS);
 }
 
@@ -375,7 +375,7 @@ isc_result_t
 dns_peer_gettransfers(dns_peer_t *peer, isc_int32_t *retval) {
 	REQUIRE(DNS_PEER_VALID(peer));
 	REQUIRE(retval != NULL);
-	
+
 	if (DNS_BIT_CHECK(TRANSFERS_BIT, &peer->bitflags)) {
 		*retval = peer->transfers;
 		return (ISC_R_SUCCESS);
@@ -387,15 +387,15 @@ dns_peer_gettransfers(dns_peer_t *peer, isc_int32_t *retval) {
 isc_result_t
 dns_peer_settransferformat(dns_peer_t *peer, dns_transfer_format_t newval) {
 	isc_boolean_t existed;
-	
+
 	REQUIRE(DNS_PEER_VALID(peer));
-	
+
 	existed = DNS_BIT_CHECK(SERVER_TRANSFER_FORMAT_BIT,
 				 &peer->bitflags);
-	
+
 	peer->transfer_format = newval;
 	DNS_BIT_SET(SERVER_TRANSFER_FORMAT_BIT, &peer->bitflags);
-	
+
 	return (existed ? ISC_R_EXISTS : ISC_R_SUCCESS);
 }
 
@@ -403,7 +403,7 @@ isc_result_t
 dns_peer_gettransferformat(dns_peer_t *peer, dns_transfer_format_t *retval) {
 	REQUIRE(DNS_PEER_VALID(peer));
 	REQUIRE(retval != NULL);
-	
+
 	if (DNS_BIT_CHECK(SERVER_TRANSFER_FORMAT_BIT, &peer->bitflags)) {
 		*retval = peer->transfer_format;
 		return (ISC_R_SUCCESS);
@@ -420,7 +420,7 @@ dns_peer_getkey(dns_peer_t *peer, dns_name_t **retval) {
 	if (peer->key != NULL) {
 		*retval = peer->key;
 	}
-	
+
 	return (peer->key == NULL ? ISC_R_NOTFOUND : ISC_R_SUCCESS);
 }
 
@@ -436,6 +436,6 @@ dns_peer_setkey(dns_peer_t *peer, dns_name_t **keyval) {
 
 	peer->key = *keyval;
 	*keyval = NULL;
-	
+
 	return (exists ? ISC_R_EXISTS : ISC_R_SUCCESS);
 }
diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c
index 270e5d8979..75a5363535 100644
--- a/lib/dns/rbt.c
+++ b/lib/dns/rbt.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbt.c,v 1.89 2000/07/31 23:27:24 tale Exp $ */
+/* $Id: rbt.c,v 1.90 2000/08/01 01:22:38 tale Exp $ */
 
 /* Principal Authors: DCL */
 
@@ -137,7 +137,7 @@ do { \
  * A little something to help out in GDB.
  */
 dns_name_t Name(dns_rbtnode_t *node);
-dns_name_t 
+dns_name_t
 Name(dns_rbtnode_t *node) {
 	dns_name_t name;
 
@@ -392,7 +392,7 @@ dns_rbt_addnode(dns_rbt_t *rbt, dns_name_t *name, dns_rbtnode_t **nodep) {
 	do {
 		current = child;
 
-		INSIST((IS_ROOT(current) && 
+		INSIST((IS_ROOT(current) &&
 			chain.ancestors[chain.ancestor_count - 1] == NULL) ||
 		       (! IS_ROOT(current) &&
 			chain.ancestors[chain.ancestor_count - 1] ==
@@ -440,7 +440,7 @@ dns_rbt_addnode(dns_rbt_t *rbt, dns_name_t *name, dns_rbtnode_t **nodep) {
 				/*
 				 * All of the existing labels are in common,
 				 * so the new name is in a subtree.
-				 * Whack off the common labels for the 
+				 * Whack off the common labels for the
 				 * not-in-common part to be searched for
 				 * in the next level.
 				 */
@@ -451,7 +451,7 @@ dns_rbt_addnode(dns_rbt_t *rbt, dns_name_t *name, dns_rbtnode_t **nodep) {
 
 				if (result != ISC_R_SUCCESS)
 					break;
-				
+
 				/*
 				 * Follow the down pointer (possibly NULL).
 				 */
@@ -486,7 +486,7 @@ dns_rbt_addnode(dns_rbt_t *rbt, dns_name_t *name, dns_rbtnode_t **nodep) {
 				 * XXX DCL need a better error result?
 				 */
 				if (chain.level_count ==
-				    (sizeof(chain.levels) / 
+				    (sizeof(chain.levels) /
 				     sizeof(*chain.levels))) {
 					result = ISC_R_NOSPACE;
 					break;
@@ -510,7 +510,7 @@ dns_rbt_addnode(dns_rbt_t *rbt, dns_name_t *name, dns_rbtnode_t **nodep) {
 				if (result != ISC_R_SUCCESS)
 					break;
 
-				/* 
+				/*
 				 * Reproduce the tree attributes of the
 				 * current node.
 				 */
@@ -648,13 +648,13 @@ dns_rbt_addnode(dns_rbt_t *rbt, dns_name_t *name, dns_rbtnode_t **nodep) {
 					 * result != ISC_R_SUCCESS, which
 					 * is tested after the loop ends).
 					 */
-					result = dns_name_split(add_name, 
+					result = dns_name_split(add_name,
 								common_labels,
 								common_bits,
 								add_name,
 								NULL);
 
-				
+
 					break;
 				}
 
@@ -731,7 +731,7 @@ dns_rbt_findnode(dns_rbt_t *rbt, dns_name_t *name, dns_name_t *foundname,
 	REQUIRE((options & (DNS_RBTFIND_NOEXACT | DNS_RBTFIND_NOPREDECESSOR))
 		!=         (DNS_RBTFIND_NOEXACT | DNS_RBTFIND_NOPREDECESSOR));
 
-	/* 
+	/*
 	 * If there is a chain it needs to appear to be in a sane state,
 	 * otherwise a chain is still needed to generate foundname and
 	 * callback_name.
@@ -1097,7 +1097,7 @@ dns_rbt_findname(dns_rbt_t *rbt, dns_name_t *name, unsigned int options,
 		*data = DATA(node);
 	else
 		result = ISC_R_NOTFOUND;
-		
+
 	return (result);
 }
 
@@ -1185,7 +1185,7 @@ dns_rbt_deletenode(dns_rbt_t *rbt, dns_rbtnode_t *node, isc_boolean_t recurse)
 		}
 	}
 
-	/* 
+	/*
 	 * Note the node that points to the level of the node that is being
 	 * deleted.  If the deleted node is the top level, parent will be set
 	 * to NULL.
@@ -1244,12 +1244,12 @@ create_node(isc_mem_t *mctx, dns_name_t *name, dns_rbtnode_t **nodep) {
 	labels = dns_name_countlabels(name);
 	ENSURE(labels > 0);
 
-	/* 
+	/*
 	 * Allocate space for the node structure, the name, and the offsets.
 	 */
 	node = (dns_rbtnode_t *)isc_mem_get(mctx, sizeof(*node) +
 					    region.length + labels);
-					    
+
 	if (node == NULL)
 		return (ISC_R_NOMEMORY);
 
@@ -1504,7 +1504,7 @@ dns_rbt_addonlevel(dns_rbtnode_t *node,
 	MAKE_RED(node);
 
 	depth = chain->ancestor_count - 1;
-	
+
 	while (node != root && IS_RED(chain->ancestors[depth])) {
 		INSIST(depth > 0);
 
@@ -1578,7 +1578,7 @@ dns_rbt_deletefromlevel(dns_rbtnode_t *delete, dns_rbtnode_t **rootp) {
 	 * Verify that the parent history is (apparently) correct.
 	 */
 	INSIST((IS_ROOT(delete) && *rootp == delete) ||
-	       (! IS_ROOT(delete) && 
+	       (! IS_ROOT(delete) &&
 		(LEFT(PARENT(delete)) == delete ||
 		 RIGHT(PARENT(delete)) == delete)));
 
@@ -1709,7 +1709,7 @@ dns_rbt_deletefromlevel(dns_rbtnode_t *delete, dns_rbtnode_t **rootp) {
 		*rootp = child;
 		IS_ROOT(child) = ISC_TRUE;
 		PARENT(child) = PARENT(delete);
-	} 
+	}
 
 	/*
 	 * Fix color violations.
@@ -2026,7 +2026,7 @@ dns_rbtnodechain_prev(dns_rbtnodechain_t *chain, dns_name_t *name,
 				break;
 			}
 		}
-	}	
+	}
 
 	if (predecessor != NULL) {
 		if (DOWN(predecessor) != NULL) {
diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index 07dbb4780a..5046cf206a 100644
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbtdb.c,v 1.112 2000/07/27 09:46:22 tale Exp $ */
+/* $Id: rbtdb.c,v 1.113 2000/08/01 01:22:39 tale Exp $ */
 
 /*
  * Principal Author: Bob Halley
@@ -352,7 +352,7 @@ static inline void
 maybe_free_rbtdb(dns_rbtdb_t *rbtdb, isc_boolean_t set_exiting) {
 	isc_boolean_t want_free = ISC_TRUE;
 	unsigned int i;
-	
+
 	/* XXX check for open versions here */
 
 	/*
@@ -424,7 +424,7 @@ allocate_version(isc_mem_t *mctx, rbtdb_serial_t serial,
 	version->commit_ok = ISC_FALSE;
 	ISC_LIST_INIT(version->changed_list);
 	ISC_LINK_INIT(version, link);
-	
+
 	return (version);
 }
 
@@ -809,7 +809,7 @@ closeversion(dns_db_t *db, dns_dbversion_t **versionp, isc_boolean_t commit) {
 	rbtdb_changed_t *changed, *next_changed;
 	rbtdb_serial_t serial, least_serial;
 	dns_rbtnode_t *rbtnode;
-	
+
 	REQUIRE(VALID_RBTDB(rbtdb));
 	version = (rbtdb_version_t *)*versionp;
 
@@ -1175,7 +1175,7 @@ bind_rdataset(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node,
 		 * count by one before storing it.
 		 */
 		count--;
-		rdataset->private4 = (void *)count; 
+		rdataset->private4 = (void *)count;
 		rdataset->private5 = raw;
 	}
 }
@@ -1338,7 +1338,7 @@ find_wildcard(rbtdb_search_t *search, dns_rbtnode_t **nodep) {
 			active = ISC_TRUE;
 		else
 			active = ISC_FALSE;
-		
+
 		if (node->wild)
 			wild = ISC_TRUE;
 		else
@@ -1408,7 +1408,7 @@ find_wildcard(rbtdb_search_t *search, dns_rbtnode_t **nodep) {
 				break;
 			}
 		}
-		
+
 		if (active) {
 			/*
 			 * The level node is active.  Any wildcarding
@@ -1672,7 +1672,7 @@ zone_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
 				result = dns_name_concatenate(name, NULL,
 							      foundname, NULL);
 				if (result != ISC_R_SUCCESS)
-					goto tree_exit;	      
+					goto tree_exit;
 				wild = ISC_TRUE;
 				goto found;
 			}
@@ -1733,7 +1733,7 @@ zone_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
 	 */
 
 	LOCK(&(search.rbtdb->node_locks[node->locknum].lock));
-	
+
 	found = NULL;
 	foundsig = NULL;
 	sigtype = RBTDB_RDATATYPE_VALUE(dns_rdatatype_sig, type);
@@ -1994,7 +1994,7 @@ zone_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
 
  node_exit:
 	UNLOCK(&(search.rbtdb->node_locks[node->locknum].lock));
-	
+
  tree_exit:
 	RWUNLOCK(&search.rbtdb->tree_lock, isc_rwlocktype_read);
 
@@ -2057,7 +2057,7 @@ cache_zonecut_callback(dns_rbtnode_t *node, dns_name_t *name, void *arg) {
 	(void)name;
 
 	LOCK(&(search->rbtdb->node_locks[node->locknum].lock));
-	
+
 	/*
 	 * Look for a DNAME rdataset.
 	 */
@@ -2136,7 +2136,7 @@ find_deepest_zonecut(rbtdb_search_t *search, dns_rbtnode_t *node,
 	done = ISC_FALSE;
 	do {
 		LOCK(&(rbtdb->node_locks[node->locknum].lock));
-		
+
 		/*
 		 * Look for NS and SIG NS rdatasets.
 		 */
@@ -2326,7 +2326,7 @@ cache_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
 	 */
 
 	LOCK(&(search.rbtdb->node_locks[node->locknum].lock));
-	
+
 	found = NULL;
 	foundsig = NULL;
 	sigtype = RBTDB_RDATATYPE_VALUE(dns_rdatatype_sig, type);
@@ -2518,7 +2518,7 @@ cache_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
 
  node_exit:
 	UNLOCK(&(search.rbtdb->node_locks[node->locknum].lock));
-	
+
  tree_exit:
 	RWUNLOCK(&search.rbtdb->tree_lock, isc_rwlocktype_read);
 
@@ -2584,7 +2584,7 @@ cache_findzonecut(dns_db_t *db, dns_name_t *name, unsigned int options,
 	 */
 
 	LOCK(&(search.rbtdb->node_locks[node->locknum].lock));
-	
+
 	found = NULL;
 	foundsig = NULL;
 	header_prev = NULL;
@@ -2641,7 +2641,7 @@ cache_findzonecut(dns_db_t *db, dns_name_t *name, unsigned int options,
 		 */
 		UNLOCK(&(search.rbtdb->node_locks[node->locknum].lock));
 		goto find_ns;
-	} 
+	}
 
 	if (nodep != NULL) {
 		new_reference(search.rbtdb, node);
@@ -2654,7 +2654,7 @@ cache_findzonecut(dns_db_t *db, dns_name_t *name, unsigned int options,
 			      sigrdataset);
 
 	UNLOCK(&(search.rbtdb->node_locks[node->locknum].lock));
-	
+
  tree_exit:
 	RWUNLOCK(&search.rbtdb->tree_lock, isc_rwlocktype_read);
 
@@ -3019,7 +3019,7 @@ allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
 	iterator->common.now = now;
 
 	LOCK(&rbtdb->node_locks[rbtnode->locknum].lock);
-	
+
 	INSIST(rbtnode->references > 0);
 	rbtnode->references++;
 	INSIST(rbtnode->references != 0);
@@ -3199,7 +3199,7 @@ add(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
 					      addedrdataset);
 			return (DNS_R_UNCHANGED);
 		}
-			
+
 		/*
 		 * Don't merge if a nonexistent rdataset is involved.
 		 */
@@ -3330,7 +3330,7 @@ delegating_type(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node,
 		else
 			return (ISC_FALSE);
 	} else if (type == dns_rdatatype_dname ||
-		   (type == dns_rdatatype_ns && 
+		   (type == dns_rdatatype_ns &&
 		    (node != rbtdb->origin_node || IS_STUB(rbtdb))))
 		return (ISC_TRUE);
 	return (ISC_FALSE);
@@ -3388,7 +3388,7 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
 		RWLOCK(&rbtdb->tree_lock, isc_rwlocktype_write);
 	} else
 		delegating = ISC_FALSE;
-		
+
 	LOCK(&rbtdb->node_locks[rbtnode->locknum].lock);
 
 	result = add(rbtdb, rbtnode, rbtversion, newheader, options, ISC_FALSE,
@@ -3664,7 +3664,7 @@ static isc_result_t
 beginload(dns_db_t *db, dns_addrdatasetfunc_t *addp, dns_dbload_t **dbloadp) {
 	rbtdb_load_t *loadctx;
 	dns_rbtdb_t *rbtdb;
-	
+
 	rbtdb = (dns_rbtdb_t *)db;
 
 	REQUIRE(VALID_RBTDB(rbtdb));
@@ -3713,7 +3713,7 @@ endload(dns_db_t *db, dns_dbload_t **dbloadp) {
 	rbtdb->attributes |= RBTDB_ATTR_LOADED;
 
 	UNLOCK(&rbtdb->lock);
-	
+
 	/*
 	 * If there's a NXT rdataset at the zone origin, we consider
 	 * the zone secure.
@@ -3722,7 +3722,7 @@ endload(dns_db_t *db, dns_dbload_t **dbloadp) {
 		for (header = rbtdb->origin_node->data;
 		     header != NULL;
 		     header = header->next) {
-			if (header->type == dns_rdatatype_nxt && 
+			if (header->type == dns_rdatatype_nxt &&
 			    !IGNORE(header))
 			{
 				rbtdb->secure = ISC_TRUE;
@@ -3746,7 +3746,7 @@ dump(dns_db_t *db, dns_dbversion_t *version, const char *filename) {
 
 	REQUIRE(VALID_RBTDB(rbtdb));
 
-	return (dns_master_dump(rbtdb->common.mctx, db, version, 
+	return (dns_master_dump(rbtdb->common.mctx, db, version,
 				&dns_master_style_default,
 				filename));
 }
@@ -3889,7 +3889,7 @@ dns_rbtdb_create
 
 	if (rbtdb->node_lock_count == 0)
 		rbtdb->node_lock_count = DEFAULT_NODE_LOCK_COUNT;
-	rbtdb->node_locks = isc_mem_get(mctx, rbtdb->node_lock_count * 
+	rbtdb->node_locks = isc_mem_get(mctx, rbtdb->node_lock_count *
 					sizeof (rbtdb_nodelock_t));
 	for (i = 0; i < (int)(rbtdb->node_lock_count); i++) {
 		result = isc_mutex_init(&rbtdb->node_locks[i].lock);
@@ -3900,7 +3900,7 @@ dns_rbtdb_create
 				i--;
 			}
 			isc_mem_put(mctx, rbtdb->node_locks,
-				    rbtdb->node_lock_count *  
+				    rbtdb->node_lock_count *
 				    sizeof (rbtdb_nodelock_t));
 			isc_rwlock_destroy(&rbtdb->tree_lock);
 			isc_mutex_destroy(&rbtdb->lock);
@@ -3992,7 +3992,7 @@ dns_rbtdb_create
 	ISC_LIST_INIT(rbtdb->open_versions);
 
 	isc_ondestroy_init(&rbtdb->common.ondest);
-	
+
 	rbtdb->common.magic = DNS_DB_MAGIC;
 	rbtdb->common.impmagic = RBTDB_MAGIC;
 
@@ -4112,7 +4112,7 @@ rdatasetiter_destroy(dns_rdatasetiter_t **iteratorp) {
 	detachnode(rbtiterator->common.db, &rbtiterator->common.node);
 	isc_mem_put(rbtiterator->common.db->mctx, rbtiterator,
 		    sizeof *rbtiterator);
-	
+
 	*iteratorp = NULL;
 }
 
@@ -4234,7 +4234,7 @@ rdatasetiter_current(dns_rdatasetiter_t *iterator, dns_rdataset_t *rdataset) {
 
 	header = rbtiterator->current;
 	REQUIRE(header != NULL);
-	
+
 	LOCK(&rbtdb->node_locks[rbtnode->locknum].lock);
 
 	bind_rdataset(rbtdb, rbtnode, header, rbtiterator->common.now,
@@ -4301,7 +4301,7 @@ dbiterator_first(dns_dbiterator_t *iterator) {
 	rbtdb_dbiterator_t *rbtdbiter = (rbtdb_dbiterator_t *)iterator;
 	dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)iterator->db;
 	dns_name_t *name, *origin;
-	
+
 	if (rbtdbiter->result != ISC_R_SUCCESS &&
 	    rbtdbiter->result != ISC_R_NOMORE)
 		return (rbtdbiter->result);
@@ -4346,7 +4346,7 @@ dbiterator_last(dns_dbiterator_t *iterator) {
 	rbtdb_dbiterator_t *rbtdbiter = (rbtdb_dbiterator_t *)iterator;
 	dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)iterator->db;
 	dns_name_t *name, *origin;
-	
+
 	if (rbtdbiter->result != ISC_R_SUCCESS &&
 	    rbtdbiter->result != ISC_R_NOMORE)
 		return (rbtdbiter->result);
@@ -4391,7 +4391,7 @@ dbiterator_seek(dns_dbiterator_t *iterator, dns_name_t *name) {
 	rbtdb_dbiterator_t *rbtdbiter = (rbtdb_dbiterator_t *)iterator;
 	dns_rbtdb_t *rbtdb = (dns_rbtdb_t *)iterator->db;
 	dns_name_t *iname, *origin;
-	
+
 	if (rbtdbiter->result != ISC_R_SUCCESS &&
 	    rbtdbiter->result != ISC_R_NOMORE)
 		return (rbtdbiter->result);
@@ -4522,7 +4522,7 @@ dbiterator_current(dns_dbiterator_t *iterator, dns_dbnode_t **nodep,
 			result = DNS_R_NEWORIGIN;
 	} else
 		result = ISC_R_SUCCESS;
-		
+
 	LOCK(&rbtdb->node_locks[node->locknum].lock);
 	new_reference(rbtdb, node);
 	UNLOCK(&rbtdb->node_locks[node->locknum].lock);
diff --git a/lib/dns/rbtdb.h b/lib/dns/rbtdb.h
index 53e8ffa782..891ac245cc 100644
--- a/lib/dns/rbtdb.h
+++ b/lib/dns/rbtdb.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbtdb.h,v 1.10 2000/07/27 09:46:23 tale Exp $ */
+/* $Id: rbtdb.h,v 1.11 2000/08/01 01:22:41 tale Exp $ */
 
 #ifndef DNS_RBTDB_H
 #define DNS_RBTDB_H 1
diff --git a/lib/dns/rbtdb64.c b/lib/dns/rbtdb64.c
index afcad92f62..816fcd8f91 100644
--- a/lib/dns/rbtdb64.c
+++ b/lib/dns/rbtdb64.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbtdb64.c,v 1.4 2000/07/27 09:46:25 tale Exp $ */
+/* $Id: rbtdb64.c,v 1.5 2000/08/01 01:22:42 tale Exp $ */
 
 #define DNS_RBTDB_VERSION64 1
 #include "rbtdb.c"
diff --git a/lib/dns/rbtdb64.h b/lib/dns/rbtdb64.h
index fa18ba9e7a..8a8c60b7be 100644
--- a/lib/dns/rbtdb64.h
+++ b/lib/dns/rbtdb64.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbtdb64.h,v 1.9 2000/07/27 09:46:26 tale Exp $ */
+/* $Id: rbtdb64.h,v 1.10 2000/08/01 01:22:43 tale Exp $ */
 
 #ifndef DNS_RBTDB64_H
 #define DNS_RBTDB64_H 1
diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c
index d70f91733c..8899d117cd 100644
--- a/lib/dns/rdata.c
+++ b/lib/dns/rdata.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdata.c,v 1.104 2000/07/27 09:46:27 tale Exp $ */
+/* $Id: rdata.c,v 1.105 2000/08/01 01:22:44 tale Exp $ */
 
 #include 
 #include 
@@ -76,7 +76,7 @@
 #define ARGS_DIGEST	dns_rdata_t *rdata, dns_digestfunc_t digest, void *arg
 
 /*
- * Context structure for the totext_ functions.  
+ * Context structure for the totext_ functions.
  * Contains formatting options for rdata-to-text
  * conversion.
  */
@@ -307,7 +307,7 @@ static struct keyflag {
 	{ "SIG13",  0x000D, 0x000F },
 	{ "SIG14",  0x000E, 0x000F },
 	{ "SIG15",  0x000F, 0x000F },
-	{ NULL,     0, 0 } 
+	{ NULL,     0, 0 }
 };
 
 /***
@@ -368,7 +368,7 @@ void
 dns_rdata_fromregion(dns_rdata_t *rdata, dns_rdataclass_t rdclass,
 		     dns_rdatatype_t type, isc_region_t *r)
 {
-			  
+
 	REQUIRE(rdata != NULL);
 	REQUIRE(r != NULL);
 
@@ -444,10 +444,10 @@ dns_rdata_towire(dns_rdata_t *rdata, dns_compress_t *cctx,
 	st = *target;
 
 	TOWIRESWITCH
-	
+
 	if (use_default) {
 		isc_buffer_availableregion(target, &tr);
-		if (tr.length < rdata->length) 
+		if (tr.length < rdata->length)
 			return (ISC_R_NOSPACE);
 		memcpy(tr.base, rdata->data, rdata->length);
 		isc_buffer_add(target, rdata->length);
@@ -562,7 +562,7 @@ rdata_totext(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx,
 {
 	isc_result_t result = ISC_R_NOTIMPLEMENTED;
 	isc_boolean_t use_default = ISC_FALSE;
-	
+
 	REQUIRE(rdata != NULL);
 	REQUIRE(tctx->origin == NULL ||
 		dns_name_isabsolute(tctx->origin) == ISC_TRUE);
@@ -720,7 +720,7 @@ dns_rdatatype_attributes(dns_rdatatype_t type)
 	return (typeattr[type].flags);
 }
 
-#define NUMBERSIZE sizeof("037777777777") /* 2^32-1 octal + NUL */ 
+#define NUMBERSIZE sizeof("037777777777") /* 2^32-1 octal + NUL */
 
 static isc_result_t
 dns_mnemonic_fromtext(unsigned int *valuep, isc_textregion_t *source,
@@ -740,7 +740,7 @@ dns_mnemonic_fromtext(unsigned int *valuep, isc_textregion_t *source,
 		 */
 		strncpy(buffer, source->base, NUMBERSIZE);
 		INSIST(buffer[source->length] == '\0');
-		
+
 		n = strtoul(buffer, &e, 10);
 		if (*e == 0) {
 			if (n > max)
@@ -752,9 +752,9 @@ dns_mnemonic_fromtext(unsigned int *valuep, isc_textregion_t *source,
 		 * It was not a number after all; fall through.
 		 */
 	}
-	
+
 	for (i = 0; table[i].name != NULL; i++) {
-		unsigned int n;		
+		unsigned int n;
 		n = strlen(table[i].name);
 		if (n == source->length &&
 		    strncasecmp(source->base, table[i].name, n) == 0) {
@@ -906,7 +906,7 @@ dns_rcode_fromtext(dns_rcode_t *rcodep, isc_textregion_t *source) {
 
 isc_result_t
 dns_rcode_totext(dns_rcode_t rcode, isc_buffer_t *target) {
-	return (dns_mnemonic_totext(rcode, target, rcodes));	
+	return (dns_mnemonic_totext(rcode, target, rcodes));
 }
 
 isc_result_t
@@ -919,7 +919,7 @@ dns_tsigrcode_fromtext(dns_rcode_t *rcodep, isc_textregion_t *source) {
 
 isc_result_t
 dns_tsigrcode_totext(dns_rcode_t rcode, isc_buffer_t *target) {
-	return (dns_mnemonic_totext(rcode, target, tsigrcodes));	
+	return (dns_mnemonic_totext(rcode, target, tsigrcodes));
 }
 
 isc_result_t
@@ -928,11 +928,11 @@ dns_cert_fromtext(dns_cert_t *certp, isc_textregion_t *source) {
 	RETERR(dns_mnemonic_fromtext(&value, source, certs, 0xffff));
 	*certp = value;
 	return (ISC_R_SUCCESS);
-}	
+}
 
 isc_result_t
 dns_cert_totext(dns_cert_t cert, isc_buffer_t *target) {
-	return (dns_mnemonic_totext(cert, target, certs));	
+	return (dns_mnemonic_totext(cert, target, certs));
 }
 
 isc_result_t
@@ -979,7 +979,7 @@ dns_keyflags_fromtext(dns_keyflags_t *flagsp, isc_textregion_t *source)
 		 */
 		strncpy(buffer, source->base, NUMBERSIZE);
 		INSIST(buffer[source->length] == '\0');
-		
+
 		n = strtoul(buffer, &e, 0); /* Allow hex/octal. */
 		if (*e == 0) {
 			if (n > 0xffff)
@@ -990,10 +990,10 @@ dns_keyflags_fromtext(dns_keyflags_t *flagsp, isc_textregion_t *source)
 		/* It was not a number after all; fall through. */
 	}
 
-	text = source->base;	
+	text = source->base;
 	end = source->base + source->length;
 	value = mask = 0;
-	
+
 	while (text < end) {
 		struct keyflag *p;
 		unsigned int len;
@@ -1013,7 +1013,7 @@ dns_keyflags_fromtext(dns_keyflags_t *flagsp, isc_textregion_t *source)
 		if ((mask & p->mask) != 0)
 			warn("overlapping key flags");
 #endif
-		mask |= p->mask;		
+		mask |= p->mask;
 		text += len;
 		if (delim != NULL)
 			text++;	/* Skip "|" */
@@ -1134,7 +1134,7 @@ txt_fromtext(isc_textregion_t *source, isc_buffer_t *target) {
 			continue;
 		}
 		escape = ISC_FALSE;
-		if (nrem == 0) 
+		if (nrem == 0)
 			return (ISC_R_NOSPACE);
 		*t++ = c;
 		nrem--;
@@ -1158,7 +1158,7 @@ txt_fromwire(isc_buffer_t *source, isc_buffer_t *target) {
 	n = *sregion.base + 1;
 	if (n > sregion.length)
 		return (ISC_R_UNEXPECTEDEND);
-	
+
 	isc_buffer_availableregion(target, &tregion);
 	if (n > tregion.length)
 		return (ISC_R_NOSPACE);
@@ -1184,7 +1184,7 @@ name_prefix(dns_name_t *name, dns_name_t *origin, dns_name_t *target) {
 
 	l1 = dns_name_countlabels(name);
 	l2 = dns_name_countlabels(origin);
-	
+
 	if (l1 == l2)
 		goto return_false;
 
@@ -1271,7 +1271,7 @@ name_tobuffer(dns_name_t *name, isc_buffer_t *target) {
 static isc_uint32_t
 uint32_fromregion(isc_region_t *region) {
 	unsigned long value;
-	
+
 	REQUIRE(region->length >= 4);
 	value = region->base[0] << 24;
 	value |= region->base[1] << 16;
@@ -1282,7 +1282,7 @@ uint32_fromregion(isc_region_t *region) {
 
 static isc_uint16_t
 uint16_fromregion(isc_region_t *region) {
-	
+
 	REQUIRE(region->length >= 2);
 
 	return ((region->base[0] << 8) | region->base[1]);
@@ -1290,7 +1290,7 @@ uint16_fromregion(isc_region_t *region) {
 
 static isc_uint8_t
 uint8_fromregion(isc_region_t *region) {
-	
+
 	REQUIRE(region->length >= 1);
 
 	return (region->base[0]);
@@ -1303,7 +1303,7 @@ gettoken(isc_lex_t *lexer, isc_token_t *token, isc_tokentype_t expect,
 	unsigned int options = ISC_LEXOPT_EOL | ISC_LEXOPT_EOF |
 			       ISC_LEXOPT_DNSMULTILINE | ISC_LEXOPT_ESCAPE;
 	isc_result_t result;
-	
+
 	if (expect == isc_tokentype_qstring)
 		options |= ISC_LEXOPT_QSTRING;
 	else if (expect == isc_tokentype_number)
@@ -1322,7 +1322,7 @@ gettoken(isc_lex_t *lexer, isc_token_t *token, isc_tokentype_t expect,
 				 isc_result_totext(result));
                 return (ISC_R_UNEXPECTED);
 	}
-	if (eol && ((token->type == isc_tokentype_eol) || 
+	if (eol && ((token->type == isc_tokentype_eol) ||
 		    (token->type == isc_tokentype_eof)))
 		return (ISC_R_SUCCESS);
 	if (token->type == isc_tokentype_string &&
@@ -1435,7 +1435,7 @@ static isc_result_t	putbyte(int c, isc_buffer_t *, struct state *state);
 static isc_result_t	byte_btoa(int c, isc_buffer_t *, struct state *state);
 
 /*
- * Decode ASCII-encoded byte c into binary representation and 
+ * Decode ASCII-encoded byte c into binary representation and
  * place into *bufp, advancing bufp.
  */
 static isc_result_t
@@ -1597,8 +1597,8 @@ byte_btoa(int c, isc_buffer_t *target, struct state *state) {
 		} else {
 		    register int tmp = 0;
 		    register isc_int32_t tmpword = word;
-			
-		    if (tmpword < 0) {	
+
+		    if (tmpword < 0) {
 			   /*
 			    * Because some don't support u_long.
 			    */
@@ -1645,10 +1645,10 @@ btoa_totext(unsigned char *inbuf, int inbuflen, isc_buffer_t *target) {
 	Ceor = Csum = Crot = word = bcount = 0;
 	for (inc = 0; inc < inbuflen; inbuf++, inc++)
 		RETERR(byte_btoa(*inbuf, target, state));
-	
+
 	while (bcount != 0)
 		RETERR(byte_btoa(0, target, state));
-	
+
 	/*
 	 * Put byte count and checksum information at end of buffer,
 	 * delimited by 'x'
diff --git a/lib/dns/rdata/any_255/tsig_250.c b/lib/dns/rdata/any_255/tsig_250.c
index 50368ad873..16af8792c9 100644
--- a/lib/dns/rdata/any_255/tsig_250.c
+++ b/lib/dns/rdata/any_255/tsig_250.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tsig_250.c,v 1.42 2000/07/27 09:48:46 tale Exp $ */
+/* $Id: tsig_250.c,v 1.43 2000/08/01 01:25:04 tale Exp $ */
 
 /* Reviewed: Thu Mar 16 13:39:43 PST 2000 by gson */
 
@@ -122,7 +122,7 @@ static inline isc_result_t
 totext_any_tsig(ARGS_TOTEXT) {
 	isc_region_t sr;
 	isc_region_t sigr;
-	char buf[sizeof "281474976710655 "];	
+	char buf[sizeof "281474976710655 "];
 	char *bufp;
 	dns_name_t name;
 	dns_name_t prefix;
@@ -185,15 +185,15 @@ totext_any_tsig(ARGS_TOTEXT) {
 	REQUIRE(n <= sr.length);
 	sigr = sr;
 	sigr.length = n;
-	if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0)	
+	if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0)
 		RETERR(str_totext(" (", target));
 	RETERR(str_totext(tctx->linebreak, target));
-	RETERR(isc_base64_totext(&sigr, tctx->width - 2, 
+	RETERR(isc_base64_totext(&sigr, tctx->width - 2,
 				 tctx->linebreak, target));
 	if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0)
 		RETERR(str_totext(" ) ", target));
 	else
-		RETERR(str_totext(" ", target));		
+		RETERR(str_totext(" ", target));
 	isc_region_consume(&sr, n);
 
 	/*
@@ -238,7 +238,7 @@ fromwire_any_tsig(ARGS_FROMWIRE) {
 
 	REQUIRE(type == 250);
 	REQUIRE(rdclass == 255);
-	
+
 	dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
 
 	/*
@@ -319,7 +319,7 @@ compare_any_tsig(ARGS_COMPARE) {
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 250);
 	REQUIRE(rdata1->rdclass == 255);
-	
+
 	dns_rdata_toregion(rdata1, &r1);
 	dns_rdata_toregion(rdata2, &r2);
 	dns_name_init(&name1, NULL);
@@ -410,7 +410,7 @@ tostruct_any_tsig(ARGS_TOSTRUCT) {
 
 	REQUIRE(rdata->type == 250);
 	REQUIRE(rdata->rdclass == 255);
-	
+
 	tsig = (dns_rdata_any_tsig_t *) target;
 	tsig->common.rdclass = rdata->rdclass;
 	tsig->common.rdtype = rdata->type;
@@ -425,7 +425,7 @@ tostruct_any_tsig(ARGS_TOSTRUCT) {
 	dns_name_fromregion(&alg, &sr);
 	dns_name_init(&tsig->algorithm, NULL);
 	RETERR(name_duporclone(&alg, mctx, &tsig->algorithm));
-	
+
 	isc_region_consume(&sr, name_length(&tsig->algorithm));
 
 	/*
@@ -496,7 +496,7 @@ tostruct_any_tsig(ARGS_TOSTRUCT) {
 
  cleanup:
 	if (mctx != NULL)
-		dns_name_free(&tsig->algorithm, tsig->mctx);	
+		dns_name_free(&tsig->algorithm, tsig->mctx);
 	if (mctx != NULL && tsig->signature != NULL)
 		isc_mem_free(mctx, tsig->signature);
 	return (ISC_R_NOMEMORY);
@@ -513,7 +513,7 @@ freestruct_any_tsig(ARGS_FREESTRUCT) {
 	if (tsig->mctx == NULL)
 		return;
 
-	dns_name_free(&tsig->algorithm, tsig->mctx);	
+	dns_name_free(&tsig->algorithm, tsig->mctx);
 	if (tsig->signature != NULL)
 		isc_mem_free(tsig->mctx, tsig->signature);
 	if (tsig->other != NULL)
diff --git a/lib/dns/rdata/any_255/tsig_250.h b/lib/dns/rdata/any_255/tsig_250.h
index 1a618afae8..2784afc724 100644
--- a/lib/dns/rdata/any_255/tsig_250.h
+++ b/lib/dns/rdata/any_255/tsig_250.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tsig_250.h,v 1.18 2000/07/27 09:48:47 tale Exp $ */
+/* $Id: tsig_250.h,v 1.19 2000/08/01 01:25:05 tale Exp $ */
 
 /* RFC 2845 */
 
diff --git a/lib/dns/rdata/generic/afsdb_18.c b/lib/dns/rdata/generic/afsdb_18.c
index fb65c5bca8..e0fd240f7a 100644
--- a/lib/dns/rdata/generic/afsdb_18.c
+++ b/lib/dns/rdata/generic/afsdb_18.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: afsdb_18.c,v 1.30 2000/07/27 09:48:48 tale Exp $ */
+/* $Id: afsdb_18.c,v 1.31 2000/08/01 01:25:06 tale Exp $ */
 
 /* Reviewed: Wed Mar 15 14:59:00 PST 2000 by explorer */
 
@@ -43,7 +43,7 @@ fromtext_afsdb(ARGS_FROMTEXT) {
 	if (token.value.as_ulong > 0xffff)
 		return (ISC_R_RANGE);
 	RETERR(uint16_tobuffer(token.value.as_ulong, target));
-	
+
 	/*
 	 * Hostname.
 	 */
@@ -87,7 +87,7 @@ fromwire_afsdb(ARGS_FROMWIRE) {
 	UNUSED(rdclass);
 
 	REQUIRE(type == 18);
-	
+
 	dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
 
 	dns_name_init(&name, NULL);
@@ -167,7 +167,7 @@ fromstruct_afsdb(ARGS_FROMSTRUCT) {
 	REQUIRE(source != NULL);
 	REQUIRE(afsdb->common.rdclass == rdclass);
 	REQUIRE(afsdb->common.rdtype == type);
-	
+
 	RETERR(uint16_tobuffer(afsdb->subtype, target));
 	dns_name_toregion(&afsdb->server, ®ion);
 	return (isc_buffer_copyregion(target, ®ion));
diff --git a/lib/dns/rdata/generic/afsdb_18.h b/lib/dns/rdata/generic/afsdb_18.h
index 25c60705ea..1bcd0bfd87 100644
--- a/lib/dns/rdata/generic/afsdb_18.h
+++ b/lib/dns/rdata/generic/afsdb_18.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -18,7 +18,7 @@
 #ifndef GENERIC_AFSDB_18_H
 #define GENERIC_AFSDB_18_H 1
 
-/* $Id: afsdb_18.h,v 1.13 2000/07/27 09:48:50 tale Exp $ */
+/* $Id: afsdb_18.h,v 1.14 2000/08/01 01:25:07 tale Exp $ */
 
 /* RFC 1183 */
 
diff --git a/lib/dns/rdata/generic/cert_37.c b/lib/dns/rdata/generic/cert_37.c
index 6be6a1e070..15fa7081db 100644
--- a/lib/dns/rdata/generic/cert_37.c
+++ b/lib/dns/rdata/generic/cert_37.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cert_37.c,v 1.31 2000/07/27 09:48:51 tale Exp $ */
+/* $Id: cert_37.c,v 1.32 2000/08/01 01:25:08 tale Exp $ */
 
 /* Reviewed: Wed Mar 15 21:14:32 EST 2000 by tale */
 
@@ -44,7 +44,7 @@ fromtext_cert(ARGS_FROMTEXT) {
 	RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE));
 	RETERR(dns_cert_fromtext(&cert, &token.value.as_textregion));
 	RETERR(uint16_tobuffer(cert, target));
-	
+
 	/*
 	 * Key tag.
 	 */
@@ -115,7 +115,7 @@ fromwire_cert(ARGS_FROMWIRE) {
 	isc_region_t sr;
 
 	REQUIRE(type == 37);
-	
+
 	UNUSED(rdclass);
 	UNUSED(dctx);
 	UNUSED(downcase);
@@ -162,7 +162,7 @@ fromstruct_cert(ARGS_FROMSTRUCT) {
 	REQUIRE(source != NULL);
 	REQUIRE(cert->common.rdtype == type);
 	REQUIRE(cert->common.rdclass == rdclass);
-	
+
 	RETERR(uint16_tobuffer(cert->type, target));
 	RETERR(uint16_tobuffer(cert->key_tag, target));
 	RETERR(uint8_tobuffer(cert->algorithm, target));
diff --git a/lib/dns/rdata/generic/cert_37.h b/lib/dns/rdata/generic/cert_37.h
index 59fe05bd52..db7c4607d9 100644
--- a/lib/dns/rdata/generic/cert_37.h
+++ b/lib/dns/rdata/generic/cert_37.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cert_37.h,v 1.13 2000/07/27 09:48:52 tale Exp $ */
+/* $Id: cert_37.h,v 1.14 2000/08/01 01:25:09 tale Exp $ */
 
 /* RFC 2538 */
 #ifndef GENERIC_CERT_37_H
diff --git a/lib/dns/rdata/generic/cname_5.c b/lib/dns/rdata/generic/cname_5.c
index 3157e9fef7..bc8b2a483b 100644
--- a/lib/dns/rdata/generic/cname_5.c
+++ b/lib/dns/rdata/generic/cname_5.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cname_5.c,v 1.34 2000/07/27 09:48:53 tale Exp $ */
+/* $Id: cname_5.c,v 1.35 2000/08/01 01:25:10 tale Exp $ */
 
 /* reviewed: Wed Mar 15 16:48:45 PST 2000 by brister */
 
@@ -34,9 +34,9 @@ static inline isc_result_t
 	REQUIRE(type == 5);
 
 	UNUSED(rdclass);
-	
+
 	RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE));
-	
+
 	dns_name_init(&name, NULL);
 	buffer_fromregion(&buffer, &token.value.as_region);
 	origin = (origin != NULL) ? origin : dns_rootname;
@@ -135,7 +135,7 @@ tostruct_cname(ARGS_TOSTRUCT) {
 	isc_region_t region;
 	dns_rdata_cname_t *cname = target;
 	dns_name_t name;
-	
+
 	REQUIRE(rdata->type == 5);
 	REQUIRE(target != NULL);
 
@@ -170,7 +170,7 @@ additionaldata_cname(ARGS_ADDLDATA) {
 	UNUSED(rdata);
 	UNUSED(add);
 	UNUSED(arg);
-	
+
 	REQUIRE(rdata->type == 5);
 
 	return (ISC_R_SUCCESS);
diff --git a/lib/dns/rdata/generic/cname_5.h b/lib/dns/rdata/generic/cname_5.h
index e3e0665bd6..2899487612 100644
--- a/lib/dns/rdata/generic/cname_5.h
+++ b/lib/dns/rdata/generic/cname_5.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: cname_5.h,v 1.21 2000/07/27 09:48:54 tale Exp $ */
+/* $Id: cname_5.h,v 1.22 2000/08/01 01:25:11 tale Exp $ */
 
 #ifndef GENERIC_CNAME_5_H
 #define GENERIC_CNAME_5_H 1
diff --git a/lib/dns/rdata/generic/dname_39.c b/lib/dns/rdata/generic/dname_39.c
index e348d5c5d8..bf64a4a29b 100644
--- a/lib/dns/rdata/generic/dname_39.c
+++ b/lib/dns/rdata/generic/dname_39.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dname_39.c,v 1.24 2000/07/27 09:48:55 tale Exp $ */
+/* $Id: dname_39.c,v 1.25 2000/08/01 01:25:13 tale Exp $ */
 
 /* Reviewed: Wed Mar 15 16:52:38 PST 2000 by explorer */
 
@@ -35,9 +35,9 @@ fromtext_dname(ARGS_FROMTEXT) {
 	UNUSED(rdclass);
 
 	REQUIRE(type == 39);
-	
+
 	RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE));
-	
+
 	dns_name_init(&name, NULL);
 	buffer_fromregion(&buffer, &token.value.as_region);
 	origin = (origin != NULL) ? origin : dns_rootname;
@@ -158,7 +158,7 @@ freestruct_dname(ARGS_FREESTRUCT) {
 
 	REQUIRE(source != NULL);
 	REQUIRE(dname->common.rdtype == 39);
-	
+
 	if (dname->mctx == NULL)
 		return;
 
diff --git a/lib/dns/rdata/generic/dname_39.h b/lib/dns/rdata/generic/dname_39.h
index 4e6a88c976..28c46e7c7a 100644
--- a/lib/dns/rdata/generic/dname_39.h
+++ b/lib/dns/rdata/generic/dname_39.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -18,7 +18,7 @@
 #ifndef GENERIC_DNAME_39_H
 #define GENERIC_DNAME_39_H 1
 
-/* $Id: dname_39.h,v 1.13 2000/07/27 09:48:56 tale Exp $ */
+/* $Id: dname_39.h,v 1.14 2000/08/01 01:25:14 tale Exp $ */
 
 /* draft-ietf-dnsind-dname-02.txt */
 
diff --git a/lib/dns/rdata/generic/gpos_27.c b/lib/dns/rdata/generic/gpos_27.c
index 5121cecc2f..229f65ceab 100644
--- a/lib/dns/rdata/generic/gpos_27.c
+++ b/lib/dns/rdata/generic/gpos_27.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: gpos_27.c,v 1.23 2000/07/27 09:48:58 tale Exp $ */
+/* $Id: gpos_27.c,v 1.24 2000/08/01 01:25:15 tale Exp $ */
 
 /* reviewed: Wed Mar 15 16:48:45 PST 2000 by brister */
 
@@ -94,7 +94,7 @@ static inline int
 compare_gpos(ARGS_COMPARE) {
 	isc_region_t r1;
 	isc_region_t r2;
-	
+
 	REQUIRE(rdata1->type == rdata2->type);
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 27);
@@ -163,7 +163,7 @@ tostruct_gpos(ARGS_TOSTRUCT) {
 			mem_maybedup(mctx, region.base, gpos->alt_len);
 		if (gpos->altitude == NULL)
 			goto cleanup_latitude;
-	} else 
+	} else
 		gpos->altitude = NULL;
 
 	gpos->mctx = mctx;
diff --git a/lib/dns/rdata/generic/gpos_27.h b/lib/dns/rdata/generic/gpos_27.h
index 4fafc31192..4fcdfd2ab5 100644
--- a/lib/dns/rdata/generic/gpos_27.h
+++ b/lib/dns/rdata/generic/gpos_27.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -18,7 +18,7 @@
 #ifndef GENERIC_GPOS_27_H
 #define GENERIC_GPOS_27_H 1
 
-/* $Id: gpos_27.h,v 1.10 2000/07/27 09:48:59 tale Exp $ */
+/* $Id: gpos_27.h,v 1.11 2000/08/01 01:25:16 tale Exp $ */
 
 /* RFC 1712 */
 
diff --git a/lib/dns/rdata/generic/hinfo_13.c b/lib/dns/rdata/generic/hinfo_13.c
index 7043e62c4a..ab59534930 100644
--- a/lib/dns/rdata/generic/hinfo_13.c
+++ b/lib/dns/rdata/generic/hinfo_13.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: hinfo_13.c,v 1.28 2000/07/27 09:49:00 tale Exp $ */
+/* $Id: hinfo_13.c,v 1.29 2000/08/01 01:25:17 tale Exp $ */
 
 /*
  * Reviewed: Wed Mar 15 16:47:10 PST 2000 by halley.
@@ -86,7 +86,7 @@ static inline int
 compare_hinfo(ARGS_COMPARE) {
 	isc_region_t r1;
 	isc_region_t r2;
-	
+
 	REQUIRE(rdata1->type == rdata2->type);
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 13);
diff --git a/lib/dns/rdata/generic/hinfo_13.h b/lib/dns/rdata/generic/hinfo_13.h
index 63c903ead0..a0ed9540f0 100644
--- a/lib/dns/rdata/generic/hinfo_13.h
+++ b/lib/dns/rdata/generic/hinfo_13.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -18,7 +18,7 @@
 #ifndef GENERIC_HINFO_13_H
 #define GENERIC_HINFO_13_H 1
 
-/* $Id: hinfo_13.h,v 1.20 2000/07/27 09:49:01 tale Exp $ */
+/* $Id: hinfo_13.h,v 1.21 2000/08/01 01:25:18 tale Exp $ */
 
 typedef struct dns_rdata_hinfo {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/generic/isdn_20.c b/lib/dns/rdata/generic/isdn_20.c
index 77f6e89b3e..39e7e8efbf 100644
--- a/lib/dns/rdata/generic/isdn_20.c
+++ b/lib/dns/rdata/generic/isdn_20.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: isdn_20.c,v 1.21 2000/07/27 09:49:02 tale Exp $ */
+/* $Id: isdn_20.c,v 1.22 2000/08/01 01:25:19 tale Exp $ */
 
 /* Reviewed: Wed Mar 15 16:53:11 PST 2000 by bwelling */
 
@@ -93,7 +93,7 @@ static inline int
 compare_isdn(ARGS_COMPARE) {
 	isc_region_t r1;
 	isc_region_t r2;
-	
+
 	REQUIRE(rdata1->type == rdata2->type);
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 20);
@@ -166,7 +166,7 @@ freestruct_isdn(ARGS_FREESTRUCT) {
 	dns_rdata_isdn_t *isdn = source;
 
 	REQUIRE(source != NULL);
-	
+
 	if (isdn->mctx == NULL)
 		return;
 
diff --git a/lib/dns/rdata/generic/isdn_20.h b/lib/dns/rdata/generic/isdn_20.h
index 677047f950..8783c93f2a 100644
--- a/lib/dns/rdata/generic/isdn_20.h
+++ b/lib/dns/rdata/generic/isdn_20.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -18,7 +18,7 @@
 #ifndef GENERIC_ISDN_20_H
 #define GENERIC_ISDN_20_H 1
 
-/* $Id: isdn_20.h,v 1.11 2000/07/27 09:49:03 tale Exp $ */
+/* $Id: isdn_20.h,v 1.12 2000/08/01 01:25:20 tale Exp $ */
 
 /* RFC 1183 */
 
diff --git a/lib/dns/rdata/generic/key_25.c b/lib/dns/rdata/generic/key_25.c
index 035dc1bb4f..3dcc777cc4 100644
--- a/lib/dns/rdata/generic/key_25.c
+++ b/lib/dns/rdata/generic/key_25.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: key_25.c,v 1.28 2000/07/31 19:47:21 bwelling Exp $ */
+/* $Id: key_25.c,v 1.29 2000/08/01 01:25:22 tale Exp $ */
 
 /*
  * Reviewed: Wed Mar 15 16:47:10 PST 2000 by halley.
@@ -53,11 +53,11 @@ fromtext_key(ARGS_FROMTEXT) {
 	RETERR(dns_secproto_fromtext(&proto, &token.value.as_textregion));
 	RETERR(mem_tobuffer(target, &proto, 1));
 
-	/* algorithm */	
+	/* algorithm */
 	RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE));
 	RETERR(dns_secalg_fromtext(&alg, &token.value.as_textregion));
 	RETERR(mem_tobuffer(target, &alg, 1));
-	
+
 	/* No Key? */
 	if ((flags & 0xc000) == 0xc000)
 		return (ISC_R_SUCCESS);
diff --git a/lib/dns/rdata/generic/key_25.h b/lib/dns/rdata/generic/key_25.h
index 57b9240a6b..7e8f953f2a 100644
--- a/lib/dns/rdata/generic/key_25.h
+++ b/lib/dns/rdata/generic/key_25.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -18,7 +18,7 @@
 #ifndef GENERIC_KEY_25_H
 #define GENERIC_KEY_25_H 1
 
-/* $Id: key_25.h,v 1.12 2000/07/27 09:49:05 tale Exp $ */
+/* $Id: key_25.h,v 1.13 2000/08/01 01:25:23 tale Exp $ */
 
 /* RFC 2535 */
 
diff --git a/lib/dns/rdata/generic/loc_29.c b/lib/dns/rdata/generic/loc_29.c
index 56c4957029..b87337ea09 100644
--- a/lib/dns/rdata/generic/loc_29.c
+++ b/lib/dns/rdata/generic/loc_29.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: loc_29.c,v 1.22 2000/07/27 09:49:06 tale Exp $ */
+/* $Id: loc_29.c,v 1.23 2000/08/01 01:25:24 tale Exp $ */
 
 /* Reviewed: Wed Mar 15 18:13:09 PST 2000 by explorer */
 
@@ -55,7 +55,7 @@ fromtext_loc(ARGS_FROMTEXT) {
 	UNUSED(downcase);
 
 	REQUIRE(type == 29);
-	
+
 	/*
 	 * Defaults.
 	 */
@@ -154,7 +154,7 @@ fromtext_loc(ARGS_FROMTEXT) {
 		return (ISC_R_RANGE);
 	if (d2 == 180 && m2 != 0)
 		return (ISC_R_RANGE);
-		
+
 	/*
 	 * Seconds.
 	 */
@@ -265,7 +265,7 @@ fromtext_loc(ARGS_FROMTEXT) {
 		}
 		for ( ; i < 2 ; i++)
 			cm *= 10;
-	} 
+	}
 	if (*e == 'm')
 		e++;
 	if (*e != 0)
@@ -367,7 +367,7 @@ fromtext_loc(ARGS_FROMTEXT) {
 		}
 		for ( ; i < 2 ; i++)
 			cm *= 10;
-	} 
+	}
 	if (*e == 'm')
 		e++;
 	if (*e != 0)
@@ -519,7 +519,7 @@ fromwire_loc(ARGS_FROMWIRE) {
 	UNUSED(downcase);
 
 	REQUIRE(type == 29);
-	
+
 	isc_buffer_activeregion(source, &sr);
 	if (sr.length < 1)
 		return (ISC_R_UNEXPECTEDEND);
@@ -549,7 +549,7 @@ fromwire_loc(ARGS_FROMWIRE) {
 	 */
 	c = sr.base[3];
 	if (c != 0)
-		if ((c&0xf) > 9 || ((c>>4)&0xf) > 9 || ((c>>4)&0xf) == 0) 
+		if ((c&0xf) > 9 || ((c>>4)&0xf) > 9 || ((c>>4)&0xf) == 0)
 			return (ISC_R_RANGE);
 	isc_region_consume(&sr, 4);
 
@@ -585,7 +585,7 @@ towire_loc(ARGS_TOWIRE) {
 	UNUSED(cctx);
 
 	REQUIRE(rdata->type == 29);
-	
+
 	return (mem_tobuffer(target, rdata->data, rdata->length));
 }
 
@@ -612,23 +612,23 @@ fromstruct_loc(ARGS_FROMSTRUCT) {
 	REQUIRE(source != NULL);
 	REQUIRE(loc->common.rdtype == type);
 	REQUIRE(loc->common.rdclass == rdclass);
-	
+
 	if (loc->v.v0.version != 0)
 		return (ISC_R_NOTIMPLEMENTED);
 	RETERR(uint8_tobuffer(loc->v.v0.version, target));
 
 	c = loc->v.v0.size;
-	if ((c&0xf) > 9 || ((c>>4)&0xf) > 9 || ((c>>4)&0xf) == 0) 
+	if ((c&0xf) > 9 || ((c>>4)&0xf) > 9 || ((c>>4)&0xf) == 0)
 		return (ISC_R_RANGE);
 	RETERR(uint8_tobuffer(loc->v.v0.size, target));
 
 	c = loc->v.v0.horizontal;
-	if ((c&0xf) > 9 || ((c>>4)&0xf) > 9 || ((c>>4)&0xf) == 0) 
+	if ((c&0xf) > 9 || ((c>>4)&0xf) > 9 || ((c>>4)&0xf) == 0)
 		return (ISC_R_RANGE);
 	RETERR(uint8_tobuffer(loc->v.v0.horizontal, target));
 
 	c = loc->v.v0.vertical;
-	if ((c&0xf) > 9 || ((c>>4)&0xf) > 9 || ((c>>4)&0xf) == 0) 
+	if ((c&0xf) > 9 || ((c>>4)&0xf) > 9 || ((c>>4)&0xf) == 0)
 		return (ISC_R_RANGE);
 	RETERR(uint8_tobuffer(loc->v.v0.vertical, target));
 
diff --git a/lib/dns/rdata/generic/loc_29.h b/lib/dns/rdata/generic/loc_29.h
index fe76476b20..761fbfc07f 100644
--- a/lib/dns/rdata/generic/loc_29.h
+++ b/lib/dns/rdata/generic/loc_29.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -18,7 +18,7 @@
 #ifndef GENERIC_LOC_29_H
 #define GENERIC_LOC_29_H 1
 
-/* $Id: loc_29.h,v 1.12 2000/07/27 09:49:07 tale Exp $ */
+/* $Id: loc_29.h,v 1.13 2000/08/01 01:25:25 tale Exp $ */
 
 /* RFC 1876 */
 
@@ -26,7 +26,7 @@ typedef struct dns_rdata_loc_0 {
 	isc_uint8_t	version;	/* must be first and zero */
 	isc_uint8_t	size;
 	isc_uint8_t	horizontal;
-	isc_uint8_t	vertical;	
+	isc_uint8_t	vertical;
 	isc_uint32_t	latitude;
 	isc_uint32_t	longitude;
 	isc_uint32_t	altitude;
diff --git a/lib/dns/rdata/generic/mb_7.c b/lib/dns/rdata/generic/mb_7.c
index f7f3f0d911..f22eb2badc 100644
--- a/lib/dns/rdata/generic/mb_7.c
+++ b/lib/dns/rdata/generic/mb_7.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mb_7.c,v 1.32 2000/07/27 09:49:09 tale Exp $ */
+/* $Id: mb_7.c,v 1.33 2000/08/01 01:25:26 tale Exp $ */
 
 /* Reviewed: Wed Mar 15 17:31:26 PST 2000 by bwelling */
 
@@ -159,7 +159,7 @@ freestruct_mb(ARGS_FREESTRUCT) {
 
 	if (mb->mctx == NULL)
 		return;
-	
+
 	dns_name_free(&mb->mb, mb->mctx);
 	mb->mctx = NULL;
 }
diff --git a/lib/dns/rdata/generic/mb_7.h b/lib/dns/rdata/generic/mb_7.h
index 910edf4439..4505031b88 100644
--- a/lib/dns/rdata/generic/mb_7.h
+++ b/lib/dns/rdata/generic/mb_7.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -18,7 +18,7 @@
 #ifndef GENERIC_MB_7_H
 #define GENERIC_MB_7_H 1
 
-/* $Id: mb_7.h,v 1.20 2000/07/27 09:49:10 tale Exp $ */
+/* $Id: mb_7.h,v 1.21 2000/08/01 01:25:27 tale Exp $ */
 
 typedef struct dns_rdata_mb {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/generic/md_3.c b/lib/dns/rdata/generic/md_3.c
index b822b458b1..3bdf294b87 100644
--- a/lib/dns/rdata/generic/md_3.c
+++ b/lib/dns/rdata/generic/md_3.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: md_3.c,v 1.34 2000/07/27 09:49:11 tale Exp $ */
+/* $Id: md_3.c,v 1.35 2000/08/01 01:25:28 tale Exp $ */
 
 /* Reviewed: Wed Mar 15 17:48:20 PST 2000 by bwelling */
 
diff --git a/lib/dns/rdata/generic/md_3.h b/lib/dns/rdata/generic/md_3.h
index 643fa6896a..2d6032bfe9 100644
--- a/lib/dns/rdata/generic/md_3.h
+++ b/lib/dns/rdata/generic/md_3.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -18,7 +18,7 @@
 #ifndef GENERIC_MD_3_H
 #define GENERIC_MD_3_H 1
 
-/* $Id: md_3.h,v 1.21 2000/07/27 09:49:12 tale Exp $ */
+/* $Id: md_3.h,v 1.22 2000/08/01 01:25:29 tale Exp $ */
 
 typedef struct dns_rdata_md {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/generic/mf_4.c b/lib/dns/rdata/generic/mf_4.c
index 71547f1ec9..dff440e855 100644
--- a/lib/dns/rdata/generic/mf_4.c
+++ b/lib/dns/rdata/generic/mf_4.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mf_4.c,v 1.32 2000/07/27 09:49:13 tale Exp $ */
+/* $Id: mf_4.c,v 1.33 2000/08/01 01:25:30 tale Exp $ */
 
 /* reviewed: Wed Mar 15 17:47:33 PST 2000 by brister */
 
@@ -71,7 +71,7 @@ fromwire_mf(ARGS_FROMWIRE) {
 	UNUSED(rdclass);
 
 	dns_decompress_setmethods(dctx, DNS_COMPRESS_GLOBAL14);
-        
+
         dns_name_init(&name, NULL);
         return (dns_name_fromwire(&name, source, dctx, downcase, target));
 }
diff --git a/lib/dns/rdata/generic/mf_4.h b/lib/dns/rdata/generic/mf_4.h
index faa1b32267..f2d449b4af 100644
--- a/lib/dns/rdata/generic/mf_4.h
+++ b/lib/dns/rdata/generic/mf_4.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -18,7 +18,7 @@
 #ifndef GENERIC_MF_4_H
 #define GENERIC_MF_4_H 1
 
-/* $Id: mf_4.h,v 1.19 2000/07/27 09:49:14 tale Exp $ */
+/* $Id: mf_4.h,v 1.20 2000/08/01 01:25:32 tale Exp $ */
 
 typedef struct dns_rdata_mf {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/generic/mg_8.c b/lib/dns/rdata/generic/mg_8.c
index 04ebe2b705..4e59368d9e 100644
--- a/lib/dns/rdata/generic/mg_8.c
+++ b/lib/dns/rdata/generic/mg_8.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mg_8.c,v 1.30 2000/07/27 09:49:15 tale Exp $ */
+/* $Id: mg_8.c,v 1.31 2000/08/01 01:25:33 tale Exp $ */
 
 /* reviewed: Wed Mar 15 17:49:21 PST 2000 by brister */
 
@@ -33,7 +33,7 @@ fromtext_mg(ARGS_FROMTEXT) {
 	REQUIRE(type == 8);
 
 	UNUSED(rdclass);
-	
+
 	RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE));
 
 	dns_name_init(&name, NULL);
@@ -71,7 +71,7 @@ fromwire_mg(ARGS_FROMWIRE) {
 	UNUSED(rdclass);
 
 	dns_decompress_setmethods(dctx, DNS_COMPRESS_GLOBAL14);
-        
+
         dns_name_init(&name, NULL);
         return (dns_name_fromwire(&name, source, dctx, downcase, target));
 }
@@ -157,7 +157,7 @@ freestruct_mg(ARGS_FREESTRUCT) {
 
 	REQUIRE(source != NULL);
 	REQUIRE(mg->common.rdtype == 8);
-	
+
 	if (mg->mctx == NULL)
 		return;
 	dns_name_free(&mg->mg, mg->mctx);
diff --git a/lib/dns/rdata/generic/mg_8.h b/lib/dns/rdata/generic/mg_8.h
index d0762c4351..8fbb7d10bf 100644
--- a/lib/dns/rdata/generic/mg_8.h
+++ b/lib/dns/rdata/generic/mg_8.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -18,7 +18,7 @@
 #ifndef GENERIC_MG_8_H
 #define GENERIC_MG_8_H 1
 
-/* $Id: mg_8.h,v 1.19 2000/07/27 09:49:16 tale Exp $ */
+/* $Id: mg_8.h,v 1.20 2000/08/01 01:25:34 tale Exp $ */
 
 typedef struct dns_rdata_mg {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/generic/minfo_14.c b/lib/dns/rdata/generic/minfo_14.c
index caf1efa62f..096ff84087 100644
--- a/lib/dns/rdata/generic/minfo_14.c
+++ b/lib/dns/rdata/generic/minfo_14.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: minfo_14.c,v 1.31 2000/07/27 09:49:18 tale Exp $ */
+/* $Id: minfo_14.c,v 1.32 2000/08/01 01:25:35 tale Exp $ */
 
 /* reviewed: Wed Mar 15 17:45:32 PST 2000 by brister */
 
@@ -34,7 +34,7 @@ fromtext_minfo(ARGS_FROMTEXT) {
 	REQUIRE(type == 14);
 
 	UNUSED(rdclass);
-	
+
 	for (i = 0; i < 2 ; i++) {
 		RETERR(gettoken(lexer, &token, isc_tokentype_string,
 				ISC_FALSE));
@@ -83,7 +83,7 @@ static inline isc_result_t
 fromwire_minfo(ARGS_FROMWIRE) {
         dns_name_t rmail;
         dns_name_t email;
-        
+
 	REQUIRE(type == 14);
 
 	dns_decompress_setmethods(dctx, DNS_COMPRESS_GLOBAL14);
diff --git a/lib/dns/rdata/generic/minfo_14.h b/lib/dns/rdata/generic/minfo_14.h
index 4395275ab2..ce0ff5d7ce 100644
--- a/lib/dns/rdata/generic/minfo_14.h
+++ b/lib/dns/rdata/generic/minfo_14.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -18,7 +18,7 @@
 #ifndef GENERIC_MINFO_14_H
 #define GENERIC_MINFO_14_H 1
 
-/* $Id: minfo_14.h,v 1.20 2000/07/27 09:49:19 tale Exp $ */
+/* $Id: minfo_14.h,v 1.21 2000/08/01 01:25:36 tale Exp $ */
 
 typedef struct dns_rdata_minfo {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/generic/mr_9.c b/lib/dns/rdata/generic/mr_9.c
index f0495e0efb..7a908b4821 100644
--- a/lib/dns/rdata/generic/mr_9.c
+++ b/lib/dns/rdata/generic/mr_9.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mr_9.c,v 1.29 2000/07/27 09:49:20 tale Exp $ */
+/* $Id: mr_9.c,v 1.30 2000/08/01 01:25:37 tale Exp $ */
 
 /* Reviewed: Wed Mar 15 21:30:35 EST 2000 by tale */
 
@@ -33,7 +33,7 @@ fromtext_mr(ARGS_FROMTEXT) {
 	REQUIRE(type == 9);
 
 	UNUSED(rdclass);
-	
+
 	RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE));
 
 	dns_name_init(&name, NULL);
diff --git a/lib/dns/rdata/generic/mr_9.h b/lib/dns/rdata/generic/mr_9.h
index 6b12e4e976..b5bb01c954 100644
--- a/lib/dns/rdata/generic/mr_9.h
+++ b/lib/dns/rdata/generic/mr_9.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -18,7 +18,7 @@
 #ifndef GENERIC_MR_9_H
 #define GENERIC_MR_9_H 1
 
-/* $Id: mr_9.h,v 1.19 2000/07/27 09:49:21 tale Exp $ */
+/* $Id: mr_9.h,v 1.20 2000/08/01 01:25:38 tale Exp $ */
 
 typedef struct dns_rdata_mr {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/generic/mx_15.c b/lib/dns/rdata/generic/mx_15.c
index adf3878ce7..95b1292a42 100644
--- a/lib/dns/rdata/generic/mx_15.c
+++ b/lib/dns/rdata/generic/mx_15.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mx_15.c,v 1.39 2000/07/27 09:49:22 tale Exp $ */
+/* $Id: mx_15.c,v 1.40 2000/08/01 01:25:39 tale Exp $ */
 
 /* reviewed: Wed Mar 15 18:05:46 PST 2000 by brister */
 
@@ -83,7 +83,7 @@ fromwire_mx(ARGS_FROMWIRE) {
 	UNUSED(rdclass);
 
 	dns_decompress_setmethods(dctx, DNS_COMPRESS_GLOBAL14);
-        
+
         dns_name_init(&name, NULL);
 
 	isc_buffer_activeregion(source, &sregion);
diff --git a/lib/dns/rdata/generic/mx_15.h b/lib/dns/rdata/generic/mx_15.h
index 6cfde17910..23156bedfe 100644
--- a/lib/dns/rdata/generic/mx_15.h
+++ b/lib/dns/rdata/generic/mx_15.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -18,7 +18,7 @@
 #ifndef GENERIC_MX_15_H
 #define GENERIC_MX_15_H 1
 
-/* $Id: mx_15.h,v 1.22 2000/07/27 09:49:23 tale Exp $ */
+/* $Id: mx_15.h,v 1.23 2000/08/01 01:25:41 tale Exp $ */
 
 typedef struct dns_rdata_mx {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/generic/ns_2.c b/lib/dns/rdata/generic/ns_2.c
index 2724eed98c..51c54268ce 100644
--- a/lib/dns/rdata/generic/ns_2.c
+++ b/lib/dns/rdata/generic/ns_2.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ns_2.c,v 1.33 2000/07/27 09:49:24 tale Exp $ */
+/* $Id: ns_2.c,v 1.34 2000/08/01 01:25:42 tale Exp $ */
 
 /* Reviewed: Wed Mar 15 18:15:00 PST 2000 by bwelling */
 
diff --git a/lib/dns/rdata/generic/ns_2.h b/lib/dns/rdata/generic/ns_2.h
index 97db027c89..ec027a042f 100644
--- a/lib/dns/rdata/generic/ns_2.h
+++ b/lib/dns/rdata/generic/ns_2.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -18,7 +18,7 @@
 #ifndef GENERIC_NS_2_H
 #define GENERIC_NS_2_H 1
 
-/* $Id: ns_2.h,v 1.20 2000/07/31 19:40:52 bwelling Exp $ */
+/* $Id: ns_2.h,v 1.21 2000/08/01 01:25:43 tale Exp $ */
 
 typedef struct dns_rdata_ns {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/generic/null_10.c b/lib/dns/rdata/generic/null_10.c
index 778c9f66f9..c8aefb3fb0 100644
--- a/lib/dns/rdata/generic/null_10.c
+++ b/lib/dns/rdata/generic/null_10.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: null_10.c,v 1.27 2000/07/27 09:49:27 tale Exp $ */
+/* $Id: null_10.c,v 1.28 2000/08/01 01:25:44 tale Exp $ */
 
 /* Reviewed: Thu Mar 16 13:57:50 PST 2000 by explorer */
 
@@ -129,7 +129,7 @@ tostruct_null(ARGS_TOSTRUCT) {
 static inline void
 freestruct_null(ARGS_FREESTRUCT) {
 	dns_rdata_null_t *null = source;
-	
+
 	REQUIRE(source != NULL);
 	REQUIRE(null->common.rdtype == 10);
 
diff --git a/lib/dns/rdata/generic/null_10.h b/lib/dns/rdata/generic/null_10.h
index a7b69b4b64..1484717d5e 100644
--- a/lib/dns/rdata/generic/null_10.h
+++ b/lib/dns/rdata/generic/null_10.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -18,7 +18,7 @@
 #ifndef GENERIC_NULL_10_H
 #define GENERIC_NULL_10_H 1
 
-/* $Id: null_10.h,v 1.18 2000/07/27 09:49:28 tale Exp $ */
+/* $Id: null_10.h,v 1.19 2000/08/01 01:25:45 tale Exp $ */
 
 typedef struct dns_rdata_null {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/generic/nxt_30.c b/lib/dns/rdata/generic/nxt_30.c
index ae0aa21d40..5a815abffd 100644
--- a/lib/dns/rdata/generic/nxt_30.c
+++ b/lib/dns/rdata/generic/nxt_30.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nxt_30.c,v 1.37 2000/07/27 09:49:29 tale Exp $ */
+/* $Id: nxt_30.c,v 1.38 2000/08/01 01:25:46 tale Exp $ */
 
 /* reviewed: Wed Mar 15 18:21:15 PST 2000 by brister */
 
@@ -45,7 +45,7 @@ fromtext_nxt(ARGS_FROMTEXT) {
 	REQUIRE(type == 30);
 
 	UNUSED(rdclass);
-	
+
 	/*
 	 * Next domain.
 	 */
@@ -64,7 +64,7 @@ fromtext_nxt(ARGS_FROMTEXT) {
 		n = strtol(token.value.as_pointer, &e, 10);
 		if (e != (char *)token.value.as_pointer && *e == '\0') {
 			covered = (dns_rdatatype_t)n;
-		} else if (dns_rdatatype_fromtext(&covered, 
+		} else if (dns_rdatatype_fromtext(&covered,
 				&token.value.as_textregion) == DNS_R_UNKNOWN)
 			return (DNS_R_UNKNOWN);
 		/*
@@ -78,7 +78,7 @@ fromtext_nxt(ARGS_FROMTEXT) {
 		bm[covered/8] |= (0x80>>(covered%8));
 	} while (1);
 	isc_lex_ungettoken(lexer, &token);
-	if (first) 
+	if (first)
 		return (ISC_R_SUCCESS);
 	n = (maxcovered + 8) / 8;
 	return (mem_tobuffer(target, bm, n));
@@ -137,7 +137,7 @@ fromwire_nxt(ARGS_FROMWIRE) {
 
 	dns_name_init(&name, NULL);
 	RETERR(dns_name_fromwire(&name, source, dctx, downcase, target));
-	
+
 	isc_buffer_activeregion(source, &sr);
 	/* XXXRTH  Enforce RFC 2535 length rules if bit 0 is not set. */
 	if (sr.length > 8 * 1024)
diff --git a/lib/dns/rdata/generic/nxt_30.h b/lib/dns/rdata/generic/nxt_30.h
index a15a4e3b39..3bf3417072 100644
--- a/lib/dns/rdata/generic/nxt_30.h
+++ b/lib/dns/rdata/generic/nxt_30.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -18,7 +18,7 @@
 #ifndef GENERIC_NXT_30_H
 #define GENERIC_NXT_30_H 1
 
-/* $Id: nxt_30.h,v 1.15 2000/07/27 09:49:30 tale Exp $ */
+/* $Id: nxt_30.h,v 1.16 2000/08/01 01:25:47 tale Exp $ */
 
 /* RFC 2065 */
 
diff --git a/lib/dns/rdata/generic/opt_41.c b/lib/dns/rdata/generic/opt_41.c
index 2b75dc780b..c8bd926294 100644
--- a/lib/dns/rdata/generic/opt_41.c
+++ b/lib/dns/rdata/generic/opt_41.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: opt_41.c,v 1.17 2000/07/27 09:49:31 tale Exp $ */
+/* $Id: opt_41.c,v 1.18 2000/08/01 01:25:48 tale Exp $ */
 
 /* Reviewed: Thu Mar 16 14:06:44 PST 2000 by gson */
 
diff --git a/lib/dns/rdata/generic/opt_41.h b/lib/dns/rdata/generic/opt_41.h
index 9c8add70ae..3c8e3f241d 100644
--- a/lib/dns/rdata/generic/opt_41.h
+++ b/lib/dns/rdata/generic/opt_41.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -18,7 +18,7 @@
 #ifndef GENERIC_OPT_41_H
 #define GENERIC_OPT_41_H 1
 
-/* $Id: opt_41.h,v 1.11 2000/07/27 09:49:32 tale Exp $ */
+/* $Id: opt_41.h,v 1.12 2000/08/01 01:25:50 tale Exp $ */
 
 /* RFC 2671 */
 
diff --git a/lib/dns/rdata/generic/proforma.c b/lib/dns/rdata/generic/proforma.c
index edf7f59777..5259276277 100644
--- a/lib/dns/rdata/generic/proforma.c
+++ b/lib/dns/rdata/generic/proforma.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: proforma.c,v 1.26 2000/07/27 09:49:33 tale Exp $ */
+/* $Id: proforma.c,v 1.27 2000/08/01 01:25:51 tale Exp $ */
 
 #ifndef RDATA_GENERIC_#_#_C
 #define RDATA_GENERIC_#_#_C
@@ -111,7 +111,7 @@ freestruct_#(ARGS_FREESTRUCT) {
 	REQUIRE(source != NULL);
 	REQUIRE(#->common.rdtype == #);
 	REQUIRE(#->common.rdclass == #);
-	
+
 }
 
 static inline isc_result_t
diff --git a/lib/dns/rdata/generic/proforma.h b/lib/dns/rdata/generic/proforma.h
index 66c2bf931a..0b7dd2b446 100644
--- a/lib/dns/rdata/generic/proforma.h
+++ b/lib/dns/rdata/generic/proforma.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -18,7 +18,7 @@
 #ifndef GENERIC_PROFORMA_H
 #define GENERIC_PROFORMA_H 1
 
-/* $Id: proforma.h,v 1.16 2000/07/27 09:49:34 tale Exp $ */
+/* $Id: proforma.h,v 1.17 2000/08/01 01:25:52 tale Exp $ */
 
 typedef struct dns_rdata_# {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/generic/ptr_12.c b/lib/dns/rdata/generic/ptr_12.c
index 7f1545e38d..ddd6d11525 100644
--- a/lib/dns/rdata/generic/ptr_12.c
+++ b/lib/dns/rdata/generic/ptr_12.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ptr_12.c,v 1.30 2000/07/27 09:49:35 tale Exp $ */
+/* $Id: ptr_12.c,v 1.31 2000/08/01 01:25:53 tale Exp $ */
 
 /* Reviewed: Thu Mar 16 14:05:12 PST 2000 by explorer */
 
@@ -71,7 +71,7 @@ fromwire_ptr(ARGS_FROMWIRE) {
 	REQUIRE(type == 12);
 
 	dns_decompress_setmethods(dctx, DNS_COMPRESS_GLOBAL14);
-        
+
         dns_name_init(&name, NULL);
         return (dns_name_fromwire(&name, source, dctx, downcase, target));
 }
@@ -157,7 +157,7 @@ freestruct_ptr(ARGS_FREESTRUCT) {
 
 	REQUIRE(source != NULL);
 	REQUIRE(ptr->common.rdtype == 12);
-	
+
 	if (ptr->mctx == NULL)
 		return;
 
diff --git a/lib/dns/rdata/generic/ptr_12.h b/lib/dns/rdata/generic/ptr_12.h
index 27e047fb15..78b689ba48 100644
--- a/lib/dns/rdata/generic/ptr_12.h
+++ b/lib/dns/rdata/generic/ptr_12.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -18,7 +18,7 @@
 #ifndef GENERIC_PTR_12_H
 #define GENERIC_PTR_12_H 1
 
-/* $Id: ptr_12.h,v 1.20 2000/07/27 09:49:36 tale Exp $ */
+/* $Id: ptr_12.h,v 1.21 2000/08/01 01:25:54 tale Exp $ */
 
 typedef struct dns_rdata_ptr {
         dns_rdatacommon_t       common;
diff --git a/lib/dns/rdata/generic/rp_17.c b/lib/dns/rdata/generic/rp_17.c
index 43ac67fd7b..55e4fbbddb 100644
--- a/lib/dns/rdata/generic/rp_17.c
+++ b/lib/dns/rdata/generic/rp_17.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rp_17.c,v 1.26 2000/07/27 09:49:38 tale Exp $ */
+/* $Id: rp_17.c,v 1.27 2000/08/01 01:25:55 tale Exp $ */
 
 /* RFC 1183 */
 
@@ -85,7 +85,7 @@ fromwire_rp(ARGS_FROMWIRE) {
         dns_name_t email;
 
 	UNUSED(rdclass);
-        
+
 	REQUIRE(type == 17);
 
 	dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
diff --git a/lib/dns/rdata/generic/rp_17.h b/lib/dns/rdata/generic/rp_17.h
index 6a48bcb016..fb44667b5c 100644
--- a/lib/dns/rdata/generic/rp_17.h
+++ b/lib/dns/rdata/generic/rp_17.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -18,7 +18,7 @@
 #ifndef GENERIC_RP_17_H
 #define GENERIC_RP_17_H 1
 
-/* $Id: rp_17.h,v 1.14 2000/07/27 09:49:39 tale Exp $ */
+/* $Id: rp_17.h,v 1.15 2000/08/01 01:25:56 tale Exp $ */
 
 /* RFC 1183 */
 
diff --git a/lib/dns/rdata/generic/rt_21.c b/lib/dns/rdata/generic/rt_21.c
index 35a761f379..14149ffd79 100644
--- a/lib/dns/rdata/generic/rt_21.c
+++ b/lib/dns/rdata/generic/rt_21.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rt_21.c,v 1.28 2000/07/27 09:49:40 tale Exp $ */
+/* $Id: rt_21.c,v 1.29 2000/08/01 01:25:58 tale Exp $ */
 
 /* reviewed: Thu Mar 16 15:02:31 PST 2000 by brister */
 
@@ -84,7 +84,7 @@ fromwire_rt(ARGS_FROMWIRE) {
 	UNUSED(rdclass);
 
 	dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
-        
+
         dns_name_init(&name, NULL);
 
 	isc_buffer_activeregion(source, &sregion);
diff --git a/lib/dns/rdata/generic/rt_21.h b/lib/dns/rdata/generic/rt_21.h
index 7e4dbec491..828729d78f 100644
--- a/lib/dns/rdata/generic/rt_21.h
+++ b/lib/dns/rdata/generic/rt_21.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -18,7 +18,7 @@
 #ifndef GENERIC_RT_21_H
 #define GENERIC_RT_21_H 1
 
-/* $Id: rt_21.h,v 1.14 2000/07/27 09:49:41 tale Exp $ */
+/* $Id: rt_21.h,v 1.15 2000/08/01 01:25:59 tale Exp $ */
 
 /* RFC 1183 */
 
diff --git a/lib/dns/rdata/generic/sig_24.c b/lib/dns/rdata/generic/sig_24.c
index 98add29c56..11fd7177b5 100644
--- a/lib/dns/rdata/generic/sig_24.c
+++ b/lib/dns/rdata/generic/sig_24.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sig_24.c,v 1.44 2000/07/27 09:49:42 tale Exp $ */
+/* $Id: sig_24.c,v 1.45 2000/08/01 01:26:00 tale Exp $ */
 
 /* Reviewed: Fri Mar 17 09:05:02 PST 2000 by gson */
 
@@ -29,7 +29,7 @@
 static inline isc_result_t
 fromtext_sig(ARGS_FROMTEXT) {
 	isc_token_t token;
-	unsigned char c; 
+	unsigned char c;
 	long i;
 	dns_rdatatype_t covered;
 	char *e;
@@ -98,7 +98,7 @@ fromtext_sig(ARGS_FROMTEXT) {
 	 */
 	RETERR(gettoken(lexer, &token, isc_tokentype_number, ISC_FALSE));
 	RETERR(uint16_tobuffer(token.value.as_ulong, target));
-	
+
 	/*
 	 * Signer.
 	 */
@@ -170,7 +170,7 @@ totext_sig(ARGS_TOTEXT) {
 	 */
 	ttl = uint32_fromregion(&sr);
 	isc_region_consume(&sr, 4);
-	sprintf(buf, "%lu", ttl); 
+	sprintf(buf, "%lu", ttl);
 	RETERR(str_totext(buf, target));
 	RETERR(str_totext(" ", target));
 
@@ -198,7 +198,7 @@ totext_sig(ARGS_TOTEXT) {
 	 */
 	foot = uint16_fromregion(&sr);
 	isc_region_consume(&sr, 2);
-	sprintf(buf, "%lu", foot); 
+	sprintf(buf, "%lu", foot);
 	RETERR(str_totext(buf, target));
 	RETERR(str_totext(" ", target));
 
@@ -220,7 +220,7 @@ totext_sig(ARGS_TOTEXT) {
 				    tctx->linebreak, target));
 	if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0)
 		RETERR(str_totext(" )", target));
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -232,7 +232,7 @@ fromwire_sig(ARGS_FROMWIRE) {
 	REQUIRE(type == 24);
 
 	dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
-	
+
 	UNUSED(rdclass);
 
 	isc_buffer_activeregion(source, &sr);
@@ -291,7 +291,7 @@ towire_sig(ARGS_TOWIRE) {
 	 */
 	dns_name_init(&name, NULL);
 	dns_name_fromregion(&name, &sr);
-	isc_region_consume(&sr, name_length(&name));        
+	isc_region_consume(&sr, name_length(&name));
 	RETERR(dns_name_towire(&name, cctx, target));
 
 	/*
@@ -351,7 +351,7 @@ fromstruct_sig(ARGS_FROMSTRUCT) {
 	REQUIRE(sig->common.rdclass == rdclass);
 	REQUIRE((sig->signature != NULL && sig->siglen != 0) ||
 		(sig->signature == NULL && sig->siglen == 0));
-	
+
 	/*
 	 * Type covered.
 	 */
@@ -406,7 +406,7 @@ tostruct_sig(ARGS_TOSTRUCT) {
 
 	REQUIRE(rdata->type == 24);
 	REQUIRE(target != NULL);
-	
+
 	sig->common.rdclass = rdata->rdclass;
 	sig->common.rdtype = rdata->type;
 	ISC_LINK_INIT(&sig->common, link);
diff --git a/lib/dns/rdata/generic/sig_24.h b/lib/dns/rdata/generic/sig_24.h
index 9e8880c157..779c1545f0 100644
--- a/lib/dns/rdata/generic/sig_24.h
+++ b/lib/dns/rdata/generic/sig_24.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -18,7 +18,7 @@
 #ifndef GENERIC_SIG_24_H
 #define GENERIC_SIG_24_H 1
 
-/* $Id: sig_24.h,v 1.19 2000/07/27 09:49:43 tale Exp $ */
+/* $Id: sig_24.h,v 1.20 2000/08/01 01:26:01 tale Exp $ */
 
 /* RFC 2535 */
 
diff --git a/lib/dns/rdata/generic/soa_6.c b/lib/dns/rdata/generic/soa_6.c
index b6fc2a6015..4b4c538c5c 100644
--- a/lib/dns/rdata/generic/soa_6.c
+++ b/lib/dns/rdata/generic/soa_6.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: soa_6.c,v 1.41 2000/07/27 09:49:44 tale Exp $ */
+/* $Id: soa_6.c,v 1.42 2000/08/01 01:26:02 tale Exp $ */
 
 /* Reviewed: Thu Mar 16 15:18:32 PST 2000 by explorer */
 
@@ -90,7 +90,7 @@ totext_soa(ARGS_TOTEXT) {
 
 	sub = name_prefix(&mname, tctx->origin, &prefix);
 	RETERR(dns_name_totext(&prefix, sub, target));
-	
+
 	RETERR(str_totext(" ", target));
 
 	sub = name_prefix(&rname, tctx->origin, &prefix);
@@ -139,7 +139,7 @@ fromwire_soa(ARGS_FROMWIRE) {
 	isc_region_t tregion;
 
 	UNUSED(rdclass);
-       
+
 	REQUIRE(type == 6);
 
 	dns_decompress_setmethods(dctx, DNS_COMPRESS_GLOBAL14);
diff --git a/lib/dns/rdata/generic/soa_6.h b/lib/dns/rdata/generic/soa_6.h
index 83cd9603a1..19e78c6a3b 100644
--- a/lib/dns/rdata/generic/soa_6.h
+++ b/lib/dns/rdata/generic/soa_6.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -18,7 +18,7 @@
 #ifndef GENERIC_SOA_6_H
 #define GENERIC_SOA_6_H 1
 
-/* $Id: soa_6.h,v 1.24 2000/07/27 09:49:46 tale Exp $ */
+/* $Id: soa_6.h,v 1.25 2000/08/01 01:26:03 tale Exp $ */
 
 typedef struct dns_rdata_soa {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/generic/tkey_249.c b/lib/dns/rdata/generic/tkey_249.c
index ce444b49c2..53685e9a56 100644
--- a/lib/dns/rdata/generic/tkey_249.c
+++ b/lib/dns/rdata/generic/tkey_249.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tkey_249.c,v 1.37 2000/07/27 09:49:47 tale Exp $ */
+/* $Id: tkey_249.c,v 1.38 2000/08/01 01:26:04 tale Exp $ */
 
 /*
  * Reviewed: Thu Mar 16 17:35:30 PST 2000 by halley.
@@ -117,7 +117,7 @@ fromtext_tkey(ARGS_FROMTEXT) {
 static inline isc_result_t
 totext_tkey(ARGS_TOTEXT) {
 	isc_region_t sr, dr;
-	char buf[sizeof "4294967295 "];	
+	char buf[sizeof "4294967295 "];
 	unsigned long n;
 	dns_name_t name;
 	dns_name_t prefix;
@@ -196,7 +196,7 @@ totext_tkey(ARGS_TOTEXT) {
 	if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0)
 		RETERR(str_totext(" ) ", target));
 	else
-		RETERR(str_totext(" ", target));		
+		RETERR(str_totext(" ", target));
 	isc_region_consume(&sr, n);
 
 	/*
@@ -236,7 +236,7 @@ fromwire_tkey(ARGS_FROMWIRE) {
 	REQUIRE(type == 249);
 
 	dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
-	
+
 	/*
 	 * Algorithm.
 	 */
@@ -311,7 +311,7 @@ compare_tkey(ARGS_COMPARE) {
 	REQUIRE(rdata1->type == rdata2->type);
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 249);
-	
+
 	/*
 	 * Algorithm.
 	 */
diff --git a/lib/dns/rdata/generic/tkey_249.h b/lib/dns/rdata/generic/tkey_249.h
index c423d5616c..8229f8f7f6 100644
--- a/lib/dns/rdata/generic/tkey_249.h
+++ b/lib/dns/rdata/generic/tkey_249.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -18,7 +18,7 @@
 #ifndef GENERIC_TKEY_249_H
 #define GENERIC_TKEY_249_H 1
 
-/* $Id: tkey_249.h,v 1.16 2000/07/27 09:49:48 tale Exp $ */
+/* $Id: tkey_249.h,v 1.17 2000/08/01 01:26:06 tale Exp $ */
 
 /* draft-ietf-dnsind-tkey-00.txt */
 
diff --git a/lib/dns/rdata/generic/txt_16.c b/lib/dns/rdata/generic/txt_16.c
index c7db7d180f..68a7f5d592 100644
--- a/lib/dns/rdata/generic/txt_16.c
+++ b/lib/dns/rdata/generic/txt_16.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: txt_16.c,v 1.29 2000/07/27 09:49:49 tale Exp $ */
+/* $Id: txt_16.c,v 1.30 2000/08/01 01:26:07 tale Exp $ */
 
 /* Reviewed: Thu Mar 16 15:40:00 PST 2000 by bwelling */
 
@@ -105,7 +105,7 @@ static inline int
 compare_txt(ARGS_COMPARE) {
 	isc_region_t r1;
 	isc_region_t r2;
-	
+
 	REQUIRE(rdata1->type == rdata2->type);
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 16);
@@ -189,7 +189,7 @@ additionaldata_txt(ARGS_ADDLDATA) {
 	UNUSED(rdata);
 	UNUSED(add);
 	UNUSED(arg);
-	
+
 	return (ISC_R_SUCCESS);
 }
 
diff --git a/lib/dns/rdata/generic/txt_16.h b/lib/dns/rdata/generic/txt_16.h
index 068dee2040..0e2ba89ea1 100644
--- a/lib/dns/rdata/generic/txt_16.h
+++ b/lib/dns/rdata/generic/txt_16.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -18,7 +18,7 @@
 #ifndef GENERIC_TXT_16_H
 #define GENERIC_TXT_16_H 1
 
-/* $Id: txt_16.h,v 1.21 2000/07/27 09:49:50 tale Exp $ */
+/* $Id: txt_16.h,v 1.22 2000/08/01 01:26:08 tale Exp $ */
 
 typedef struct dns_rdata_txt_string {
                 isc_uint8_t    length;
diff --git a/lib/dns/rdata/generic/unspec_103.c b/lib/dns/rdata/generic/unspec_103.c
index 88db1eccc3..22abfe808f 100644
--- a/lib/dns/rdata/generic/unspec_103.c
+++ b/lib/dns/rdata/generic/unspec_103.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: unspec_103.c,v 1.22 2000/07/27 09:49:51 tale Exp $ */
+/* $Id: unspec_103.c,v 1.23 2000/08/01 01:26:09 tale Exp $ */
 
 #ifndef RDATA_GENERIC_UNSPEC_103_C
 #define RDATA_GENERIC_UNSPEC_103_C
@@ -53,7 +53,7 @@ fromwire_unspec(ARGS_FROMWIRE) {
 	UNUSED(rdclass);
 	UNUSED(dctx);
 	UNUSED(downcase);
-	
+
 	isc_buffer_activeregion(source, &sr);
 	isc_buffer_forward(source, sr.length);
 	return (mem_tobuffer(target, sr.base, sr.length));
diff --git a/lib/dns/rdata/generic/unspec_103.h b/lib/dns/rdata/generic/unspec_103.h
index 4543ff834e..c68167b443 100644
--- a/lib/dns/rdata/generic/unspec_103.h
+++ b/lib/dns/rdata/generic/unspec_103.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -18,7 +18,7 @@
 #ifndef GENERIC_UNSPEC_103_H
 #define GENERIC_UNSPEC_103_H 1
 
-/* $Id: unspec_103.h,v 1.10 2000/07/27 09:49:52 tale Exp $ */
+/* $Id: unspec_103.h,v 1.11 2000/08/01 01:26:10 tale Exp $ */
 
 typedef struct dns_rdata_unspec_t {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/generic/x25_19.c b/lib/dns/rdata/generic/x25_19.c
index 9b967a1ff9..f40c4106d5 100644
--- a/lib/dns/rdata/generic/x25_19.c
+++ b/lib/dns/rdata/generic/x25_19.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: x25_19.c,v 1.22 2000/07/27 09:49:53 tale Exp $ */
+/* $Id: x25_19.c,v 1.23 2000/08/01 01:26:11 tale Exp $ */
 
 /* Reviewed: Thu Mar 16 16:15:57 PST 2000 by bwelling */
 
@@ -87,7 +87,7 @@ static inline int
 compare_x25(ARGS_COMPARE) {
 	isc_region_t r1;
 	isc_region_t r2;
-	
+
 	REQUIRE(rdata1->type == rdata2->type);
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 19);
diff --git a/lib/dns/rdata/generic/x25_19.h b/lib/dns/rdata/generic/x25_19.h
index 2815458349..75d33c9ffb 100644
--- a/lib/dns/rdata/generic/x25_19.h
+++ b/lib/dns/rdata/generic/x25_19.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -18,7 +18,7 @@
 #ifndef GENERIC_X25_19_H
 #define GENERIC_X25_19_H 1
 
-/* $Id: x25_19.h,v 1.11 2000/07/27 09:49:54 tale Exp $ */
+/* $Id: x25_19.h,v 1.12 2000/08/01 01:26:12 tale Exp $ */
 
 /* RFC 1183 */
 
diff --git a/lib/dns/rdata/hs_4/a_1.c b/lib/dns/rdata/hs_4/a_1.c
index 9e7c28a510..6a7e2a3e1d 100644
--- a/lib/dns/rdata/hs_4/a_1.c
+++ b/lib/dns/rdata/hs_4/a_1.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: a_1.c,v 1.15 2000/07/27 09:49:56 tale Exp $ */
+/* $Id: a_1.c,v 1.16 2000/08/01 01:26:13 tale Exp $ */
 
 /* reviewed: Thu Mar 16 15:58:36 PST 2000 by brister */
 
@@ -114,7 +114,7 @@ towire_hs_a(ARGS_TOWIRE) {
 static inline int
 compare_hs_a(ARGS_COMPARE) {
 	int order;
-	
+
 	REQUIRE(rdata1->type == rdata2->type);
 	REQUIRE(rdata1->rdclass == rdata2->type);
 	REQUIRE(rdata1->type == 1);
diff --git a/lib/dns/rdata/hs_4/a_1.h b/lib/dns/rdata/hs_4/a_1.h
index dd2aa6b417..543863464a 100644
--- a/lib/dns/rdata/hs_4/a_1.h
+++ b/lib/dns/rdata/hs_4/a_1.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -18,7 +18,7 @@
 #ifndef HS_4_A_1_H
 #define HS_4_A_1_H 1
 
-/* $Id: a_1.h,v 1.5 2000/07/27 09:49:57 tale Exp $ */
+/* $Id: a_1.h,v 1.6 2000/08/01 01:26:14 tale Exp $ */
 
 typedef struct dns_rdata_hs_a {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/in_1/a6_38.c b/lib/dns/rdata/in_1/a6_38.c
index 7f4c86fd42..c582b8aeac 100644
--- a/lib/dns/rdata/in_1/a6_38.c
+++ b/lib/dns/rdata/in_1/a6_38.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: a6_38.c,v 1.35 2000/07/27 09:49:58 tale Exp $ */
+/* $Id: a6_38.c,v 1.36 2000/08/01 01:26:16 tale Exp $ */
 
 /* draft-ietf-ipngwg-dns-lookups-03.txt */
 
@@ -211,7 +211,7 @@ compare_in_a6(ARGS_COMPARE) {
 	dns_name_t name2;
 	isc_region_t region1;
 	isc_region_t region2;
-	
+
 	REQUIRE(rdata1->type == rdata2->type);
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 38);
diff --git a/lib/dns/rdata/in_1/a6_38.h b/lib/dns/rdata/in_1/a6_38.h
index ccfc396437..945949856b 100644
--- a/lib/dns/rdata/in_1/a6_38.h
+++ b/lib/dns/rdata/in_1/a6_38.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -18,7 +18,7 @@
 #ifndef IN_1_A6_38_H
 #define IN_1_A6_38_H 1
 
-/* $Id: a6_38.h,v 1.15 2000/07/27 09:49:59 tale Exp $ */
+/* $Id: a6_38.h,v 1.16 2000/08/01 01:26:17 tale Exp $ */
 
 /* draft-ietf-ipngwg-dns-lookups-03.txt */
 
diff --git a/lib/dns/rdata/in_1/a_1.c b/lib/dns/rdata/in_1/a_1.c
index ba9224daa2..a1631f213f 100644
--- a/lib/dns/rdata/in_1/a_1.c
+++ b/lib/dns/rdata/in_1/a_1.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: a_1.c,v 1.36 2000/07/27 09:50:00 tale Exp $ */
+/* $Id: a_1.c,v 1.37 2000/08/01 01:26:18 tale Exp $ */
 
 /* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */
 
@@ -138,7 +138,7 @@ fromstruct_in_a(ARGS_FROMSTRUCT) {
 	REQUIRE(a->common.rdtype == type);
 	REQUIRE(a->common.rdclass == rdclass);
 
-	n = ntohl(a->in_addr.s_addr); 
+	n = ntohl(a->in_addr.s_addr);
 
 	return (uint32_tobuffer(n, target));
 }
diff --git a/lib/dns/rdata/in_1/a_1.h b/lib/dns/rdata/in_1/a_1.h
index 8c4574b7df..9da7331248 100644
--- a/lib/dns/rdata/in_1/a_1.h
+++ b/lib/dns/rdata/in_1/a_1.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -18,7 +18,7 @@
 #ifndef IN_1_A_1_H
 #define IN_1_A_1_H 1
 
-/* $Id: a_1.h,v 1.21 2000/07/27 09:50:02 tale Exp $ */
+/* $Id: a_1.h,v 1.22 2000/08/01 01:26:19 tale Exp $ */
 
 typedef struct dns_rdata_in_a {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/in_1/aaaa_28.c b/lib/dns/rdata/in_1/aaaa_28.c
index 2969af461c..d3ace06ff7 100644
--- a/lib/dns/rdata/in_1/aaaa_28.c
+++ b/lib/dns/rdata/in_1/aaaa_28.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: aaaa_28.c,v 1.27 2000/07/27 09:50:03 tale Exp $ */
+/* $Id: aaaa_28.c,v 1.28 2000/08/01 01:26:20 tale Exp $ */
 
 /* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */
 
diff --git a/lib/dns/rdata/in_1/aaaa_28.h b/lib/dns/rdata/in_1/aaaa_28.h
index 93d55b063e..3c8c211630 100644
--- a/lib/dns/rdata/in_1/aaaa_28.h
+++ b/lib/dns/rdata/in_1/aaaa_28.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -18,13 +18,13 @@
 #ifndef IN_1_AAAA_28_H
 #define IN_1_AAAA_28_H 1
 
-/* $Id: aaaa_28.h,v 1.14 2000/07/27 09:50:04 tale Exp $ */
+/* $Id: aaaa_28.h,v 1.15 2000/08/01 01:26:21 tale Exp $ */
 
 /* RFC 1886 */
 
 typedef struct dns_rdata_in_aaaa {
 	dns_rdatacommon_t	common;
-	struct in6_addr		in6_addr; 
+	struct in6_addr		in6_addr;
 } dns_rdata_in_aaaa_t;
 
 #endif /* IN_1_AAAA_28_H */
diff --git a/lib/dns/rdata/in_1/kx_36.c b/lib/dns/rdata/in_1/kx_36.c
index f7e293785c..7c25658321 100644
--- a/lib/dns/rdata/in_1/kx_36.c
+++ b/lib/dns/rdata/in_1/kx_36.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: kx_36.c,v 1.28 2000/07/27 09:50:05 tale Exp $ */
+/* $Id: kx_36.c,v 1.29 2000/08/01 01:26:22 tale Exp $ */
 
 /* Reviewed: Thu Mar 16 17:24:54 PST 2000 by explorer */
 
@@ -84,7 +84,7 @@ fromwire_in_kx(ARGS_FROMWIRE) {
 	REQUIRE(rdclass == 1);
 
 	dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
-        
+
         dns_name_init(&name, NULL);
 
 	isc_buffer_activeregion(source, &sregion);
diff --git a/lib/dns/rdata/in_1/kx_36.h b/lib/dns/rdata/in_1/kx_36.h
index 2de40aa9c9..d4aef31c6d 100644
--- a/lib/dns/rdata/in_1/kx_36.h
+++ b/lib/dns/rdata/in_1/kx_36.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -18,7 +18,7 @@
 #ifndef IN_1_KX_36_H
 #define IN_1_KX_36_H 1
 
-/* $Id: kx_36.h,v 1.13 2000/07/27 09:50:06 tale Exp $ */
+/* $Id: kx_36.h,v 1.14 2000/08/01 01:26:24 tale Exp $ */
 
 /* RFC 2230 */
 
diff --git a/lib/dns/rdata/in_1/naptr_35.c b/lib/dns/rdata/in_1/naptr_35.c
index 01f06c11d4..c5157e5eff 100644
--- a/lib/dns/rdata/in_1/naptr_35.c
+++ b/lib/dns/rdata/in_1/naptr_35.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: naptr_35.c,v 1.32 2000/07/27 09:50:07 tale Exp $ */
+/* $Id: naptr_35.c,v 1.33 2000/08/01 01:26:25 tale Exp $ */
 
 /* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */
 
@@ -149,7 +149,7 @@ fromwire_in_naptr(ARGS_FROMWIRE) {
 	REQUIRE(rdclass == 1);
 
 	dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
-        
+
         dns_name_init(&name, NULL);
 
 	/*
@@ -197,7 +197,7 @@ towire_in_naptr(ARGS_TOWIRE) {
 	dns_rdata_toregion(rdata, &sr);
 	RETERR(mem_tobuffer(target, sr.base, 4));
 	isc_region_consume(&sr, 4);
-	
+
 	/*
 	 * Flags.
 	 */
@@ -400,7 +400,7 @@ tostruct_in_naptr(ARGS_TOSTRUCT) {
 static inline void
 freestruct_in_naptr(ARGS_FREESTRUCT) {
 	dns_rdata_in_naptr_t *naptr = source;
-	
+
 	REQUIRE(source != NULL);
 	REQUIRE(naptr->common.rdclass == 1);
 	REQUIRE(naptr->common.rdtype == 35);
@@ -434,7 +434,7 @@ additionaldata_in_naptr(ARGS_ADDLDATA) {
 	 */
 	dns_rdata_toregion(rdata, &sr);
 	isc_region_consume(&sr, 4);
-	
+
 	/*
 	 * Flags.
 	 */
@@ -530,7 +530,7 @@ digest_in_naptr(ARGS_DIGEST) {
 
 	dns_name_init(&name, NULL);
 	dns_name_fromregion(&name, &r2);
-	
+
 	return (dns_name_digest(&name, digest, arg));
 }
 
diff --git a/lib/dns/rdata/in_1/naptr_35.h b/lib/dns/rdata/in_1/naptr_35.h
index ff416afd3f..502b7825c5 100644
--- a/lib/dns/rdata/in_1/naptr_35.h
+++ b/lib/dns/rdata/in_1/naptr_35.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -18,7 +18,7 @@
 #ifndef IN_1_NAPTR_35_H
 #define IN_1_NAPTR_35_H 1
 
-/* $Id: naptr_35.h,v 1.15 2000/07/27 09:50:08 tale Exp $ */
+/* $Id: naptr_35.h,v 1.16 2000/08/01 01:26:26 tale Exp $ */
 
 /* RFC 2168 */
 
diff --git a/lib/dns/rdata/in_1/nsap-ptr_23.c b/lib/dns/rdata/in_1/nsap-ptr_23.c
index bd66ad0eb4..72611f1f48 100644
--- a/lib/dns/rdata/in_1/nsap-ptr_23.c
+++ b/lib/dns/rdata/in_1/nsap-ptr_23.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsap-ptr_23.c,v 1.23 2000/07/27 09:50:09 tale Exp $ */
+/* $Id: nsap-ptr_23.c,v 1.24 2000/08/01 01:26:27 tale Exp $ */
 
 /* Reviewed: Fri Mar 17 10:16:02 PST 2000 by gson */
 
@@ -34,7 +34,7 @@ fromtext_in_nsap_ptr(ARGS_FROMTEXT) {
 
 	REQUIRE(type == 23);
 	REQUIRE(rdclass == 1);
-	
+
 	RETERR(gettoken(lexer, &token, isc_tokentype_string, ISC_FALSE));
 
 	dns_name_init(&name, NULL);
@@ -72,7 +72,7 @@ fromwire_in_nsap_ptr(ARGS_FROMWIRE) {
 	REQUIRE(rdclass == 1);
 
 	dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
-        
+
         dns_name_init(&name, NULL);
         return (dns_name_fromwire(&name, source, dctx, downcase, target));
 }
diff --git a/lib/dns/rdata/in_1/nsap-ptr_23.h b/lib/dns/rdata/in_1/nsap-ptr_23.h
index 677af34a62..0dc29123ff 100644
--- a/lib/dns/rdata/in_1/nsap-ptr_23.h
+++ b/lib/dns/rdata/in_1/nsap-ptr_23.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -18,7 +18,7 @@
 #ifndef IN_1_NSAP_PTR_23_H
 #define IN_1_NSAP_PTR_23_H 1
 
-/* $Id: nsap-ptr_23.h,v 1.12 2000/07/27 09:50:10 tale Exp $ */
+/* $Id: nsap-ptr_23.h,v 1.13 2000/08/01 01:26:28 tale Exp $ */
 
 /* RFC 1348.  Obsoleted in RFC 1706 - use PTR instead. */
 
diff --git a/lib/dns/rdata/in_1/nsap_22.c b/lib/dns/rdata/in_1/nsap_22.c
index 8db3b95b00..1b86674a5f 100644
--- a/lib/dns/rdata/in_1/nsap_22.c
+++ b/lib/dns/rdata/in_1/nsap_22.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsap_22.c,v 1.24 2000/07/27 09:50:11 tale Exp $ */
+/* $Id: nsap_22.c,v 1.25 2000/08/01 01:26:29 tale Exp $ */
 
 /* Reviewed: Fri Mar 17 10:41:07 PST 2000 by gson */
 
@@ -124,7 +124,7 @@ static inline int
 compare_in_nsap(ARGS_COMPARE) {
 	isc_region_t r1;
 	isc_region_t r2;
-	
+
 	REQUIRE(rdata1->type == rdata2->type);
 	REQUIRE(rdata1->rdclass == rdata2->rdclass);
 	REQUIRE(rdata1->type == 22);
diff --git a/lib/dns/rdata/in_1/nsap_22.h b/lib/dns/rdata/in_1/nsap_22.h
index e7e852d6a4..300195d70d 100644
--- a/lib/dns/rdata/in_1/nsap_22.h
+++ b/lib/dns/rdata/in_1/nsap_22.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -18,7 +18,7 @@
 #ifndef IN_1_NSAP_22_H
 #define IN_1_NSAP_22_H 1
 
-/* $Id: nsap_22.h,v 1.11 2000/07/27 09:50:13 tale Exp $ */
+/* $Id: nsap_22.h,v 1.12 2000/08/01 01:26:30 tale Exp $ */
 
 /* RFC 1706 */
 
diff --git a/lib/dns/rdata/in_1/px_26.c b/lib/dns/rdata/in_1/px_26.c
index 66141068be..ef571e48cb 100644
--- a/lib/dns/rdata/in_1/px_26.c
+++ b/lib/dns/rdata/in_1/px_26.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: px_26.c,v 1.25 2000/07/27 09:50:14 tale Exp $ */
+/* $Id: px_26.c,v 1.26 2000/08/01 01:26:31 tale Exp $ */
 
 /* Reviewed: Mon Mar 20 10:44:27 PST 2000 */
 
@@ -113,7 +113,7 @@ fromwire_in_px(ARGS_FROMWIRE) {
 	REQUIRE(rdclass == 1);
 
 	dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
-        
+
         dns_name_init(&name, NULL);
 
 	/*
diff --git a/lib/dns/rdata/in_1/px_26.h b/lib/dns/rdata/in_1/px_26.h
index ed749b4684..a965ddb395 100644
--- a/lib/dns/rdata/in_1/px_26.h
+++ b/lib/dns/rdata/in_1/px_26.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -18,7 +18,7 @@
 #ifndef IN_1_PX_26_H
 #define IN_1_PX_26_H 1
 
-/* $Id: px_26.h,v 1.12 2000/07/27 09:50:15 tale Exp $ */
+/* $Id: px_26.h,v 1.13 2000/08/01 01:26:32 tale Exp $ */
 
 /* RFC 2163 */
 
diff --git a/lib/dns/rdata/in_1/srv_33.c b/lib/dns/rdata/in_1/srv_33.c
index a31797c1b3..25155abaf9 100644
--- a/lib/dns/rdata/in_1/srv_33.c
+++ b/lib/dns/rdata/in_1/srv_33.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: srv_33.c,v 1.27 2000/07/27 09:50:16 tale Exp $ */
+/* $Id: srv_33.c,v 1.28 2000/08/01 01:26:34 tale Exp $ */
 
 /* Reviewed: Fri Mar 17 13:01:00 PST 2000 by bwelling */
 
@@ -129,7 +129,7 @@ fromwire_in_srv(ARGS_FROMWIRE) {
 	REQUIRE(rdclass == 1);
 
 	dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
-        
+
         dns_name_init(&name, NULL);
 
 	/*
diff --git a/lib/dns/rdata/in_1/srv_33.h b/lib/dns/rdata/in_1/srv_33.h
index 3da95db3cb..cd181a0207 100644
--- a/lib/dns/rdata/in_1/srv_33.h
+++ b/lib/dns/rdata/in_1/srv_33.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -18,7 +18,7 @@
 #ifndef IN_1_SRV_33_H
 #define IN_1_SRV_33_H 1
 
-/* $Id: srv_33.h,v 1.12 2000/07/27 09:50:17 tale Exp $ */
+/* $Id: srv_33.h,v 1.13 2000/08/01 01:26:35 tale Exp $ */
 
 /* Reviewed: Fri Mar 17 13:01:00 PST 2000 by bwelling */
 
diff --git a/lib/dns/rdata/in_1/wks_11.c b/lib/dns/rdata/in_1/wks_11.c
index 45b02c018a..879a25a23f 100644
--- a/lib/dns/rdata/in_1/wks_11.c
+++ b/lib/dns/rdata/in_1/wks_11.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: wks_11.c,v 1.33 2000/07/27 09:50:18 tale Exp $ */
+/* $Id: wks_11.c,v 1.34 2000/08/01 01:26:36 tale Exp $ */
 
 /* Reviewed: Fri Mar 17 15:01:49 PST 2000 by explorer */
 
@@ -52,7 +52,7 @@ fromtext_in_wks(ARGS_FROMTEXT) {
 
 	REQUIRE(type == 11);
 	REQUIRE(rdclass == 1);
-	
+
 	/*
 	 * IPv4 dotted quad.
 	 */
diff --git a/lib/dns/rdata/in_1/wks_11.h b/lib/dns/rdata/in_1/wks_11.h
index 03ea51d4ae..b9cb9d9284 100644
--- a/lib/dns/rdata/in_1/wks_11.h
+++ b/lib/dns/rdata/in_1/wks_11.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -18,7 +18,7 @@
 #ifndef IN_1_WKS_11_H
 #define IN_1_WKS_11_H 1
 
-/* $Id: wks_11.h,v 1.17 2000/07/27 09:50:19 tale Exp $ */
+/* $Id: wks_11.h,v 1.18 2000/08/01 01:26:37 tale Exp $ */
 
 typedef	struct dns_rdata_in_wks {
 	dns_rdatacommon_t	common;
diff --git a/lib/dns/rdata/rdatastructpre.h b/lib/dns/rdata/rdatastructpre.h
index 48de77b2c4..e28cfe3d50 100644
--- a/lib/dns/rdata/rdatastructpre.h
+++ b/lib/dns/rdata/rdatastructpre.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdatastructpre.h,v 1.11 2000/07/31 20:57:06 tale Exp $ */
+/* $Id: rdatastructpre.h,v 1.12 2000/08/01 01:25:01 tale Exp $ */
 
 #ifndef DNS_RDATASTRUCT_H
 #define DNS_RDATASTRUCT_H 1
diff --git a/lib/dns/rdata/rdatastructsuf.h b/lib/dns/rdata/rdatastructsuf.h
index 8965eb2af7..3cbbd0e3c5 100644
--- a/lib/dns/rdata/rdatastructsuf.h
+++ b/lib/dns/rdata/rdatastructsuf.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdatastructsuf.h,v 1.5 2000/07/27 09:48:45 tale Exp $ */
+/* $Id: rdatastructsuf.h,v 1.6 2000/08/01 01:25:02 tale Exp $ */
 
 ISC_LANG_ENDDECLS
 
diff --git a/lib/dns/rdatalist.c b/lib/dns/rdatalist.c
index 136b58c2f7..22efa12637 100644
--- a/lib/dns/rdatalist.c
+++ b/lib/dns/rdatalist.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdatalist.c,v 1.21 2000/07/27 09:46:28 tale Exp $ */
+/* $Id: rdatalist.c,v 1.22 2000/08/01 01:22:45 tale Exp $ */
 
 #include 
 
diff --git a/lib/dns/rdataset.c b/lib/dns/rdataset.c
index 8a74c5ce2b..e3d03bd747 100644
--- a/lib/dns/rdataset.c
+++ b/lib/dns/rdataset.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdataset.c,v 1.47 2000/07/27 09:46:29 tale Exp $ */
+/* $Id: rdataset.c,v 1.48 2000/08/01 01:22:46 tale Exp $ */
 
 #include 
 
@@ -64,7 +64,7 @@ dns_rdataset_invalidate(dns_rdataset_t *rdataset) {
 
 	REQUIRE(DNS_RDATASET_VALID(rdataset));
 	REQUIRE(rdataset->methods == NULL);
-	
+
 	rdataset->magic = 0;
 	ISC_LINK_INIT(rdataset, link);
 	rdataset->rdclass = 0;
@@ -111,7 +111,7 @@ dns_rdataset_isassociated(dns_rdataset_t *rdataset) {
 	/*
 	 * Is 'rdataset' associated?
 	 */
-	
+
 	REQUIRE(DNS_RDATASET_VALID(rdataset));
 
 	if (rdataset->methods != NULL)
@@ -209,7 +209,7 @@ dns_rdataset_clone(dns_rdataset_t *source, dns_rdataset_t *target) {
 	REQUIRE(source->methods != NULL);
 	REQUIRE(DNS_RDATASET_VALID(target));
 	REQUIRE(target->methods == NULL);
-	
+
 	(source->methods->clone)(source, target);
 }
 
@@ -255,7 +255,7 @@ dns_rdataset_current(dns_rdataset_t *rdataset, dns_rdata_t *rdata) {
 #define MAX_SHUFFLE	32
 #define WANT_FIXED(r)	(((r)->attributes & DNS_RDATASETATTR_FIXEDORDER) != 0)
 #define WANT_RANDOM(r)	(((r)->attributes & DNS_RDATASETATTR_RANDOMIZE) != 0)
-			 
+
 
 isc_result_t
 dns_rdataset_towire(dns_rdataset_t *rdataset,
diff --git a/lib/dns/rdatasetiter.c b/lib/dns/rdatasetiter.c
index f250a28539..1bcd9d2474 100644
--- a/lib/dns/rdatasetiter.c
+++ b/lib/dns/rdatasetiter.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdatasetiter.c,v 1.9 2000/07/27 09:46:30 tale Exp $ */
+/* $Id: rdatasetiter.c,v 1.10 2000/08/01 01:22:47 tale Exp $ */
 
 #include 
 
diff --git a/lib/dns/rdataslab.c b/lib/dns/rdataslab.c
index 2dc63e2b0c..552cd953a4 100644
--- a/lib/dns/rdataslab.c
+++ b/lib/dns/rdataslab.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdataslab.c,v 1.14 2000/07/27 09:46:31 tale Exp $ */
+/* $Id: rdataslab.c,v 1.15 2000/08/01 01:22:49 tale Exp $ */
 
 #include 
 
@@ -118,7 +118,7 @@ dns_rdataslab_size(unsigned char *slab, unsigned int reservelen) {
 		length += *current++;
 		current += length;
 	}
-	
+
 	return ((unsigned int)(current - slab));
 }
 
@@ -142,7 +142,7 @@ dns_rdataslab_merge(unsigned char *oslab, unsigned char *nslab,
 	 * XXX  Need parameter to allow "delete rdatasets in nslab" merge,
 	 * or perhaps another merge routine for this purpose.
 	 */
-	   
+
 	REQUIRE(tslabp != NULL && *tslabp == NULL);
 	REQUIRE(oslab != NULL && nslab != NULL);
 
@@ -218,7 +218,7 @@ dns_rdataslab_merge(unsigned char *oslab, unsigned char *nslab,
 		return (ISC_R_NOMEMORY);
 	memcpy(tstart, nslab, reservelen);
 	tcurrent = tstart + reservelen;
-	
+
 	/*
 	 * Write the new count.
 	 */
@@ -360,7 +360,7 @@ dns_rdataslab_subtract(unsigned char *mslab, unsigned char *sslab,
 		return (ISC_R_NOMEMORY);
 	memcpy(tstart, mslab, reservelen);
 	tcurrent = tstart + reservelen;
-	
+
 	/*
 	 * Write the new count.
 	 */
diff --git a/lib/dns/request.c b/lib/dns/request.c
index 8eba27253e..fc85384434 100644
--- a/lib/dns/request.c
+++ b/lib/dns/request.c
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: request.c,v 1.30 2000/07/27 09:46:32 tale Exp $ */
+/* $Id: request.c,v 1.31 2000/08/01 01:22:50 tale Exp $ */
 
 #include 
 
@@ -237,7 +237,7 @@ dns_requestmgr_shutdown(dns_requestmgr_t *requestmgr) {
 	UNLOCK(&requestmgr->lock);
 }
 
-static void 
+static void
 mgr_shutdown(dns_requestmgr_t *requestmgr) {
 	dns_request_t *request;
 
@@ -495,7 +495,7 @@ dns_request_create(dns_requestmgr_t *requestmgr, dns_message_t *message,
 	request->event->result = ISC_R_FAILURE;
 	if (key != NULL)
 		dns_tsigkey_attach(key, &request->tsigkey);
-	
+
  use_tcp:
 	if ((options & DNS_REQUESTOPT_TCP) != 0) {
 		result = isc_socket_create(requestmgr->socketmgr,
@@ -631,7 +631,7 @@ dns_request_create(dns_requestmgr_t *requestmgr, dns_message_t *message,
 	if (request->mctx != NULL)
 		isc_mem_detach(&request->mctx);
 	isc_mem_put(mctx, request, sizeof *request);
-	req_log(ISC_LOG_DEBUG(3), "dns_request_create: failed %s", 
+	req_log(ISC_LOG_DEBUG(3), "dns_request_create: failed %s",
 		dns_result_totext(result));
 	return (result);
 }
@@ -764,7 +764,7 @@ void
 dns_request_destroy(dns_request_t **requestp) {
 	dns_request_t *request;
 	isc_boolean_t need_destroy = ISC_FALSE;
-	
+
 	REQUIRE(requestp != NULL && VALID_REQUEST(*requestp));
 
 	request = *requestp;
@@ -810,7 +810,7 @@ req_connected(isc_task_t *task, isc_event_t *event) {
 		result = sevent->result;
 		if (result == ISC_R_SUCCESS)
 			result = req_send(request, task, NULL);
-			
+
 		if (sevent->result != ISC_R_SUCCESS)
 			dns_request_cancel(request);
 	}
@@ -846,7 +846,7 @@ req_response(isc_task_t *task, isc_event_t *event) {
 	REQUIRE(event->ev_type == DNS_EVENT_DISPATCH);
 
 	UNUSED(task);
-	
+
 	req_log(ISC_LOG_DEBUG(3), "req_response: request %p: %s", request,
 		dns_result_totext(devent->result));
 
@@ -882,7 +882,7 @@ req_response(isc_task_t *task, isc_event_t *event) {
 static void
 req_timeout(isc_task_t *task, isc_event_t *event) {
 	dns_request_t *request = event->ev_arg;
-	
+
 	REQUIRE(VALID_REQUEST(request));
 
 	req_log(ISC_LOG_DEBUG(3), "req_timeout: request %p", request);
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 8b16654bb9..9892104458 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.161 2000/07/29 01:18:36 bwelling Exp $ */
+/* $Id: resolver.c,v 1.162 2000/08/01 01:22:51 tale Exp $ */
 
 #include 
 
@@ -330,13 +330,13 @@ fctx_startidletimer(fetchctx_t *fctx) {
 static inline void
 resquery_destroy(resquery_t **queryp) {
 	resquery_t *query;
-	
+
 	REQUIRE(queryp != NULL);
 	query = *queryp;
 	REQUIRE(!ISC_LINK_LINKED(query, link));
 
 	INSIST(query->tcpsocket == NULL);
-	
+
 	query->magic = 0;
 	isc_mem_put(query->mctx, query, sizeof(*query));
 	*queryp = NULL;
@@ -421,7 +421,7 @@ fctx_cancelquery(resquery_t **queryp, dns_dispatchevent_t **deventp,
 
 	if (query->dispatch != NULL)
 		dns_dispatch_detach(&query->dispatch);
-	
+
 	if (! (RESQUERY_CONNECTING(query) || RESQUERY_SENDING(query)))
 		/*
 		 * It's safe to destroy the query now.
@@ -642,7 +642,7 @@ fctx_setretryinterval(fetchctx_t *fctx, unsigned int rtt) {
 	 * Double the round-trip time and convert to seconds.
 	 */
 	rtt /= 500000;
-	
+
 	/*
 	 * Always wait for at least the doubled round-trip time.
 	 */
@@ -696,7 +696,7 @@ fctx_query(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo,
 	result = isc_time_now(&query->start);
 	if (result != ISC_R_SUCCESS)
 		goto cleanup_query;
-	
+
 	/*
 	 * If this is a TCP query, then we need to make a socket and
 	 * a dispatch for it here.  Otherwise we use the resolver's
@@ -711,7 +711,7 @@ fctx_query(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo,
 
 		pf = isc_sockaddr_pf(&addrinfo->sockaddr);
 
-		result = isc_socket_create(res->socketmgr, pf, 
+		result = isc_socket_create(res->socketmgr, pf,
 					   isc_sockettype_tcp,
 					   &query->tcpsocket);
 		if (result != ISC_R_SUCCESS)
@@ -730,7 +730,7 @@ fctx_query(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo,
 		result = isc_socket_bind(query->tcpsocket, &any);
 		if (result != ISC_R_SUCCESS)
 			goto cleanup_socket;
-		
+
 		/*
 		 * A dispatch will be created once the connect succeeds.
 		 */
@@ -1076,7 +1076,7 @@ resquery_connected(isc_task_t *task, isc_event_t *event) {
 	} else {
 		if (sevent->result == ISC_R_SUCCESS) {
 			unsigned int attrs;
-			
+
 			/*
 			 * We are connected.  Create a dispatcher and
 			 * send the query.
@@ -1097,7 +1097,7 @@ resquery_connected(isc_task_t *task, isc_event_t *event) {
 						     query->fctx->res->taskmgr,
 						     4096, 2, 1, 1, 3, attrs,
 						     &query->dispatch);
-		
+
 			/*
 			 * Regardless of whether dns_dispatch_create()
 			 * succeeded or not, we don't need our reference
@@ -1107,7 +1107,7 @@ resquery_connected(isc_task_t *task, isc_event_t *event) {
 
 			if (result == ISC_R_SUCCESS)
 				result = resquery_send(query);
-			
+
 			if (result != ISC_R_SUCCESS) {
 				fetchctx_t *fctx = query->fctx;
 				fctx_cancelquery(&query, NULL, NULL,
@@ -1119,7 +1119,7 @@ resquery_connected(isc_task_t *task, isc_event_t *event) {
 			fctx_cancelquery(&query, NULL, NULL, ISC_FALSE);
 		}
 	}
-				 
+
 	isc_event_free(&event);
 }
 
@@ -1198,7 +1198,7 @@ bad_server(fetchctx_t *fctx, isc_sockaddr_t *address) {
 		if (isc_sockaddr_equal(sa, address))
 			return (ISC_TRUE);
 	}
-	
+
 	return (ISC_FALSE);
 }
 
@@ -1240,7 +1240,7 @@ mark_bad(fetchctx_t *fctx) {
 		else
 			all_bad = ISC_FALSE;
 	}
-	
+
 	return (all_bad);
 }
 
@@ -1285,7 +1285,7 @@ sort_adbfind(dns_adbfind_t *find) {
 		}
 		ISC_LIST_UNLINK(find->list, best, publink);
 		ISC_LIST_APPEND(sorted, best, publink);
-	} 
+	}
 	find->list = sorted;
 }
 
@@ -1646,7 +1646,7 @@ fctx_try(fetchctx_t *fctx) {
 			 * Sleep waiting for addresses.
 			 */
 			FCTXTRACE("addrwait");
-			fctx->attributes |= FCTX_ATTR_ADDRWAIT; 
+			fctx->attributes |= FCTX_ATTR_ADDRWAIT;
 			return;
 		} else if (result != ISC_R_SUCCESS) {
 			/*
@@ -1779,7 +1779,7 @@ fctx_shutdown(fetchctx_t *fctx) {
 
 	if (fctx->want_shutdown)
 		return;
-	
+
 	fctx->want_shutdown = ISC_TRUE;
 
 	/*
@@ -1808,7 +1808,7 @@ fctx_doshutdown(isc_task_t *task, isc_event_t *event) {
 
 	res = fctx->res;
 	bucketnum = fctx->bucketnum;
-	
+
 	FCTXTRACE("doshutdown");
 
 	fctx->attributes |= FCTX_ATTR_SHUTTINGDOWN;
@@ -1819,7 +1819,7 @@ fctx_doshutdown(isc_task_t *task, isc_event_t *event) {
 	fctx->attributes &= ~FCTX_ATTR_ADDRWAIT;
 
 	LOCK(&res->buckets[bucketnum].lock);
-	
+
 	INSIST(fctx->state == fetchstate_active ||
 	       fctx->state == fetchstate_done);
 	INSIST(fctx->want_shutdown);
@@ -1956,7 +1956,7 @@ fctx_join(fetchctx_t *fctx, isc_task_t *task, isc_taskaction_t action,
 
 	fetch->magic = DNS_FETCH_MAGIC;
 	fetch->private = fctx;
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -2028,7 +2028,7 @@ fctx_create(dns_resolver_t *res, dns_name_t *name, dns_rdatatype_t type,
 	}
 
 	INSIST(dns_name_issubdomain(&fctx->name, &fctx->domain));
-	
+
 	fctx->type = type;
 	fctx->options = options;
 	/*
@@ -2058,14 +2058,14 @@ fctx_create(dns_resolver_t *res, dns_name_t *name, dns_rdatatype_t type,
 	fctx->qmessage = NULL;
 	result = dns_message_create(res->mctx, DNS_MESSAGE_INTENTRENDER,
 				    &fctx->qmessage);
-				    
+
 	if (result != ISC_R_SUCCESS)
 		goto cleanup_domain;
 
 	fctx->rmessage = NULL;
 	result = dns_message_create(res->mctx, DNS_MESSAGE_INTENTPARSE,
 				    &fctx->rmessage);
-				    
+
 	if (result != ISC_R_SUCCESS)
 		goto cleanup_qmessage;
 
@@ -2170,7 +2170,7 @@ same_question(fetchctx_t *fctx) {
 	    fctx->res->rdclass != rdataset->rdclass ||
 	    !dns_name_equal(&fctx->name, name))
 		return (DNS_R_FORMERR);
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -2236,7 +2236,7 @@ maybe_destroy(fetchctx_t *fctx) {
 	unsigned int bucketnum;
 	isc_boolean_t bucket_empty = ISC_FALSE;
 	dns_resolver_t *res = fctx->res;
-	
+
 	REQUIRE(SHUTTINGDOWN(fctx));
 
 	if (fctx->pending != 0 || fctx->validating != 0)
@@ -2277,7 +2277,7 @@ validated(isc_task_t *task, isc_event_t *event) {
 	REQUIRE(fctx->validating > 0);
 
 	vevent = (dns_validatorevent_t *)event;
-	
+
 	FCTXTRACE("received validation completion event");
 
 	/*
@@ -2360,20 +2360,20 @@ validated(isc_task_t *task, isc_event_t *event) {
 					 vevent->name, ISC_TRUE, &node);
 		if (result != ISC_R_SUCCESS)
 			goto noanswer_response;
-		
+
 		result = ncache_adderesult(fctx->rmessage,
 					   fctx->res->view->cachedb, node,
 					   covers, now,
 					   fctx->res->view->maxncachettl,
 					   ardataset, &eresult);
 		if (result != ISC_R_SUCCESS)
-			goto noanswer_response;			
+			goto noanswer_response;
 
 		goto answer_response;
 	}
 
 	FCTXTRACE("validation OK");
-	
+
 	/*
 	 * The data was already cached as pending data.
 	 * Re-cache it as secure and bind the cached
@@ -2403,7 +2403,7 @@ validated(isc_task_t *task, isc_event_t *event) {
 	}
 
 	if (sentresponse) {
-		/* 
+		/*
 		 * If we only deferred the destroy because we wanted to cache
 		 * the data, destroy now.
 		 */
@@ -2424,7 +2424,7 @@ validated(isc_task_t *task, isc_event_t *event) {
 		 */
 		goto cleanup_event;
 	}
-		
+
 	result = ISC_R_SUCCESS;
 
  answer_response:
@@ -2432,9 +2432,9 @@ validated(isc_task_t *task, isc_event_t *event) {
 	 * Respond with an answer, positive or negative,
 	 * as opposed to an error.  'node' must be non-NULL.
 	 */
-	
+
 	fctx->attributes |= FCTX_ATTR_HAVEANSWER;
-	
+
 	if (hevent != NULL) {
 		hevent->result = eresult;
 		dns_name_concatenate(vevent->name, NULL,
@@ -2519,7 +2519,7 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, isc_stdtime_t now) {
 			}
 		}
 	}
-	
+
 	/*
 	 * Find or create the cache node.
 	 */
@@ -2722,7 +2722,7 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, isc_stdtime_t now) {
 	}
 
 	if (valrdataset != NULL) {
-		validator = NULL;		
+		validator = NULL;
 		result = dns_validator_create(res->view,
 					      name,
 					      fctx->type,
@@ -2826,7 +2826,7 @@ ncache_adderesult(dns_message_t *message, dns_db_t *cache, dns_dbnode_t *node,
 			 * cache rdataset (because no fetch is interested
 			 * in the outcome), or the cache rdataset is not
 			 * a negative cache entry.  Whichever case it is,
-			 * we can return success. 
+			 * we can return success.
 			 *
 			 * XXXRTH  There's a CNAME/DNAME problem here.
 			 */
@@ -2957,8 +2957,8 @@ ncache_message(fetchctx_t *fctx, dns_rdatatype_t covers, isc_stdtime_t now) {
 				   covers, now, res->view->maxncachettl,
 				   ardataset, &eresult);
 	if (result != ISC_R_SUCCESS)
-		goto unlock;	
-	
+		goto unlock;
+
 	if (!HAVE_ANSWER(fctx)) {
 		fctx->attributes |= FCTX_ATTR_HAVEANSWER;
 		if (event != NULL) {
@@ -3163,7 +3163,7 @@ noanswer_response(fetchctx_t *fctx, dns_name_t *oqname) {
 		if (!dns_name_issubdomain(qname, &fctx->domain))
 			return (ISC_R_SUCCESS);
 	}
-	
+
 	/*
 	 * We have to figure out if this is a negative response, or a
 	 * referral.
@@ -3295,7 +3295,7 @@ noanswer_response(fetchctx_t *fctx, dns_name_t *oqname) {
 
 		/*
 		 * If the referral name is not a parent of the query
-		 * name, consider the responder insane.  
+		 * name, consider the responder insane.
 		 */
 		if (! dns_name_issubdomain(&fctx->name, ns_name)) {
 			FCTXTRACE("referral to non-parent");
@@ -3339,7 +3339,7 @@ noanswer_response(fetchctx_t *fctx, dns_name_t *oqname) {
 
 	if (negative_response)
 		fctx->attributes |= FCTX_ATTR_WANTNCACHE;
-		
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -3828,7 +3828,7 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
 			truncated = ISC_TRUE;
 			break;
 		case DNS_R_FORMERR:
-			if ((query->options & DNS_FETCHOPT_NOEDNS0) == 0) { 
+			if ((query->options & DNS_FETCHOPT_NOEDNS0) == 0) {
 				/*
 				 * The problem might be that they
 				 * don't understand EDNS0.  Turn it
@@ -3892,7 +3892,7 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
 	 * INSIST() that the message comes from the place we sent it to,
 	 * since the dispatch code should ensure this.
 	 *
-	 * INSIST() that the message id is correct (this should also be	
+	 * INSIST() that the message id is correct (this should also be
 	 * ensured by the dispatch code).
 	 */
 
@@ -3902,7 +3902,7 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
 	 */
 	if ((message->flags & DNS_MESSAGEFLAG_TC) != 0)
 		truncated = ISC_TRUE;
-		
+
 	if (truncated) {
 		if ((options & DNS_FETCHOPT_TCP) != 0) {
 			broken_server = ISC_TRUE;
@@ -4136,7 +4136,7 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
 			fctx_cancelqueries(fctx, ISC_TRUE);
 			fctx_cleanupfinds(fctx);
 			fctx_cleanupforwaddrs(fctx);
-		}					  
+		}
 		/*
 		 * Try again.
 		 */
@@ -4340,7 +4340,7 @@ dns_resolver_create(dns_view_t *view,
 		goto cleanup_dispatches;
 
 	res->magic = RES_MAGIC;
-	
+
 	*resp = res;
 
 	return (ISC_R_SUCCESS);
@@ -4396,7 +4396,7 @@ dns_resolver_setforwarders(dns_resolver_t *res,
 		ISC_LINK_INIT(nsa, link);
 		ISC_LIST_APPEND(res->forwarders, nsa, link);
 	}
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -4450,7 +4450,7 @@ prime_done(isc_task_t *task, isc_event_t *event) {
 	isc_event_free(&event);
 	dns_resolver_destroyfetch(&fetch);
 }
-	
+
 void
 dns_resolver_prime(dns_resolver_t *res) {
 	isc_boolean_t want_priming = ISC_FALSE;
@@ -4471,7 +4471,7 @@ dns_resolver_prime(dns_resolver_t *res) {
 		return;
 
 	LOCK(&res->lock);
-	
+
 	if (!res->exiting && !res->priming) {
 		INSIST(res->primefetch == NULL);
 		res->priming = ISC_TRUE;
@@ -4563,7 +4563,7 @@ dns_resolver_whenshutdown(dns_resolver_t *res, isc_task_t *task,
 	*eventp = NULL;
 
 	LOCK(&res->lock);
-	
+
 	if (res->exiting && res->activebuckets == 0) {
 		/*
 		 * We're already shutdown.  Send the event.
@@ -4576,7 +4576,7 @@ dns_resolver_whenshutdown(dns_resolver_t *res, isc_task_t *task,
 		event->ev_sender = clone;
 		ISC_LIST_APPEND(res->whenshutdown, event, ev_link);
 	}
-	
+
 	UNLOCK(&res->lock);
 }
 
@@ -4589,7 +4589,7 @@ dns_resolver_shutdown(dns_resolver_t *res) {
 	REQUIRE(VALID_RESOLVER(res));
 
 	RTRACE("shutdown");
-	
+
 	LOCK(&res->lock);
 
 	if (!res->exiting) {
@@ -4698,7 +4698,7 @@ dns_resolver_createfetch(dns_resolver_t *res, dns_name_t *name,
 			 unsigned int options, isc_task_t *task,
 			 isc_taskaction_t action, void *arg,
 			 dns_rdataset_t *rdataset,
-			 dns_rdataset_t *sigrdataset, 
+			 dns_rdataset_t *sigrdataset,
 			 dns_fetch_t **fetchp)
 {
 	dns_fetch_t *fetch;
diff --git a/lib/dns/result.c b/lib/dns/result.c
index 1d7778c30a..314d3d68c3 100644
--- a/lib/dns/result.c
+++ b/lib/dns/result.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: result.c,v 1.68 2000/07/27 09:46:35 tale Exp $ */
+/* $Id: result.c,v 1.69 2000/08/01 01:22:52 tale Exp $ */
 
 #include 
 
diff --git a/lib/dns/rootns.c b/lib/dns/rootns.c
index 9eff2493e5..e9d1f10bc6 100644
--- a/lib/dns/rootns.c
+++ b/lib/dns/rootns.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rootns.c,v 1.14 2000/07/27 09:46:36 tale Exp $ */
+/* $Id: rootns.c,v 1.15 2000/08/01 01:22:53 tale Exp $ */
 
 #include 
 
@@ -71,7 +71,7 @@ dns_rootns_create(isc_mem_t *mctx, dns_rdataclass_t rdclass,
 	size_t len;
 	dns_rdatacallbacks_t callbacks;
 	dns_db_t *db = NULL;
-	
+
 	REQUIRE(target != NULL && *target == NULL);
 
 	result = dns_db_create(mctx, "rbt", dns_rootname, dns_dbtype_zone,
diff --git a/lib/dns/sec/Makefile.in b/lib/dns/sec/Makefile.in
index 37aa29bfe2..cd1089b2ee 100644
--- a/lib/dns/sec/Makefile.in
+++ b/lib/dns/sec/Makefile.in
@@ -1,9 +1,9 @@
 # Copyright (C) 1998-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
 # 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
@@ -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.7 2000/07/27 09:50:21 tale Exp $
+# $Id: Makefile.in,v 1.8 2000/08/01 01:26:38 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/dns/sec/dnssafe/Makefile.in b/lib/dns/sec/dnssafe/Makefile.in
index 435fc29711..692822815a 100644
--- a/lib/dns/sec/dnssafe/Makefile.in
+++ b/lib/dns/sec/dnssafe/Makefile.in
@@ -1,9 +1,9 @@
 # Copyright (C) 1998-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
 # 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
@@ -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.9 2000/07/27 09:50:23 tale Exp $
+# $Id: Makefile.in,v 1.10 2000/08/01 01:26:41 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/dns/sec/dnssafe/ahcbcpad.c b/lib/dns/sec/dnssafe/ahcbcpad.c
index 5bc7438397..105c1b50e5 100644
--- a/lib/dns/sec/dnssafe/ahcbcpad.c
+++ b/lib/dns/sec/dnssafe/ahcbcpad.c
@@ -80,7 +80,7 @@ A_SURRENDER_CTX *surrenderContext;
 {
   /* For encryption, we need to track the input length */
   handler->_inputRemainder = (handler->_inputRemainder + partInLen) % 8;
-  
+
   return (AHChooseEncryptEncryptUpdate
           (handler, partOut, partOutLen, maxPartOutLen, partIn, partInLen,
            randomAlgorithm, surrenderContext));
@@ -136,7 +136,7 @@ A_SURRENDER_CTX *surrenderContext;
   int status;
   unsigned char finalBuffer[16], *padBuffer;
   unsigned int padLen, localPartOutLen, i;
-  
+
   do {
     /* For now, the DecrypyFinal operations is set to output 16 bytes.
      */
diff --git a/lib/dns/sec/dnssafe/ahchdig.c b/lib/dns/sec/dnssafe/ahchdig.c
index 8f4b4e23a6..dedb7652b0 100644
--- a/lib/dns/sec/dnssafe/ahchdig.c
+++ b/lib/dns/sec/dnssafe/ahchdig.c
@@ -77,12 +77,12 @@ unsigned int partInLen;
 A_SURRENDER_CTX *surrenderContext;
 {
   int status;
-  
+
   if ((status = (*((A_DIGEST_ALGA *)handler->algaChoice._alga)->Update)
        (handler->algaChoice.context.z.context, partIn, partInLen,
         surrenderContext)) != 0)
     return (ConvertAlgaeError (status));
-  return (0);    
+  return (0);
 }
 
 int AHChooseDigestFinal
@@ -94,12 +94,12 @@ unsigned int maxPartOutLen;
 A_SURRENDER_CTX *surrenderContext;
 {
   int status;
-  
+
   if ((status = (*((A_DIGEST_ALGA *)handler->algaChoice._alga)->Final)
        (handler->algaChoice.context.z.context, partOut, partOutLen,
         maxPartOutLen, surrenderContext)) != 0)
     return (ConvertAlgaeError (status));
-  return (0);    
+  return (0);
 }
 
 static int InitDigestAlga
diff --git a/lib/dns/sec/dnssafe/ahchencr.c b/lib/dns/sec/dnssafe/ahchencr.c
index 64cf959c34..efc8b7a4ad 100644
--- a/lib/dns/sec/dnssafe/ahchencr.c
+++ b/lib/dns/sec/dnssafe/ahchencr.c
@@ -124,7 +124,7 @@ int AHChooseEncryptDecrypt::encryptUpdate
         partIn, partInLen, surrenderContext)) != 0)
     return (ConvertAlgaeError (status));
   return (0);
-}  
+}
  */
 int AHChooseEncryptEncryptUpdate
   (handler, partOut, partOutLen, maxPartOutLen, partIn, partInLen,
diff --git a/lib/dns/sec/dnssafe/ahchgen.c b/lib/dns/sec/dnssafe/ahchgen.c
index f1d7bd7c5c..78dcb2776c 100644
--- a/lib/dns/sec/dnssafe/ahchgen.c
+++ b/lib/dns/sec/dnssafe/ahchgen.c
@@ -95,8 +95,8 @@ B_Algorithm *randomAlgorithm;
 A_SURRENDER_CTX *surrenderContext;
 {
   POINTER result;
-  int status;  
-  
+  int status;
+
   if ((status = GenerateResult
        (&handler->generateAlgaChoice, &result, randomAlgorithm,
         surrenderContext)) != 0)
@@ -116,8 +116,8 @@ B_Algorithm *randomAlgorithm;
 A_SURRENDER_CTX *surrenderContext;
 {
   POINTER result;
-  int status;  
-  
+  int status;
+
   if ((status = GenerateResult
        (&handler->generateAlgaChoice, &result, randomAlgorithm,
         surrenderContext)) != 0)
@@ -205,7 +205,7 @@ A_SURRENDER_CTX *surrenderContext;
           surrenderContext)) != 0) {
       if (status != AE_NEED_RANDOM)
         return (ConvertAlgaeError (status));
-      
+
       /* Else continue and try again */
     }
     else
diff --git a/lib/dns/sec/dnssafe/ahchrand.c b/lib/dns/sec/dnssafe/ahchrand.c
index e565a1d9b0..5e92729659 100644
--- a/lib/dns/sec/dnssafe/ahchrand.c
+++ b/lib/dns/sec/dnssafe/ahchrand.c
@@ -77,12 +77,12 @@ unsigned int inputLen;
 A_SURRENDER_CTX *surrenderContext;
 {
   int status;
-  
+
   if ((status = (*((A_RANDOM_ALGA *)handler->algaChoice._alga)->Update)
        (handler->algaChoice.context.z.context, input, inputLen,
         surrenderContext)) != 0)
     return (ConvertAlgaeError (status));
-  return (0);    
+  return (0);
 }
 
 int AHChooseRandomGenerateBytes (handler, output, outputLen, surrenderContext)
@@ -92,12 +92,12 @@ unsigned int outputLen;
 A_SURRENDER_CTX *surrenderContext;
 {
   int status;
-  
+
   if ((status = (*((A_RANDOM_ALGA *)handler->algaChoice._alga)->Generate)
        (handler->algaChoice.context.z.context, output, outputLen,
         surrenderContext)) != 0)
     return (ConvertAlgaeError (status));
-  return (0);    
+  return (0);
 }
 
 static int InitRandomAlga
diff --git a/lib/dns/sec/dnssafe/ahencryp.h b/lib/dns/sec/dnssafe/ahencryp.h
index d2cb28c48f..0929fc3fb5 100644
--- a/lib/dns/sec/dnssafe/ahencryp.h
+++ b/lib/dns/sec/dnssafe/ahencryp.h
@@ -15,7 +15,7 @@
 class AHEncryptDecrypt : public B_TypeCheck {
   AHEncryptDecrypt ();
   virtual ~AHEncryptDecrypt () = 0;
-  
+
   virtual int getBlockLen (unsigned int *) = 0;
   virtual int encryptInit
     (B_Key *, B_ALGORITHM_CHOOSER, A_SURRENDER_CTX *) = 0;
diff --git a/lib/dns/sec/dnssafe/ahrsaenc.c b/lib/dns/sec/dnssafe/ahrsaenc.c
index 307d1fd8b1..ba2d1f9dfa 100644
--- a/lib/dns/sec/dnssafe/ahrsaenc.c
+++ b/lib/dns/sec/dnssafe/ahrsaenc.c
@@ -109,7 +109,7 @@ UNUSED_ARG (maxPartOutLen)
 UNUSED_ARG (randomAlgorithm)
 UNUSED_ARG (surrenderContext)
   *partOutLen = 0;
-    
+
   if (handler->_inputLen + partInLen > handler->_maxInputLen)
     return (BE_INPUT_LEN);
   T_memcpy
@@ -131,7 +131,7 @@ A_SURRENDER_CTX *surrenderContext;
 {
   int status;
   unsigned int dummyPartOutLen;
-  
+
   /* Encode methodContext in place. */
   if ((status = (*handler->vTable->EncodeBlock)
        (handler, randomAlgorithm, surrenderContext)) != 0)
@@ -148,7 +148,7 @@ A_SURRENDER_CTX *surrenderContext;
        (handler, (unsigned char *)NULL_PTR, &dummyPartOutLen, 0,
         (B_Algorithm *)NULL_PTR, surrenderContext)) != 0)
     return (status);
-    
+
   /* Restart the handle for new input. */
   handler->_inputLen = 0;
   return (0);
@@ -167,7 +167,7 @@ A_SURRENDER_CTX *surrenderContext;
   ITEM output;
   int status;
   unsigned int decryptedLen, dummyPartOutLen;
-  
+
 UNUSED_ARG (randomAlgorithm)
   /* Decrypt block in place.  The block lenghts are already within limits.
    */
@@ -181,23 +181,23 @@ UNUSED_ARG (randomAlgorithm)
        (handler, (unsigned char *)NULL_PTR, &dummyPartOutLen, 0,
         (B_Algorithm *)NULL_PTR, surrenderContext)) != 0)
     return (status);
-    
+
   /* Restart the handle for new input. */
   handler->_inputLen = 0;
-      
+
   /* Now decode the block and copy the result to the partOut.
    */
   if ((status = (*handler->vTable->DecodeBlock)
        (handler, &output, decryptedLen)) != 0)
     return (status);
-      
+
   if (output.len > handler->z.blockLen - 11)
     /* This implies that the block was encrypted with less than
        8 bytes of padding */
     return (BE_INPUT_DATA);
-      
+
   if ((*partOutLen = output.len) > maxPartOutLen)
-    return (BE_OUTPUT_LEN);      
+    return (BE_OUTPUT_LEN);
   T_memcpy ((POINTER)partOut, (POINTER)output.data, output.len);
 
   return (0);
@@ -224,7 +224,7 @@ int encryptFlag;
   handler->_maxInputLen = encryptFlag ? (newBlockLen - 11) : newBlockLen;
 
   handler->_inputLen = 0;
-  
+
   /* Zeroize old block and realloc to new size.
    */
   T_memset ((POINTER)handler->z.block, 0, handler->z.blockLen);
@@ -234,7 +234,7 @@ int encryptFlag;
     handler->z.blockLen = 0;
     return (BE_ALLOC);
   }
-  
+
   handler->z.blockLen = newBlockLen;
   return (0);
 }
diff --git a/lib/dns/sec/dnssafe/ahrsaepr.c b/lib/dns/sec/dnssafe/ahrsaepr.c
index e6fba2b998..0b247e5dc3 100644
--- a/lib/dns/sec/dnssafe/ahrsaepr.c
+++ b/lib/dns/sec/dnssafe/ahrsaepr.c
@@ -40,7 +40,7 @@ AH_RSAEncryptionPrivate *handler;
 
   /* Construct base class */
   AH_RSAEncryptionConstructor1 (handler, &AIT_RSAPrivate);
-  
+
   handler->vTable = &ENCRYPTION_V_TABLE;
   return (handler);
 }
@@ -79,19 +79,19 @@ ITEM *output;
 unsigned int block2Len;
 {
   unsigned int i;
-  
+
   if ((handler->z.block[0] != 0) || (handler->z.block[1] != 2))
     return (BE_INPUT_DATA);
-    
+
   /* Should be able to find the data after the first zero byte following
        the random bytes. */
   for (i = 2; i < block2Len && handler->z.block[i] != 0; i++);
   i++;
-    
+
   if (i > block2Len)
     /* The data is not zero terminated. */
     return (BE_INPUT_DATA);
-    
+
   output->len = block2Len - i;
   output->data = handler->z.block + i;
   return (0);
diff --git a/lib/dns/sec/dnssafe/ahrsaepu.c b/lib/dns/sec/dnssafe/ahrsaepu.c
index 000e84201b..a90b3643eb 100644
--- a/lib/dns/sec/dnssafe/ahrsaepu.c
+++ b/lib/dns/sec/dnssafe/ahrsaepu.c
@@ -40,7 +40,7 @@ AH_RSAEncryptionPublic *handler;
 
   /* Construct base class */
   AH_RSAEncryptionConstructor1 (handler, &AIT_RSAPublic);
-  
+
   handler->vTable = &ENCRYPTION_V_TABLE;
   return (handler);
 }
@@ -76,10 +76,10 @@ A_SURRENDER_CTX *surrenderContext;
            (randomAlgorithm, &randomByte, 1, surrenderContext)) != 0)
         return (status);
     } while (randomByte == 0);
-    
+
     handler->z.block[i] = randomByte;
   }
-  
+
   handler->z.block[2 + padLen] = 0;
   return (0);
 }
@@ -90,17 +90,17 @@ ITEM *output;
 unsigned int block1Len;
 {
   unsigned int i;
-  
+
   /* Locate the digestInfo within the PKCS block 1.
    */
   if (handler->z.block[0] != 0 || handler->z.block[1] != 1)
     return (BE_INPUT_DATA);
-    
+
   /* Should be able to find the data after the first zero byte following
        the 0xff. */
   for (i = 2; i < block1Len && handler->z.block[i] == 0xff; i++);
   i++;
-    
+
   if (i > block1Len || handler->z.block[i - 1] != 0)
     /* The data is not zero terminated, or a byte other than 0xff. */
     return (BE_INPUT_DATA);
diff --git a/lib/dns/sec/dnssafe/aichenc8.c b/lib/dns/sec/dnssafe/aichenc8.c
index 3612ab0592..b4dba4186a 100644
--- a/lib/dns/sec/dnssafe/aichenc8.c
+++ b/lib/dns/sec/dnssafe/aichenc8.c
@@ -22,11 +22,11 @@ POINTER info;
 {
   POINTER newInfo;
   int status;
-  
+
   if ((status = B_MemoryPoolAllocAndCopy
        (&algorithm->infoCache.memoryPool, &newInfo, info, 8)) != 0)
     return (status);
-  
+
   return (B_InfoCacheAddInfo
           (&algorithm->infoCache, (POINTER)infoType, newInfo));
 }
diff --git a/lib/dns/sec/dnssafe/airsakgn.c b/lib/dns/sec/dnssafe/airsakgn.c
index 9856a0070c..08e7181766 100644
--- a/lib/dns/sec/dnssafe/airsakgn.c
+++ b/lib/dns/sec/dnssafe/airsakgn.c
@@ -41,7 +41,7 @@ POINTER info;
 {
   A_RSA_KEY_GEN_PARAMS *newInfo;
   int status;
-  
+
   if ((status = B_MemoryPoolAlloc
        (&algorithm->infoCache.memoryPool, (POINTER *)&newInfo,
         sizeof (A_RSA_KEY_GEN_PARAMS))) != 0)
diff --git a/lib/dns/sec/dnssafe/algchoic.c b/lib/dns/sec/dnssafe/algchoic.c
index e8b0769903..ead0b9f989 100644
--- a/lib/dns/sec/dnssafe/algchoic.c
+++ b/lib/dns/sec/dnssafe/algchoic.c
@@ -61,7 +61,7 @@ unsigned int contextSize;
     resizeContext->z.contextSize = 0;
     return (BE_ALLOC);
   }
-    
+
   resizeContext->z.contextSize = contextSize;
   return (0);
 }
@@ -93,7 +93,7 @@ A_SURRENDER_CTX *surrenderContext;
            (key, &keyInfo, (*chooser)->keyInfoType)) != 0) {
         if (IS_FATAL_BSAFE_ERROR (status))
           return (status);
-      
+
         /* Update the overall status with this more specific error. */
         overallStatus = status;
         continue;
@@ -154,7 +154,7 @@ int type;
     return (BE_OUTPUT_LEN);
   case AE_PARAMS:
     return (BE_ALGORITHM_INFO);
-    
+
 #if USE_ALLOCED_FRAME
   case AE_ALLOC:
     return (BE_ALLOC);
diff --git a/lib/dns/sec/dnssafe/algobj.c b/lib/dns/sec/dnssafe/algobj.c
index d872d24856..80d305e1d3 100644
--- a/lib/dns/sec/dnssafe/algobj.c
+++ b/lib/dns/sec/dnssafe/algobj.c
@@ -28,7 +28,7 @@ B_ALGORITHM_OBJ *algorithmObject;
 
   /* First construct base class */
   B_AlgorithmConstructor (&algorithmWrap->algorithm);
-  
+
   algorithmWrap->typeTag = &ALGORITHM_TYPE_TAG;
   algorithmWrap->selfCheck = algorithmWrap;
   return (0);
@@ -59,7 +59,7 @@ POINTER info;
 {
   B_AlgorithmInfoType *algorithmInfoType;
   int status;
-  
+
   if ((status = AlgorithmWrapCheck (THE_ALG_WRAP)) != 0)
     return (status);
 
@@ -68,7 +68,7 @@ POINTER info;
    */
   if ((*infoType) ((POINTER *)&algorithmInfoType) != 0)
     return (BE_KEY_OPERATION_UNKNOWN);
-  
+
   return (B_AlgorithmSetInfo
           (&THE_ALG_WRAP->algorithm, algorithmInfoType, info));
 }
@@ -80,7 +80,7 @@ B_INFO_TYPE infoType;
 {
   B_AlgorithmInfoType *algorithmInfoType;
   int status;
-  
+
   if ((status = AlgorithmWrapCheck (THE_ALG_WRAP)) != 0)
     return (status);
 
@@ -89,7 +89,7 @@ B_INFO_TYPE infoType;
    */
   if ((*infoType) ((POINTER *)&algorithmInfoType) != 0)
     return (BE_KEY_OPERATION_UNKNOWN);
-  
+
   return (B_AlgorithmGetInfo
           (&THE_ALG_WRAP->algorithm, info, algorithmInfoType));
 }
diff --git a/lib/dns/sec/dnssafe/amrkg.c b/lib/dns/sec/dnssafe/amrkg.c
index 59b6e1119b..738fa2bef8 100644
--- a/lib/dns/sec/dnssafe/amrkg.c
+++ b/lib/dns/sec/dnssafe/amrkg.c
@@ -45,7 +45,7 @@ POINTER params;
       (THE_GEN_PARAMS->modulusBits < MIN_RSA_MODULUS_BITS))
     /* Can't support a keypair of this size. */
     return (AE_MODULUS_LEN);
-  
+
   *contextLen = sizeof (A_RSA_KEY_GEN_CTX);
   *secondContextLen = 0;
   *randomBlockLen =
diff --git a/lib/dns/sec/dnssafe/balg.c b/lib/dns/sec/dnssafe/balg.c
index b0b9bbb771..3ceb848839 100644
--- a/lib/dns/sec/dnssafe/balg.c
+++ b/lib/dns/sec/dnssafe/balg.c
@@ -69,7 +69,7 @@ B_AlgorithmInfoType *algorithmInfoType;
 POINTER info;
 {
   int status;
-  
+
   if (algorithm->infoCache.z.infoCount > 0)
     return (BE_ALGORITHM_ALREADY_SET);
 
@@ -93,7 +93,7 @@ POINTER *info;
 B_AlgorithmInfoType *algorithmInfoType;
 {
   int status;
-  
+
   if (algorithm->infoCache.z.infoCount == 0)
     return (BE_ALGORITHM_NOT_SET);
 
@@ -102,7 +102,7 @@ B_AlgorithmInfoType *algorithmInfoType;
   if (B_InfoCacheFindInfo
       (&algorithm->infoCache, info, (POINTER)algorithmInfoType) == 0)
     return (0);
-  
+
   /* Info is not in the cache, go ahead and encode.
    */
   if ((status = (*algorithmInfoType->vTable->MakeInfo)
diff --git a/lib/dns/sec/dnssafe/bgclrbit.c b/lib/dns/sec/dnssafe/bgclrbit.c
index 36565f4127..dc4dbdd6b8 100644
--- a/lib/dns/sec/dnssafe/bgclrbit.c
+++ b/lib/dns/sec/dnssafe/bgclrbit.c
@@ -14,8 +14,8 @@
 void BigClrbit (a, v)
 UINT2 *a;
 unsigned int v;
-{ 
-  a[v/16] &= ~ (1 << (v % 16)); 
+{
+  a[v/16] &= ~ (1 << (v % 16));
 }
 
 /* BigSetbit (a, v) -- sets v-th bit of a, where v is nonnegative.
@@ -23,6 +23,6 @@ unsigned int v;
 void BigSetbit (a, v)
 UINT2 *a;
 unsigned int v;
-{ 
-  a[v/16] |= (1 << (v % 16)); 
+{
+  a[v/16] |= (1 << (v % 16));
 }
diff --git a/lib/dns/sec/dnssafe/bgmodexp.c b/lib/dns/sec/dnssafe/bgmodexp.c
index 1f1a65f4f4..d4d64ee2d7 100644
--- a/lib/dns/sec/dnssafe/bgmodexp.c
+++ b/lib/dns/sec/dnssafe/bgmodexp.c
@@ -14,13 +14,13 @@
    Assumes a, b, c, d of length n.
    Returns 0, AE_CANCEL.
  */
-int BigModExp (a, b, c, d, n, surrenderContext) 
+int BigModExp (a, b, c, d, n, surrenderContext)
 UINT2 *a, *b, *c, *d;
 unsigned int n;
 A_SURRENDER_CTX *surrenderContext;
 {
   struct BigModExpFrame {
-    UINT2 dInv[MAX_RSA_MODULUS_WORDS + 2], result[MAX_RSA_MODULUS_WORDS], 
+    UINT2 dInv[MAX_RSA_MODULUS_WORDS + 2], result[MAX_RSA_MODULUS_WORDS],
       tab[16][MAX_RSA_MODULUS_WORDS];
   } *frame = (struct BigModExpFrame *)NULL_PTR;
 #if !USE_ALLOCED_FRAME
@@ -47,7 +47,7 @@ A_SURRENDER_CTX *surrenderContext;
     BigInv (frame->dInv, d, n);
     if ((status = CheckSurrender (surrenderContext)) != 0)
       break;
-    
+
     /* precompute small (size 2**w) table of powers of b */
     cLen = BigLen (c, n);
     if (cLen < 4)
@@ -57,7 +57,7 @@ A_SURRENDER_CTX *surrenderContext;
     else if (cLen < 64)
       w = 3;
     else
-      w = 4; 
+      w = 4;
 
     /* zeroth power is one */
     BigConst (frame->tab[0], 1, n);
@@ -111,7 +111,7 @@ A_SURRENDER_CTX *surrenderContext;
         }
         else
           BigCopy (frame->result, frame->tab[power], n);
-      
+
         power = 0;
         didAMultiply = 1;
       }
diff --git a/lib/dns/sec/dnssafe/bgpegcd.c b/lib/dns/sec/dnssafe/bgpegcd.c
index 2201b7e9d3..e59af931e4 100644
--- a/lib/dns/sec/dnssafe/bgpegcd.c
+++ b/lib/dns/sec/dnssafe/bgpegcd.c
@@ -26,7 +26,7 @@ void BigPegcd (u3, u1, u2, u, v, k)
 UINT2 *u3, *u2, *u1, *u, *v;
 unsigned int k;
 {
-  UINT2 v1[2 * MAX_RSA_PRIME_WORDS], v2[2 * MAX_RSA_PRIME_WORDS], 
+  UINT2 v1[2 * MAX_RSA_PRIME_WORDS], v2[2 * MAX_RSA_PRIME_WORDS],
     v3[2 * MAX_RSA_PRIME_WORDS], q[2 * MAX_RSA_PRIME_WORDS],
     r[2 * MAX_RSA_PRIME_WORDS], t1[2 * MAX_RSA_PRIME_WORDS],
     t2[2 * MAX_RSA_PRIME_WORDS], t3[2 * MAX_RSA_PRIME_WORDS];
diff --git a/lib/dns/sec/dnssafe/big2exp.c b/lib/dns/sec/dnssafe/big2exp.c
index 85026db2c6..36761e37eb 100644
--- a/lib/dns/sec/dnssafe/big2exp.c
+++ b/lib/dns/sec/dnssafe/big2exp.c
@@ -9,7 +9,7 @@
 #include "global.h"
 #include "bigmath.h"
 
-/* Big2Exp (a, v, n) -- a = 2**v, where v is nonnegative int.  
+/* Big2Exp (a, v, n) -- a = 2**v, where v is nonnegative int.
    Sets a to be 2**v.
  */
 void Big2Exp (a, v, n)
diff --git a/lib/dns/sec/dnssafe/bigabs.c b/lib/dns/sec/dnssafe/bigabs.c
index 8b4bcb70fb..a9190cefdc 100644
--- a/lib/dns/sec/dnssafe/bigabs.c
+++ b/lib/dns/sec/dnssafe/bigabs.c
@@ -16,7 +16,7 @@ UINT2 *a, *b;
 unsigned int n;
 {
   if (BigSign (b, n) >= 0)
-    BigCopy (a, b, n); 
+    BigCopy (a, b, n);
   else
     BigNeg (a, b, n);
 }
diff --git a/lib/dns/sec/dnssafe/bigarith.c b/lib/dns/sec/dnssafe/bigarith.c
index 64af71c6e0..7770db02df 100644
--- a/lib/dns/sec/dnssafe/bigarith.c
+++ b/lib/dns/sec/dnssafe/bigarith.c
@@ -14,7 +14,7 @@ UINT2 *a;
 unsigned int n;
 {
   register unsigned int i;
-  
+
   for (i = 0; i < n; i++)
     a[i] = 0;
 }
@@ -61,7 +61,7 @@ unsigned int n;
     if (a[i])
       carry = 0;
   }
-  
+
   a[i] = ~b[i] + carry;
 }
 
@@ -77,7 +77,7 @@ unsigned int n;
     if (a[i])
       carry = 0;
   }
-  
+
   if (carry)
     a[i]++;
 }
@@ -94,7 +94,7 @@ unsigned int n;
     if (a[i] != 0xFFFF)
       borrow = 0;
   }
-  
+
   if (borrow)
     a[i]--;
 }
@@ -104,7 +104,7 @@ UINT2 *a;
 unsigned int n;
 {
   register int i;
-  
+
   if (a[n-1] & 0x8000)
     return (-1);
   for (i = n-1; i >= 0; i--)
@@ -118,7 +118,7 @@ UINT2 *a, *b;
 unsigned int n;
 {
   register unsigned int i;
-  
+
   for (i = 0; i < n; i++)
     a[i] = b[i];
 }
@@ -130,7 +130,7 @@ UINT2 *a;
 unsigned int n;
 {
   register int i;
-  
+
   for (i = n-1; i >= 0; i--)
     if (a[i])
       return (i+1);
diff --git a/lib/dns/sec/dnssafe/bigcmp.c b/lib/dns/sec/dnssafe/bigcmp.c
index 953be1546a..42bda60d70 100644
--- a/lib/dns/sec/dnssafe/bigcmp.c
+++ b/lib/dns/sec/dnssafe/bigcmp.c
@@ -23,9 +23,9 @@ unsigned int n;
     return (1);
   if (aSign < bSign)
     return (-1);
-  
+
   for (i = n-1; i >= 0 && a[i] == b[i]; i--);
-  
+
   if (i == -1)
     return (0);
   if (a[i] > b[i])
diff --git a/lib/dns/sec/dnssafe/biginv.c b/lib/dns/sec/dnssafe/biginv.c
index 7c69fd9f4f..8c01003795 100644
--- a/lib/dns/sec/dnssafe/biginv.c
+++ b/lib/dns/sec/dnssafe/biginv.c
@@ -15,7 +15,7 @@ static unsigned int Log2 PROTO_LIST ((unsigned int));
      modding out integers which are < b**2.
      -- assumes a has n+2 words, b has n words.
      -- assumes b is a positive integer.
- */              
+ */
 void BigInv (a, b, n)
 UINT2 *a, *b;
 unsigned int n;
@@ -30,18 +30,18 @@ unsigned int n;
   /* 2** (bl-1) <= b < 2 ** bl */
   bl = BigLen (b, n);
   u = BigU (2 * bl);
-  
+
   /* uw and sw are in words */
   uw = u/16;
   sw = (bl - 2) / 16;
-  
+
   /* since a = floor ((2**u)/b),  2**(u-bl) < a <= 2**(u-bl+1) */
 
   /* Initialize a to 1+2**(u-bl) -- we will converge from below.
    */
   Big2Exp (a, u - bl, n + 2);
   BigInc (a, n + 2);
-  
+
   /* Copy b to local register.
    */
   BigZero (t1, n + 3);
@@ -52,7 +52,7 @@ unsigned int n;
   for (i = 1 + Log2 (u - bl + 1); i > 0; i--) {
     /* use fast squaring routine to compute p = a**2
        2**(2 * (u-bl)) < p <= 2**(2 * (u-bl+1)) */
-    BigPsq (p, a, n + 2); 
+    BigPsq (p, a, n + 2);
 
     /* compute q = b * floor (p/ (2**s))
        2**(2 * (u-bl)-s+bl-1) <= q <= 2**(2 * (u-bl+1)-s+bl
diff --git a/lib/dns/sec/dnssafe/biglen.c b/lib/dns/sec/dnssafe/biglen.c
index 6b5acb9aff..6017fe1d21 100644
--- a/lib/dns/sec/dnssafe/biglen.c
+++ b/lib/dns/sec/dnssafe/biglen.c
@@ -21,8 +21,8 @@ unsigned int n;
   if (i == -1)
     return (1);  /* len of 0 or -1 */
 
-  for (j = 16, k = 0x8000; 
-       j >= 0 && 0 == (k & (signWord ^ a[i])); 
+  for (j = 16, k = 0x8000;
+       j >= 0 && 0 == (k & (signWord ^ a[i]));
        j--, k >>= 1);
   return (16 * i + j);
 }
diff --git a/lib/dns/sec/dnssafe/bigmpy.c b/lib/dns/sec/dnssafe/bigmpy.c
index 9a17b06afe..0463903d3a 100644
--- a/lib/dns/sec/dnssafe/bigmpy.c
+++ b/lib/dns/sec/dnssafe/bigmpy.c
@@ -17,17 +17,17 @@ void BigMpy (a, b, c, n)
 UINT2 *a, *b, *c;
 unsigned int n;
 {
-  UINT2 prod[2 * MAX_RSA_PRIME_WORDS], absb[MAX_RSA_PRIME_WORDS], 
+  UINT2 prod[2 * MAX_RSA_PRIME_WORDS], absb[MAX_RSA_PRIME_WORDS],
     absc[MAX_RSA_PRIME_WORDS];
   int bSign = BigSign (b, n), cSign = BigSign (c, n);
-  
+
   BigAbs (absb, b, n);
   BigAbs (absc, c, n);
   BigPmpy (prod, absb, absc, n);
 
   if (bSign * cSign >= 0)
     BigCopy (a, prod, 2 * n);
-  else 
+  else
     BigNeg (a, prod, 2 * n);
 
   T_memset ((POINTER)prod, 0, sizeof (prod));
diff --git a/lib/dns/sec/dnssafe/bigpdiv.c b/lib/dns/sec/dnssafe/bigpdiv.c
index 23c3f8bcba..b54fd998f2 100644
--- a/lib/dns/sec/dnssafe/bigpdiv.c
+++ b/lib/dns/sec/dnssafe/bigpdiv.c
@@ -16,7 +16,7 @@
      qi assumed to be ll cells
      ri assumed to be kk cells
      restriction uu>=0, vv>0
-       
+
      input  uu in reg of ll cells
      input  vv in reg of kk cells
      output qi assumed to be ll cells
@@ -31,7 +31,7 @@ void BigPdiv (qi, ri, uu, vv, ll, kk)
 UINT2 *qi, *ri, *uu, *vv;
 unsigned int ll, kk;
 {
-  UINT2 u[2 * MAX_RSA_PRIME_WORDS + 2], us[2 * MAX_RSA_PRIME_WORDS + 2], 
+  UINT2 u[2 * MAX_RSA_PRIME_WORDS + 2], us[2 * MAX_RSA_PRIME_WORDS + 2],
     v[2 * MAX_RSA_PRIME_WORDS + 2], vs[2 * MAX_RSA_PRIME_WORDS + 2],
     q[2 * MAX_RSA_PRIME_WORDS + 2], r[2 * MAX_RSA_PRIME_WORDS + 2],
     t1[2 * MAX_RSA_PRIME_WORDS + 2], t2[2 * MAX_RSA_PRIME_WORDS + 2],
@@ -43,7 +43,7 @@ unsigned int ll, kk;
     l = ll + 2;
   else
     l = kk + 2;
-  
+
   mk[0] = 0x00FF;
   mk[1] = 0xFF00;
   b = 0x0100;
@@ -75,7 +75,7 @@ unsigned int ll, kk;
   BigConst (t1, d, l);
   BigPmpyl (t2, t1, v, l);
   BigCopy (v, t2, l);
-  
+
   /* vh=high order digit of normalized v */
   vh = VN;
   if (n % 2 == 1)
@@ -90,7 +90,7 @@ unsigned int ll, kk;
       continue;
     break;
   }
-  
+
   /* calc t = n + m */
   m = t - n;
 
@@ -133,7 +133,7 @@ unsigned int ll, kk;
     BigPmpyl (t1, q, t2, l);
     BigAdd (q, t3, t1, l);
   }
-  
+
   /* Check result.
    */
 
@@ -146,7 +146,7 @@ unsigned int ll, kk;
   /* transfer results to input registers  */
   BigCopy (qi, q, ll);
   BigCopy (ri, t2, kk);
-  
+
   T_memset ((POINTER)u, 0, sizeof (u));
   T_memset ((POINTER)us, 0, sizeof (us));
   T_memset ((POINTER)v, 0, sizeof (v));
diff --git a/lib/dns/sec/dnssafe/bigpmpy.c b/lib/dns/sec/dnssafe/bigpmpy.c
index 8ef3b4cd7d..7b18ac2909 100644
--- a/lib/dns/sec/dnssafe/bigpmpy.c
+++ b/lib/dns/sec/dnssafe/bigpmpy.c
@@ -17,7 +17,7 @@ unsigned int n;
 {
   register unsigned int i;
   unsigned int cLen;
-  
+
   BigZero (a, 2*n);
   cLen = BigLenw (c, n);
   for (i = 0; i < n; i++)
diff --git a/lib/dns/sec/dnssafe/bigqrx.c b/lib/dns/sec/dnssafe/bigqrx.c
index 5bce01e8f0..fdbceab2cb 100644
--- a/lib/dns/sec/dnssafe/bigqrx.c
+++ b/lib/dns/sec/dnssafe/bigqrx.c
@@ -30,16 +30,16 @@ unsigned int n;
   /* 2**(cl-1) <= c < 2**cl
      2**(u-cl) <= cInv <= 2**(u-cl+1) */
   cl = BigLen (c, n);
-                 
+
   /* u is in bits, uw is in words */
   u = BigU (2 * cl);
   uw = u/16;
-  
+
   /* sw is in words, s is is bits */
   sw = (cl - 2) / 16;
-  
+
   uwsw3 = uw - sw - 3;
-  
+
   if (uwsw3 < 0)
     uwsw3 = 0;
 
@@ -76,7 +76,7 @@ unsigned int n;
     BigSub (r, r, c, n);
     BigInc (q, n);
   }
-  
+
   T_memset ((POINTER)qc, 0, sizeof (qc));
   T_memset ((POINTER)qsc, 0, sizeof (qsc));
   T_memset ((POINTER)t1, 0, sizeof (t1));
diff --git a/lib/dns/sec/dnssafe/bigtocan.c b/lib/dns/sec/dnssafe/bigtocan.c
index 13e8315d6c..d5f8e5b05b 100644
--- a/lib/dns/sec/dnssafe/bigtocan.c
+++ b/lib/dns/sec/dnssafe/bigtocan.c
@@ -24,14 +24,14 @@ UINT2 *wordPointer;
 unsigned int wordCount;
 {
   unsigned int copyCount;
-  
+
   if (BigSign (wordPointer, wordCount) < 0 ||
       (BigLen (wordPointer, wordCount) + 7) / 8 > numBytes)
     return (AE_DATA);
 
   /* start at end of byte vector */
   bytePointer += numBytes-1;
-  
+
   /* copy as much as possible */
   copyCount = (wordCount < numBytes / 2) ? wordCount : numBytes / 2;
   wordCount -= copyCount;
@@ -42,18 +42,18 @@ unsigned int wordCount;
     *bytePointer-- = (unsigned char)(*wordPointer >> 8);
     wordPointer++;
   }
-  
+
   if (wordCount && numBytes & 1) {
     /* The number of output bytes was odd. Copy one last byte */
     *bytePointer-- = (unsigned char)*wordPointer++;
     wordCount--;
     numBytes--;
   }
-  
+
   /* zero fill remainder of byte vector */
   while (numBytes--)
     *bytePointer-- = 0;
-  
+
   return (0);
 }
 
diff --git a/lib/dns/sec/dnssafe/bigu.c b/lib/dns/sec/dnssafe/bigu.c
index 34c592a5b3..ce4de1a9b0 100644
--- a/lib/dns/sec/dnssafe/bigu.c
+++ b/lib/dns/sec/dnssafe/bigu.c
@@ -17,5 +17,5 @@
 unsigned int BigU (t)
 unsigned int t;
 {
-  return (16 * (((t+1) + 15)/16)); 
+  return (16 * (((t+1) + 15)/16));
 }
diff --git a/lib/dns/sec/dnssafe/bigunexp.c b/lib/dns/sec/dnssafe/bigunexp.c
index 6bedbf5118..99184414e1 100644
--- a/lib/dns/sec/dnssafe/bigunexp.c
+++ b/lib/dns/sec/dnssafe/bigunexp.c
@@ -26,7 +26,7 @@ unsigned int pSize;                                 /* length of p in words */
 A_SURRENDER_CTX *surrenderContext;
 {
   struct BigUnexpFrame {
-    UINT2 t1[2 * MAX_RSA_PRIME_WORDS], t2[2 * MAX_RSA_PRIME_WORDS], 
+    UINT2 t1[2 * MAX_RSA_PRIME_WORDS], t2[2 * MAX_RSA_PRIME_WORDS],
       t3[2 * MAX_RSA_PRIME_WORDS], u1[2 * MAX_RSA_PRIME_WORDS],
       u2[2 * MAX_RSA_PRIME_WORDS], u3[2 * MAX_RSA_PRIME_WORDS];
   } *frame = (struct BigUnexpFrame *)NULL_PTR;
@@ -46,10 +46,10 @@ A_SURRENDER_CTX *surrenderContext;
     /* Just use the buffers allocated on the stack. */
     frame = &stackFrame;
 #endif
-    
+
     BigConst (frame->t1, 0, 2 * pSize);
     BigConst (frame->t2, 0, 2 * pSize);
-  
+
     /* u2=c mod p */
     BigPdiv (frame->u1, frame->u2, c, pp, 2 * pSize, pSize);
     if ((status = CheckSurrender (surrenderContext)) != 0)
@@ -87,7 +87,7 @@ A_SURRENDER_CTX *surrenderContext;
 
     BigAdd (m, m, frame->t2, 2 * pSize);
   } while (0);
-  
+
   if (frame != (struct BigUnexpFrame *)NULL_PTR) {
     T_memset ((POINTER)frame, 0, sizeof (*frame));
 #if USE_ALLOCED_FRAME
diff --git a/lib/dns/sec/dnssafe/binfocsh.c b/lib/dns/sec/dnssafe/binfocsh.c
index f5c458e336..5fafb80534 100644
--- a/lib/dns/sec/dnssafe/binfocsh.c
+++ b/lib/dns/sec/dnssafe/binfocsh.c
@@ -27,16 +27,16 @@ POINTER infoType;
 POINTER info;
 {
   int status;
-  
+
   if ((status = B_MemoryPoolRealloc
        (&infoCache->memoryPool, (POINTER *)&infoCache->z.infos,
         (infoCache->z.infoCount + 1) * sizeof (infoCache->z.infos[0]))) != 0)
     return (status);
-    
+
   infoCache->z.infos[infoCache->z.infoCount].infoType = infoType;
   infoCache->z.infos[infoCache->z.infoCount].info = info;
-  infoCache->z.infoCount++;        
-  
+  infoCache->z.infoCount++;
+
   return (0);
 }
 
@@ -49,7 +49,7 @@ POINTER *info;
 POINTER infoType;
 {
   unsigned int i;
-  
+
   for (i = 0; i < infoCache->z.infoCount; ++i) {
     if (infoCache->z.infos[i].infoType == infoType) {
       /* The info has already been constructed. */
@@ -57,7 +57,7 @@ POINTER infoType;
       return (0);
     }
   }
-  
+
   return (BE_NOT_SUPPORTED);
 }
 
diff --git a/lib/dns/sec/dnssafe/bkey.c b/lib/dns/sec/dnssafe/bkey.c
index ddd2346073..210f7691ad 100644
--- a/lib/dns/sec/dnssafe/bkey.c
+++ b/lib/dns/sec/dnssafe/bkey.c
@@ -33,7 +33,7 @@ POINTER *info;
 B_KeyInfoType *keyInfoType;
 {
   int status;
-  
+
   if (key == (B_Key *)NULL_PTR)
     return (BE_KEY_OBJ);
 
@@ -44,7 +44,7 @@ B_KeyInfoType *keyInfoType;
    */
   if (B_InfoCacheFindInfo (&key->infoCache, info, (POINTER)keyInfoType) == 0)
     return (0);
-  
+
   /* Info is not in the cache, go ahead and encode.
    */
   if ((status = (*keyInfoType->MakeInfo) (info, key)) != 0)
@@ -64,15 +64,15 @@ unsigned int len;
 {
   ITEM *newInfo;
   int status;
-  
+
   if ((status = B_MemoryPoolAlloc
        (&key->infoCache.memoryPool, (POINTER *)&newInfo, sizeof (*newInfo)))
       != 0)
     return (status);
-  
+
   newInfo->data = data;
   newInfo->len = len;
-  
+
   return (B_InfoCacheAddInfo
           (&key->infoCache, (POINTER)&KITItem, (POINTER)newInfo));
 }
@@ -86,14 +86,14 @@ unsigned int integerLen;
 {
   unsigned char mask, byte;
   unsigned int bytes, bits;
-  
+
   for (bytes = 0; bytes < integerLen && integer[bytes] == 0; bytes++);
   if (bytes == integerLen)
     return (0);
-  
+
   /* Get byte to test and increment byte count for final calculation */
   byte = integer[bytes++];
-  
+
   /* Get number of bits in most significant byte */
   for (bits = 8, mask = 0x80; (byte & mask) == 0; bits--, mask >>= 1);
   return (8 * (integerLen - bytes) + bits);
diff --git a/lib/dns/sec/dnssafe/bkey.h b/lib/dns/sec/dnssafe/bkey.h
index 5ea9b58141..b4c1edad09 100644
--- a/lib/dns/sec/dnssafe/bkey.h
+++ b/lib/dns/sec/dnssafe/bkey.h
@@ -16,7 +16,7 @@ typedef struct {
 
   /* For now we don't need to worry about a reserved field.
   struct {
-    POINTER reserved;  
+    POINTER reserved;
   } z;
    */
 } B_Key;
diff --git a/lib/dns/sec/dnssafe/bmempool.c b/lib/dns/sec/dnssafe/bmempool.c
index c7de624f96..95ee194c60 100644
--- a/lib/dns/sec/dnssafe/bmempool.c
+++ b/lib/dns/sec/dnssafe/bmempool.c
@@ -18,7 +18,7 @@ void B_MemoryPoolConstructor (memoryPool)
 B_MemoryPool *memoryPool;
 {
   T_memset ((POINTER)&memoryPool->z, 0, sizeof (memoryPool->z));
-} 
+}
 
 void B_MemoryPoolDestructor (memoryPool)
 B_MemoryPool *memoryPool;
@@ -84,10 +84,10 @@ POINTER data;
 unsigned int size;
 {
   int status;
-  
+
   if ((status = B_MemoryPoolAlloc (memoryPool, newData, size)) != 0)
     return (status);
-  
+
   T_memcpy (*newData, data, size);
   return (0);
 }
@@ -101,17 +101,17 @@ unsigned int size;
      to NULL_PTR.
    This routine should be used with caution - it is meant be called
      immediately after an alloc.
-   No check is made as to whether the data is already on the memory pool's 
+   No check is made as to whether the data is already on the memory pool's
      alloced list (which would be a problem since it will get freed twice).
    Returns 0 if successful or BE_ALLOC if cannot expand the alloced list.
- */       
+ */
 int B_MemoryPoolAdoptData (memoryPool, data, size)
 B_MemoryPool *memoryPool;
 POINTER *data;
 unsigned int size;
 {
   int status;
-  
+
   if ((status = B_MemoryPoolAdoptHelper
        (memoryPool, *data, size, (B_MEMORY_POOL_DELETE_FUNCTION)NULL))
       != 0) {
@@ -132,10 +132,10 @@ unsigned int size;
    The object is not passed by reference.  If there is an error,
      the calling routine should clean up the object, such as zeroizing
      and freeing.
-   No check is made as to whether the object is already on the memory pool's 
+   No check is made as to whether the object is already on the memory pool's
      alloced list (which would be a problem since it will get freed twice).
    Returns 0 if successful or BE_ALLOC if cannot expand the alloced list.
- */       
+ */
 int B_MemoryPoolAdoptHelper (memoryPool, object, size, DeleteFunction)
 B_MemoryPool *memoryPool;
 POINTER object;
@@ -153,7 +153,7 @@ B_MEMORY_POOL_DELETE_FUNCTION DeleteFunction;
         == NULL_PTR)
       /* alloc errorm so caller should clean up the object it passed. */
       return (BE_ALLOC);
-    
+
     /* move in new list and free old list */
     T_memcpy
       (newList, (POINTER)memoryPool->z.allocedList,
@@ -162,7 +162,7 @@ B_MEMORY_POOL_DELETE_FUNCTION DeleteFunction;
     memoryPool->z.allocedList = (B_ALLOCED_DATA *)newList;
     memoryPool->z.maxAllocedCount = newMaxCount;
   }
-  
+
   /* Put object on alloced list and increment count.
    */
   memoryPool->z.allocedList[memoryPool->z.allocedCount].object = object;
@@ -202,14 +202,14 @@ unsigned int size;
 
     return (BE_ALLOC);
   }
-  
+
   /* Realloc was successful.
    */
   if (allocedData == (B_ALLOCED_DATA *)NULL_PTR)
     /* The data was not in the memory pool to start with, so adopt it.
        Note that this also happens when the data is initially NULL_PTR. */
     return (B_MemoryPoolAdoptData (memoryPool, data, size));
-  
+
   /* Replace the entry on the alloced list with the new memory.
    */
   allocedData->object = *data;
@@ -230,7 +230,7 @@ B_MemoryPool *memoryPool;
 POINTER *object;
 {
   B_ALLOCED_DATA *allocedData;
-  
+
   if ((allocedData = B_MemoryPoolFindAllocedObject (memoryPool, *object))
       != (B_ALLOCED_DATA *)NULL_PTR) {
     if (allocedData->DeleteFunction !=
@@ -245,7 +245,7 @@ POINTER *object;
     /* Set this entry to NULL_PTR so that reset will not process it. */
     allocedData->object = NULL_PTR;
   }
-  
+
   *object = NULL_PTR;
 }
 
@@ -259,10 +259,10 @@ POINTER object;
 {
   B_ALLOCED_DATA *allocedData;
   unsigned int i;
-  
+
   if (object == NULL_PTR)
     return ((B_ALLOCED_DATA *)NULL_PTR);
-  
+
   for (i = memoryPool->z.allocedCount,
        allocedData = memoryPool->z.allocedList;
        i-- > 0;
diff --git a/lib/dns/sec/dnssafe/cantobig.c b/lib/dns/sec/dnssafe/cantobig.c
index 79b760f7d3..8c097b51fd 100644
--- a/lib/dns/sec/dnssafe/cantobig.c
+++ b/lib/dns/sec/dnssafe/cantobig.c
@@ -23,13 +23,13 @@ unsigned char *bytePointer;
 unsigned int numBytes;
 {
   unsigned int copyCount;
-  
+
   if (A_IntegerBits (bytePointer, numBytes) / 16 + 1 > wordCount)
     return (AE_DATA);
 
   /* start at end of byte vector */
   bytePointer += numBytes-1;
-  
+
   /* copy as much as possible */
   copyCount = (wordCount < numBytes / 2) ? wordCount : numBytes / 2;
   wordCount -= copyCount;
@@ -39,18 +39,18 @@ unsigned int numBytes;
     *wordPointer++ = (UINT2)*bytePointer + (*(bytePointer - 1) << 8);
     bytePointer -= 2;
   }
-  
+
   if (wordCount && numBytes & 1) {
     /* If the number of input bytes was odd.  Copy one last byte.*/
     *wordPointer++ = (UINT2)*bytePointer--;
     wordCount--;
     numBytes--;
   }
-  
+
   /* zero fill remainder of word vector */
   while (wordCount--)
     *wordPointer++ = 0;
-  
+
   return (0);
 }
 
diff --git a/lib/dns/sec/dnssafe/crt2.c b/lib/dns/sec/dnssafe/crt2.c
index 36b9d01f95..ff169c04a9 100644
--- a/lib/dns/sec/dnssafe/crt2.c
+++ b/lib/dns/sec/dnssafe/crt2.c
@@ -44,11 +44,11 @@ A_RSA_CRT_KEY *key;
       (context->primeP, MAX_RSA_PRIME_WORDS, key->prime[0].data,
        key->prime[0].len))
     return (AE_KEY_INFO);
-    
+
   /* compute significant length of first prime */
   context->primeWords = BITS_TO_WORDS
     (BigLen (context->primeP, MAX_RSA_PRIME_WORDS));
-    
+
   /* convert other private key parameters to bignum format */
   if (CanonicalToBig
       (context->primeQ, context->primeWords, key->prime[1].data,
@@ -99,7 +99,7 @@ A_SURRENDER_CTX *surrenderContext;
     context->inputLen += partInLen;
     return (0);
   }
-  
+
   if (context->inputLen > 0) {
     /* Need to accumulate the rest of the block bytes into the input and
          encrypt from there (otherwise it's OK to encrypt straight from
@@ -111,7 +111,7 @@ A_SURRENDER_CTX *surrenderContext;
        partialLen);
     partIn += partialLen;
     partInLen -= partialLen;
-    
+
     if ((status = RSA_CRT2
          (context, partOut, &localPartOutLen, maxPartOutLen, context->input,
           surrenderContext)) != 0)
@@ -128,14 +128,14 @@ A_SURRENDER_CTX *surrenderContext;
          (context, partOut, &localPartOutLen, maxPartOutLen, partIn,
           surrenderContext)) != 0)
       return (status);
-    
+
     partIn += context->blockLen;
     partInLen -= context->blockLen;
     (*partOutLen) += localPartOutLen;
     partOut += localPartOutLen;
     maxPartOutLen -= localPartOutLen;
   }
-  
+
   /* Copy remaining input bytes to the context's input buffer.
    */
   T_memcpy
@@ -149,7 +149,7 @@ A_RSA_CRT2_CTX *context;
 {
   if (context->inputLen != 0)
     return (AE_INPUT_LEN);
-  
+
   /* Restart context to accumulate a new block.
    */
   context->inputLen = 0;
@@ -180,7 +180,7 @@ A_SURRENDER_CTX *surrenderContext;
   do {
     if ((*outputLen = context->blockLen) > maxOutputLen)
       return (AE_OUTPUT_LEN);
-    
+
 #if USE_ALLOCED_FRAME
     if ((frame = (struct ModExpCRTFrame *)T_malloc (sizeof (*frame)))
         == (struct ModExpCRTFrame *)NULL_PTR) {
@@ -202,7 +202,7 @@ A_SURRENDER_CTX *surrenderContext;
     if (BigCmp
         (frame->bigInBuf, context->modulus, 2 * context->primeWords) >= 0)
       GENERATE_BREAK (AE_INPUT_DATA);
-    
+
     /* Chinese remainder exponentiation. */
     if ((status = BigUnexp
          (frame->bigOutBuf, frame->bigInBuf, context->primeP, context->primeQ,
@@ -216,7 +216,7 @@ A_SURRENDER_CTX *surrenderContext;
     BigToCanonical
       (output, *outputLen, frame->bigOutBuf, 2 * context->primeWords);
   } while (0);
-  
+
   if (frame != (struct ModExpCRTFrame *)NULL_PTR) {
     T_memset ((POINTER)frame, 0, sizeof (*frame));
 #if USE_ALLOCED_FRAME
diff --git a/lib/dns/sec/dnssafe/digrand.c b/lib/dns/sec/dnssafe/digrand.c
index e6f9016e5a..123cbfaaa4 100644
--- a/lib/dns/sec/dnssafe/digrand.c
+++ b/lib/dns/sec/dnssafe/digrand.c
@@ -36,7 +36,7 @@ unsigned char *input;
 unsigned int inputLen;
 {
   unsigned int i, j, x;
-  
+
   (*digestRandom->vTable->DigestUpdate) (digestRandom, input, inputLen);
   (*digestRandom->vTable->DigestFinal) (digestRandom, digestRandom->_digest);
 
@@ -56,7 +56,7 @@ unsigned char *output;
 unsigned int outputLen;
 {
   unsigned int available, i;
-  
+
   available = digestRandom->_outputAvailable;
 
   while (outputLen > available) {
@@ -79,7 +79,7 @@ unsigned int outputLen;
         break;
   }
 
-  T_memcpy 
+  T_memcpy
     ((POINTER)output,
      (POINTER)&digestRandom->_output[digestRandom->_digestLen-available],
      outputLen);
diff --git a/lib/dns/sec/dnssafe/global.h b/lib/dns/sec/dnssafe/global.h
index ca21ecb7ff..ce78bffe43 100644
--- a/lib/dns/sec/dnssafe/global.h
+++ b/lib/dns/sec/dnssafe/global.h
@@ -45,7 +45,7 @@ typedef isc_uint32_t UINT4;
 
 /* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
    If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it
-     returns an empty list.  
+     returns an empty list.
  */
 #if PROTOTYPES
 #define PROTO_LIST(list) list
diff --git a/lib/dns/sec/dnssafe/intbits.c b/lib/dns/sec/dnssafe/intbits.c
index 6a60e22ad8..3bed219498 100644
--- a/lib/dns/sec/dnssafe/intbits.c
+++ b/lib/dns/sec/dnssafe/intbits.c
@@ -18,14 +18,14 @@ unsigned int integerLen;
 {
   unsigned char mask, byte;
   unsigned int bytes, bits;
-  
+
   for (bytes = 0; bytes < integerLen && integer[bytes] == 0; bytes++);
   if (bytes == integerLen)
     return (0);
-  
+
   /* Get byte to test and increment byte count for final calculation */
   byte = integer[bytes++];
-  
+
   /* Get number of bits in most significant byte */
   for (bits = 8, mask = 0x80; (byte & mask) == 0; bits--, mask >>= 1);
   return (8 * (integerLen - bytes) + bits);
diff --git a/lib/dns/sec/dnssafe/intitem.c b/lib/dns/sec/dnssafe/intitem.c
index a9bcc7e895..f4951019f7 100644
--- a/lib/dns/sec/dnssafe/intitem.c
+++ b/lib/dns/sec/dnssafe/intitem.c
@@ -31,7 +31,7 @@ B_MemoryPool *memoryPool;
   ITEM sourceItem, *destinationItem;
   int status;
   unsigned int i, offset;
-  
+
   for (i = 0; i < itemCount; i++) {
     offset = (unsigned int)((char *)staticItems[i] - (char *)staticStruct);
     sourceItem = *(ITEM *)((char *)source + offset);
@@ -41,14 +41,14 @@ B_MemoryPool *memoryPool;
       sourceItem.len--;
       sourceItem.data++;
     }
-    
+
     if ((status = B_MemoryPoolAllocAndCopy
          (memoryPool, (POINTER *)&destinationItem->data,
           (POINTER)sourceItem.data, destinationItem->len = sourceItem.len))
         != 0)
       return (status);
   }
-  
+
   return (0);
 }
 
diff --git a/lib/dns/sec/dnssafe/keyobj.c b/lib/dns/sec/dnssafe/keyobj.c
index 4dd5d77c03..651572f889 100644
--- a/lib/dns/sec/dnssafe/keyobj.c
+++ b/lib/dns/sec/dnssafe/keyobj.c
@@ -28,7 +28,7 @@ B_KEY_OBJ *keyObject;
 
   /* First construct base class */
   B_KEY_Constructor (&keyWrap->key);
-  
+
   keyWrap->typeTag = &KEY_TYPE_TAG;
   keyWrap->selfCheck = keyWrap;
   return (0);
@@ -43,7 +43,7 @@ B_KEY_OBJ *keyObject;
    */
   if (*keyObject == NULL_PTR)
     return;
-  
+
   if (KeyWrapCheck (keyWrap) == 0) {
     /* zeroize self check to invalidate memory. */
     keyWrap->selfCheck = (KeyWrap *)NULL_PTR;
@@ -64,7 +64,7 @@ POINTER info;
 {
   B_KeyInfoType *keyInfoType;
   int status;
-  
+
   if ((status = KeyWrapCheck (THE_KEY_WRAP)) != 0)
     return (status);
 
@@ -73,7 +73,7 @@ POINTER info;
    */
   if ((*infoType) ((POINTER *)&keyInfoType) == 0)
     return (BE_ALG_OPERATION_UNKNOWN);
-  
+
   return (B_KeySetInfo (&THE_KEY_WRAP->key, keyInfoType, info));
 }
 
@@ -84,7 +84,7 @@ B_INFO_TYPE infoType;
 {
   B_KeyInfoType *keyInfoType;
   int status;
-  
+
   if ((status = KeyWrapCheck (THE_KEY_WRAP)) != 0)
     return (status);
 
@@ -93,7 +93,7 @@ B_INFO_TYPE infoType;
    */
   if ((*infoType) ((POINTER *)&keyInfoType) == 0)
     return (BE_ALG_OPERATION_UNKNOWN);
-  
+
   return (B_KeyGetInfo (&THE_KEY_WRAP->key, info, keyInfoType));
 }
 
diff --git a/lib/dns/sec/dnssafe/ki8byte.c b/lib/dns/sec/dnssafe/ki8byte.c
index 306cc7b104..82eb8dafb1 100644
--- a/lib/dns/sec/dnssafe/ki8byte.c
+++ b/lib/dns/sec/dnssafe/ki8byte.c
@@ -36,7 +36,7 @@ POINTER info;
 {
   POINTER newData;
   int status;
-  
+
   /* Copy the 8 byte key. */
   if ((status = B_MemoryPoolAllocAndCopy
        (&key->infoCache.memoryPool, &newData, info, 8)) != 0)
@@ -55,7 +55,7 @@ B_Key *key;
 {
   ITEM *item;
   int status;
-  
+
   /* Try to make one from a KI_Item.  Since KI_Item doesn't
        call KI_8Byte, this should not cause an endless loop.
    */
diff --git a/lib/dns/sec/dnssafe/kifulprv.c b/lib/dns/sec/dnssafe/kifulprv.c
index be358352b0..29b65e143e 100644
--- a/lib/dns/sec/dnssafe/kifulprv.c
+++ b/lib/dns/sec/dnssafe/kifulprv.c
@@ -50,7 +50,7 @@ ITEM *coefficient;
        (&key->infoCache.memoryPool, (POINTER *)&fullKey,
         sizeof (FULL_PRIVATE_KEY))) != 0)
     return (status);
-  
+
   /* Pre-zeroize and only copy in values that are not NULL.
    */
   T_memset ((POINTER)fullKey, 0, sizeof (*fullKey));
@@ -70,7 +70,7 @@ ITEM *coefficient;
   }
   if (coefficient != (ITEM *)NULL_PTR)
     fullKey->coefficient = *coefficient;
-  
+
   return (B_InfoCacheAddInfo
           (&key->infoCache, (POINTER)&KITFullPrivate, (POINTER)fullKey));
 }
@@ -94,7 +94,7 @@ B_Key *key;
 {
   FULL_PRIVATE_KEY *fullKey;
   int status;
-  
+
   if ((status = B_KeyGetInfo
        (key, (POINTER *)&fullKey, &KITFullPrivate)) != 0)
     return (status);
@@ -133,7 +133,7 @@ B_Key *key;
       return (BE_WRONG_KEY_INFO);
     *coefficient = fullKey->coefficient;
   }
-  
+
   return (0);
 }
 
diff --git a/lib/dns/sec/dnssafe/kiitem.c b/lib/dns/sec/dnssafe/kiitem.c
index 9c44d8f1a9..a8d16921ef 100644
--- a/lib/dns/sec/dnssafe/kiitem.c
+++ b/lib/dns/sec/dnssafe/kiitem.c
@@ -33,12 +33,12 @@ POINTER info;
 {
   unsigned char *newData;
   int status;
-  
+
   if ((status = B_MemoryPoolAllocAndCopy
        (&key->infoCache.memoryPool, (POINTER *)&newData,
         (POINTER)((ITEM *)info)->data, ((ITEM *)info)->len)) != 0)
     return (status);
-    
+
   return (B_KeyAddItemInfo (key, newData, ((ITEM *)info)->len));
 }
 
diff --git a/lib/dns/sec/dnssafe/kinfotyp.h b/lib/dns/sec/dnssafe/kinfotyp.h
index 39c5292c6c..328c388a6f 100644
--- a/lib/dns/sec/dnssafe/kinfotyp.h
+++ b/lib/dns/sec/dnssafe/kinfotyp.h
@@ -48,7 +48,7 @@ typedef int (*KIT_MAKE_INFO) PROTO_LIST ((POINTER *, B_Key *));
 
 
    There is one global instance which is used by B_Key::setInfo, etc.:
-   
+
  KITItem KITItem;
  */
 
diff --git a/lib/dns/sec/dnssafe/kipkcrpr.c b/lib/dns/sec/dnssafe/kipkcrpr.c
index 50c08edb1b..bdc67f44d5 100644
--- a/lib/dns/sec/dnssafe/kipkcrpr.c
+++ b/lib/dns/sec/dnssafe/kipkcrpr.c
@@ -44,7 +44,7 @@ POINTER info;
 {
   A_PKCS_RSA_PRIVATE_KEY *newValue;
   int status;
-  
+
   /* Allocate memory for A_PKCS_RSA_PRIVATE_KEY struct and copy integers
        from supplied value.
    */
@@ -54,11 +54,11 @@ POINTER info;
     return (status);
   if ((status = AllocAndCopyIntegerItems
        ((POINTER)newValue, info, (POINTER)&STATIC_PKCS_RSA_PRIVATE_KEY,
-        PKCS_RSA_PRIVATE_KEY_ITEMS, sizeof (PKCS_RSA_PRIVATE_KEY_ITEMS) / 
+        PKCS_RSA_PRIVATE_KEY_ITEMS, sizeof (PKCS_RSA_PRIVATE_KEY_ITEMS) /
         sizeof (PKCS_RSA_PRIVATE_KEY_ITEMS[0]), &key->infoCache.memoryPool))
       != 0)
     return (status);
-    
+
   /* Cache the full private key info.
    */
   if ((status = CacheFullPrivateKey
@@ -93,7 +93,7 @@ B_Key *key;
        (&key->infoCache.memoryPool, info, sizeof (A_PKCS_RSA_PRIVATE_KEY)))
       != 0)
     return (status);
-    
+
   **(A_PKCS_RSA_PRIVATE_KEY **)info = keyValue;
   return (0);
 }
diff --git a/lib/dns/sec/dnssafe/kirsacrt.c b/lib/dns/sec/dnssafe/kirsacrt.c
index fe1ecb934f..afcaf6ca07 100644
--- a/lib/dns/sec/dnssafe/kirsacrt.c
+++ b/lib/dns/sec/dnssafe/kirsacrt.c
@@ -46,7 +46,7 @@ POINTER info;
 {
   A_RSA_CRT_KEY *newValue;
   int status;
-  
+
   /* Allocate memory for A_RSA_CRT_KEY struct and copy integers
        from supplied value.
      */
@@ -94,7 +94,7 @@ B_Key *key;
   if ((status = B_MemoryPoolAlloc
        (&key->infoCache.memoryPool, info, sizeof (A_RSA_CRT_KEY))) != 0)
     return (status);
-    
+
   **(A_RSA_CRT_KEY **)info = keyValue;
   return (0);
 }
diff --git a/lib/dns/sec/dnssafe/kirsapub.c b/lib/dns/sec/dnssafe/kirsapub.c
index a588ec8868..0d0eaa7dcf 100644
--- a/lib/dns/sec/dnssafe/kirsapub.c
+++ b/lib/dns/sec/dnssafe/kirsapub.c
@@ -36,7 +36,7 @@ POINTER info;
 {
   POINTER newValue;
   int status;
-  
+
   /* Allocate memory for A_RSA_KEY struct and copy integers
        from supplied value.
      */
@@ -48,7 +48,7 @@ POINTER info;
         sizeof (RSA_KEY_ITEMS) / sizeof (RSA_KEY_ITEMS[0]),
         &key->infoCache.memoryPool)) != 0)
     return (status);
-    
+
   return (B_InfoCacheAddInfo
           (&key->infoCache, (POINTER)&KIT_RSAPublic, newValue));
 }
@@ -59,7 +59,7 @@ B_Key *key;
 {
   A_RSA_KEY keyValue;
   int status;
-  
+
   /* If not already found in the cache, try to get values from
        a full private key info, setting unneeded entries to NULL.
    */
@@ -74,7 +74,7 @@ B_Key *key;
   if ((status = B_MemoryPoolAlloc
        (&key->infoCache.memoryPool, info, sizeof (A_RSA_KEY))) != 0)
     return (status);
-    
+
   **(A_RSA_KEY **)info = keyValue;
   return (0);
 }
diff --git a/lib/dns/sec/dnssafe/md5.c b/lib/dns/sec/dnssafe/md5.c
index a5865d9ea8..4388d3642e 100644
--- a/lib/dns/sec/dnssafe/md5.c
+++ b/lib/dns/sec/dnssafe/md5.c
@@ -109,15 +109,15 @@ unsigned int inputLen;                              /* length of input block */
   if (inputLen >= partLen) {
     T_memcpy ((POINTER)&context->buffer[index], (POINTER)input, partLen);
     MD5Transform (context->state, context->buffer);
-  
+
     for (i = partLen; i + 63 < inputLen; i += 64)
       MD5Transform (context->state, &input[i]);
-    
+
     index = 0;
   }
   else
     i = 0;
-  
+
   /* Buffer remaining input */
   T_memcpy ((POINTER)&context->buffer[index], (POINTER)&input[i], inputLen-i);
 }
@@ -240,7 +240,7 @@ unsigned char block[64];
   state[1] += b;
   state[2] += c;
   state[3] += d;
-  
+
   /* Zeroize sensitive information.
    */
   T_memset ((POINTER)x, 0, sizeof (x));
diff --git a/lib/dns/sec/dnssafe/md5rand.h b/lib/dns/sec/dnssafe/md5rand.h
index dc0b20ae41..8f0535a405 100644
--- a/lib/dns/sec/dnssafe/md5rand.h
+++ b/lib/dns/sec/dnssafe/md5rand.h
@@ -18,7 +18,7 @@ extern "C" {
 
 typedef struct A_MD5_RANDOM_CTX {
   A_DigestRandom digestRandom;                               /* "base class" */
-  
+
   unsigned char state[3 * A_MD5_DIGEST_LEN];
   A_MD5_CTX md5Context;
 } A_MD5_RANDOM_CTX;
diff --git a/lib/dns/sec/dnssafe/prime.c b/lib/dns/sec/dnssafe/prime.c
index f2832ea1ec..014d54c116 100644
--- a/lib/dns/sec/dnssafe/prime.c
+++ b/lib/dns/sec/dnssafe/prime.c
@@ -32,7 +32,7 @@ A_SURRENDER_CTX *surrenderContext;
   char sieve[1000];
   int status = 0;
   unsigned int i, r, s, testResult;
-  
+
   do {
     /* Create a starting point for the prime from the random block */
     for (i = 0; i < primeWords; i++) {
@@ -42,13 +42,13 @@ A_SURRENDER_CTX *surrenderContext;
 
     /* set high order two bits */
     BigSetbit (prime, primeSizeBits-2);
-    BigSetbit (prime, primeSizeBits-1);   
-    for (i = primeSizeBits; i < (unsigned int)(16 * primeWords); i++) 
+    BigSetbit (prime, primeSizeBits-1);
+    for (i = primeSizeBits; i < (unsigned int)(16 * primeWords); i++)
       BigClrbit (prime, i);
 
     /* force p to be even */
     BigClrbit (prime, 0);
-  
+
     /* clear sieve and mark even positions */
     for (i = 0; i < 1000; i += 2) {
       sieve[i] = 1;
@@ -72,7 +72,7 @@ A_SURRENDER_CTX *surrenderContext;
       for (i = s - r; i < 1000; i += s)
         sieve[i] = 1;
     }
-  
+
     /* t1 = 1 */
     BigConst (t1, 1, modulusWords);
 
@@ -105,7 +105,7 @@ A_SURRENDER_CTX *surrenderContext;
     }
     if (status)
       break;
-    
+
     if (!testResult)
       /* Couldn't find a prime with the supplied random block, so ask
            caller to generate another random block and try again. */
@@ -123,7 +123,7 @@ A_SURRENDER_CTX *surrenderContext;
       If pseudo prime, *testResult = 1, else *testResult = 0.
    Returns 0, AE_CANCEL.
  */
-int PseudoPrime (testResult, prime, primeWords, surrenderContext) 
+int PseudoPrime (testResult, prime, primeWords, surrenderContext)
 unsigned int *testResult;
 UINT2 *prime;
 unsigned int primeWords;
@@ -135,10 +135,10 @@ A_SURRENDER_CTX *surrenderContext;
 
   /* Default testResult to false. */
   *testResult = 0;
-  
+
   /* Prepare for setting base vector to the small prime. */
   T_memset ((POINTER)base, 0, sizeof (base));
-  
+
   for (i = 0; i < 4; i++) {
     /* check to see if target is multiple of SMALL_PRIME */
     if (BigSmod (prime, (unsigned int)SMALL_PRIME[i], primeWords) == 0)
diff --git a/lib/dns/sec/dnssafe/rsa.c b/lib/dns/sec/dnssafe/rsa.c
index 8cf24b32ad..1e289fcc39 100644
--- a/lib/dns/sec/dnssafe/rsa.c
+++ b/lib/dns/sec/dnssafe/rsa.c
@@ -85,7 +85,7 @@ A_SURRENDER_CTX *surrenderContext;
     context->inputLen += partInLen;
     return (0);
   }
-  
+
   if (context->inputLen > 0) {
     /* Need to accumulate the rest of the block bytes into the input and
          encrypt from there (otherwise it's OK to encrypt straight from
@@ -97,7 +97,7 @@ A_SURRENDER_CTX *surrenderContext;
        partialLen);
     partIn += partialLen;
     partInLen -= partialLen;
-    
+
     if ((status = RSA
          (context, partOut, &localPartOutLen, maxPartOutLen, context->input,
           surrenderContext)) != 0)
@@ -114,14 +114,14 @@ A_SURRENDER_CTX *surrenderContext;
          (context, partOut, &localPartOutLen, maxPartOutLen, partIn,
           surrenderContext)) != 0)
       return (status);
-    
+
     partIn += context->blockLen;
     partInLen -= context->blockLen;
     (*partOutLen) += localPartOutLen;
     partOut += localPartOutLen;
     maxPartOutLen -= localPartOutLen;
   }
-  
+
   /* Copy remaining input bytes to the context's input buffer.
    */
   T_memcpy
@@ -134,7 +134,7 @@ A_RSA_CTX *context;
 {
   if (context->inputLen != 0)
     return (AE_INPUT_LEN);
-  
+
   /* Restart context to accumulate a new block. */
   context->inputLen = 0;
   return (0);
@@ -163,7 +163,7 @@ A_SURRENDER_CTX *surrenderContext;
   do {
     if ((*outputLen = context->blockLen) > maxOutputLen)
       return (AE_OUTPUT_LEN);
-    
+
 #if USE_ALLOCED_FRAME
     if ((frame = (struct ModExpFrame *)T_malloc (sizeof (*frame)))
         == (struct ModExpFrame *)NULL_PTR) {
@@ -180,11 +180,11 @@ A_SURRENDER_CTX *surrenderContext;
      */
     CanonicalToBig
       (frame->bigInBuf, context->modulusWords, input, context->blockLen);
-  
+
     /* Check for overflow. */
     if (BigCmp (frame->bigInBuf, context->modulus, context->modulusWords) >= 0)
       GENERATE_BREAK (AE_INPUT_DATA);
-    
+
     /* Exponentiate. */
     if ((status = BigModExp
          (frame->bigOutBuf, frame->bigInBuf, context->exponent,
@@ -197,7 +197,7 @@ A_SURRENDER_CTX *surrenderContext;
     BigToCanonical
       (output, *outputLen, frame->bigOutBuf, context->modulusWords);
   } while (0);
-  
+
   if (frame != (struct ModExpFrame *)NULL_PTR) {
     T_memset ((POINTER)frame, 0, sizeof (*frame));
 #if USE_ALLOCED_FRAME
diff --git a/lib/dns/sec/dnssafe/rsakeygn.c b/lib/dns/sec/dnssafe/rsakeygn.c
index 685fb71cec..7623db8f06 100644
--- a/lib/dns/sec/dnssafe/rsakeygn.c
+++ b/lib/dns/sec/dnssafe/rsakeygn.c
@@ -29,12 +29,12 @@ A_RSA_KEY_GEN_CTX *context;
 A_RSA_KEY_GEN_PARAMS *params;
 {
   context->modulusBits = params->modulusBits;
-  
+
   /* Prezeroize big public exponent vector. */
   T_memset
     ((POINTER)context->bigPublicExponent, 0,
      sizeof (context->bigPublicExponent));
-    
+
   /* Copy public exponent into big vector */
   if (CanonicalToBig
       (context->bigPublicExponent, MAX_RSA_MODULUS_WORDS,
@@ -88,7 +88,7 @@ A_SURRENDER_CTX *surrenderContext;
   modulusWords = BITS_TO_WORDS (context->modulusBits);
   primeSizeBits = RSA_PRIME_BITS (context->modulusBits);
   primeWords = BITS_TO_WORDS (RSA_PRIME_BITS (context->modulusBits));
-    
+
   /* Fish for bigPrime1 and bigPrime2 that are compatible with supplied
        publicExponent.
      The randomBlock holds random bytes for two primes.
@@ -117,25 +117,25 @@ A_SURRENDER_CTX *surrenderContext;
   }
 
   /* Calculate the rest of the key components */
-  if ((status = RSAParameters 
+  if ((status = RSAParameters
        (context->bigModulus, context->bigCoefficient,
         context->bigExponentP, context->bigExponentQ,
         context->bigPrivateExponent, context->bigPublicExponent,
         bigPrimeP, bigPrimeQ, primeWords, modulusWords, surrenderContext)) != 0)
     return (status);
-    
+
   /* Copy key components into canonical buffers which are at the
        end of the context. */
   *result = &context->result;
   SetRSAKeyGenResult (*result, context, bigPrimeP, bigPrimeQ);
-  
+
   return (0);
 }
 
 /* Assumes ee, pp, qq are given, calculates other parameters.
    Returns 0, AE_CANCEL.
  */
-static int RSAParameters 
+static int RSAParameters
   (nn, cr, dp, dq, dd, ee, pp, qq, primeWords, modulusWords, surrenderContext)
 UINT2 *nn, *cr, *dp, *dq, *dd, *ee, *pp, *qq;
 unsigned int primeWords, modulusWords;
@@ -143,25 +143,25 @@ A_SURRENDER_CTX *surrenderContext;
 {
   UINT2 t1[2 * MAX_RSA_PRIME_WORDS], t2[MAX_RSA_PRIME_WORDS],
     t3[MAX_RSA_MODULUS_WORDS], u1[MAX_RSA_MODULUS_WORDS],
-    u3[MAX_RSA_MODULUS_WORDS], pm1[MAX_RSA_PRIME_WORDS], 
+    u3[MAX_RSA_MODULUS_WORDS], pm1[MAX_RSA_PRIME_WORDS],
     qm1[MAX_RSA_PRIME_WORDS];
   int status;
-  
+
   do {
     /* N=P*Q */
     BigMpy (t1, pp, qq, primeWords);
     if ((status = CheckSurrender (surrenderContext)) != 0)
       break;
     BigCopy (nn, t1, modulusWords);
-  
+
     /*  qm1=q-1 & pm1=p-1 */
     BigConst (t1, 1, primeWords);
     BigSub (qm1, qq, t1, primeWords);
     BigSub (pm1, pp, t1, primeWords);
-    
+
     /* t3=1 */
     BigConst (t3, 1, modulusWords);
-  
+
     /*t1=phi (N) */
     BigMpy (t1, pm1, qm1, primeWords);
     if ((status = CheckSurrender (surrenderContext)) != 0)
@@ -179,11 +179,11 @@ A_SURRENDER_CTX *surrenderContext;
     BigPdiv (t1, dq, dd, qm1, modulusWords, primeWords);
     if ((status = CheckSurrender (surrenderContext)) != 0)
       break;
-  
+
     /* calc CR = (inv (Q)[modP]) */
     BigPegcd (t1, t2, cr, pp, qq, primeWords);
   } while (0);
-  
+
   T_memset ((POINTER)t1, 0, sizeof (t1));
   T_memset ((POINTER)t2, 0, sizeof (t2));
   T_memset ((POINTER)t3, 0, sizeof (t3));
@@ -204,10 +204,10 @@ UINT2 *bigPrimeQ;
 
   modulusLen = result->modulus.len = result->publicExponent.len =
     result->privateExponent.len = BITS_TO_LEN (context->modulusBits);
-  primeLen = result->prime[0].len = result->prime[1].len = 
+  primeLen = result->prime[0].len = result->prime[1].len =
     result->primeExponent[0].len = result->primeExponent[1].len =
     result->coefficient.len = RSA_PRIME_LEN (context->modulusBits);
-  
+
   result->modulus.data = context->resultBuffer;
   result->publicExponent.data = result->modulus.data + modulusLen;
   result->privateExponent.data = result->publicExponent.data + modulusLen;
@@ -226,11 +226,11 @@ UINT2 *bigPrimeQ;
   BigToCanonical
     (result->privateExponent.data, modulusLen,
      context->bigPrivateExponent, MAX_RSA_MODULUS_WORDS);
-  BigToCanonical 
+  BigToCanonical
     (result->prime[0].data, primeLen, bigPrimeP, MAX_RSA_PRIME_WORDS);
-  BigToCanonical 
+  BigToCanonical
     (result->prime[1].data, primeLen, bigPrimeQ, MAX_RSA_PRIME_WORDS);
-  BigToCanonical 
+  BigToCanonical
     (result->primeExponent[0].data, primeLen, context->bigExponentP,
      MAX_RSA_PRIME_WORDS);
   BigToCanonical
diff --git a/lib/dns/sec/dnssafe/seccbcd.c b/lib/dns/sec/dnssafe/seccbcd.c
index 52dafd692e..e00ee4596a 100644
--- a/lib/dns/sec/dnssafe/seccbcd.c
+++ b/lib/dns/sec/dnssafe/seccbcd.c
@@ -49,7 +49,7 @@ unsigned int inputLen;
     ((POINTER)remainder + *remainderLen, (POINTER)input,
      partialLen = 16 - *remainderLen);
   input += partialLen;
-  inputLen -= partialLen;    
+  inputLen -= partialLen;
 
   /* remainder is full and inputLen is at least 1.  Compute outputLen
        as the size needed to keep remainder as full as possible.
@@ -60,7 +60,7 @@ unsigned int inputLen;
   SecretCBCDecryptBlock
     (context, xorBlock, SecretDecrypt, output, remainder);
   output += 8;
-  
+
   if (inputLen <= 8) {
     /* Shift remaining input bytes into remainder */
     T_memmove ((POINTER)remainder, (POINTER)(remainder + 8), 8);
@@ -109,7 +109,7 @@ unsigned int maxOutputLen;
   if ((*outputLen = remainderLen) == 0)
     /* There was never any data. */
     return (0);
-  
+
   if (remainderLen != 8 && remainderLen != 16)
     return (AE_INPUT_LEN);
 
@@ -134,13 +134,13 @@ unsigned char *in;
 {
   unsigned char tempBuffer[8];
   unsigned int i;
-  
+
   /* Save input to be copied to the xor block. */
   T_memcpy ((POINTER)tempBuffer, (POINTER)in, 8);
   (*SecretDecrypt) (context, out, in);
   for (i = 0; i < 8; i++)
-    out[i] ^= xorBlock[i];  
+    out[i] ^= xorBlock[i];
   T_memcpy ((POINTER)xorBlock, (POINTER)tempBuffer, 8);
-  
+
   T_memset ((POINTER)tempBuffer, 0, sizeof (tempBuffer));
 }
diff --git a/lib/dns/sec/dnssafe/seccbce.c b/lib/dns/sec/dnssafe/seccbce.c
index 6fe5c863b9..16d12e7517 100644
--- a/lib/dns/sec/dnssafe/seccbce.c
+++ b/lib/dns/sec/dnssafe/seccbce.c
@@ -35,29 +35,29 @@ unsigned int inputLen;
    */
   if ((*outputLen = 8 * (totalLen / 8)) > maxOutputLen)
     return (AE_OUTPUT_LEN);
-  
+
   if (totalLen < 8) {
     /* Not enough to encrypt, just accumulate into remainder.
      */
     T_memcpy
       ((POINTER)remainder + *remainderLen, (POINTER)input, inputLen);
     *remainderLen = totalLen;
-    
+
     return (0);
   }
-  
+
   /* Accumulate enough bytes from input into remainder to encrypt the
        remainder.
    */
   T_memcpy
     ((POINTER)remainder + *remainderLen, (POINTER)input,
      partialLen = 8 - *remainderLen);
-    
+
   for (i = 0; i < 8; i++)
     output[i] = remainder[i] ^ xorBlock[i];
   /* Encrypt in place */
   (*SecretEncrypt) (context, output, output);
-  
+
   T_memcpy ((POINTER)xorBlock, (POINTER)output, 8);
   input += partialLen;
   inputLen -= partialLen;
@@ -79,7 +79,7 @@ unsigned int inputLen;
    */
   T_memcpy ((POINTER)remainder, (POINTER)input, inputLen);
   *remainderLen = inputLen;
-   
+
   return (0);
 }
 
@@ -92,6 +92,6 @@ unsigned int remainderLen;
 {
   if (remainderLen != 0)
     return (AE_INPUT_LEN);
-  
+
   return (0);
 }
diff --git a/lib/dns/sec/dst/Makefile.in b/lib/dns/sec/dst/Makefile.in
index 4f79fc67af..c171a058d5 100644
--- a/lib/dns/sec/dst/Makefile.in
+++ b/lib/dns/sec/dst/Makefile.in
@@ -1,9 +1,9 @@
 # Copyright (C) 1998-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
 # 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
@@ -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.14 2000/07/31 19:44:13 bwelling Exp $
+# $Id: Makefile.in,v 1.15 2000/08/01 01:27:43 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/dns/sec/dst/bsafe_link.c b/lib/dns/sec/dst/bsafe_link.c
index df4370f469..faa21a44d5 100644
--- a/lib/dns/sec/dst/bsafe_link.c
+++ b/lib/dns/sec/dst/bsafe_link.c
@@ -1,11 +1,11 @@
 /*
  * Portions Copyright (C) 1999, 2000  Internet Software Consortium.
  * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
- * 
+ *
  * 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 AND
  * NETWORK ASSOCIATES DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
  * SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
@@ -19,7 +19,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: bsafe_link.c,v 1.32 2000/06/22 21:19:13 bwelling Exp $
+ * $Id: bsafe_link.c,v 1.33 2000/08/01 01:27:44 tale Exp $
  */
 
 #if defined(DNSSAFE)
@@ -120,7 +120,7 @@ dnssafersa_sign(dst_context_t *dctx, isc_buffer_t *sig) {
 	isc_buffer_availableregion(sig, &sig_region);
 	if (sig_region.length * 8 < (unsigned int) key->key_size)
 		return (ISC_R_NOSPACE);
-		
+
 	if (!dnssafersa_isprivate(key))
 		return (DST_R_NOTPRIVATEKEY);
 
@@ -250,16 +250,16 @@ dnssafersa_compare(const dst_key_t *key1, const dst_key_t *key2) {
 	rkey1 = (RSA_Key *) key1->opaque;
 	rkey2 = (RSA_Key *) key2->opaque;
 
-	if (rkey1 == NULL && rkey2 == NULL) 
+	if (rkey1 == NULL && rkey2 == NULL)
 		return (ISC_TRUE);
 	else if (rkey1 == NULL || rkey2 == NULL)
 		return (ISC_FALSE);
 
-	if (rkey1->rk_Public_Key) 
-		(void)B_GetKeyInfo((POINTER *) &public1, rkey1->rk_Public_Key, 
+	if (rkey1->rk_Public_Key)
+		(void)B_GetKeyInfo((POINTER *) &public1, rkey1->rk_Public_Key,
 				   KI_RSAPublic);
-	if (rkey2->rk_Public_Key) 
-		(void)B_GetKeyInfo((POINTER *) &public2, rkey2->rk_Public_Key, 
+	if (rkey2->rk_Public_Key)
+		(void)B_GetKeyInfo((POINTER *) &public2, rkey2->rk_Public_Key,
 				   KI_RSAPublic);
 	if (public1 == NULL && public2 == NULL)
 		return (ISC_TRUE);
@@ -269,7 +269,7 @@ dnssafersa_compare(const dst_key_t *key1, const dst_key_t *key2) {
 	status = itemcmp(public1->modulus, public2->modulus) ||
 		 itemcmp(public1->exponent, public2->exponent);
 
-	if (status == ISC_FALSE) 
+	if (status == ISC_FALSE)
 		return (ISC_FALSE);
 
 	if (rkey1->rk_Private_Key != NULL || rkey2->rk_Private_Key != NULL) {
@@ -281,7 +281,7 @@ dnssafersa_compare(const dst_key_t *key1, const dst_key_t *key2) {
 				   KI_PKCS_RSAPrivate);
 		(void)B_GetKeyInfo((POINTER *)&p2, rkey2->rk_Private_Key,
 				   KI_PKCS_RSAPrivate);
-		if (p1 == NULL || p2 == NULL) 
+		if (p1 == NULL || p2 == NULL)
 			return (ISC_FALSE);
 
 		status = itemcmp(p1->modulus, p2->modulus) &&
@@ -549,7 +549,7 @@ dnssafersa_fromdns(dst_key_t *key, isc_buffer_t *data) {
 	if (bytes == 0)  /* special case for long exponents */
 		bytes = isc_buffer_getuint16(data);
 
-	if (bytes > MAX_RSA_MODULUS_LEN) { 
+	if (bytes > MAX_RSA_MODULUS_LEN) {
 		dnssafersa_destroy(key);
 		return (DST_R_INVALIDPUBLICKEY);
 	}
@@ -575,7 +575,7 @@ dnssafersa_fromdns(dst_key_t *key, isc_buffer_t *data) {
 
 	isc_buffer_remainingregion(data, &r);
 
-	if (r.length > MAX_RSA_MODULUS_LEN) { 
+	if (r.length > MAX_RSA_MODULUS_LEN) {
 		dnssafersa_destroy(key);
 		memset(public->exponent.data, 0, bytes);
 		isc_mem_put(mctx, public->exponent.data, bytes);
@@ -664,7 +664,7 @@ dnssafersa_tofile(const dst_key_t *key, const char *directory) {
 	return (dst__privstruct_writefile(key, &priv, directory));
 }
 
-static isc_result_t 
+static isc_result_t
 dnssafersa_fromfile(dst_key_t *key, const isc_uint16_t id,
 		    const char *filename) {
 	dst_private_t priv;
@@ -695,7 +695,7 @@ dnssafersa_fromfile(dst_key_t *key, const isc_uint16_t id,
 	memset(private, 0, sizeof(*private));
 
 	public = (A_RSA_KEY *) isc_mem_get(mctx, sizeof(A_RSA_KEY));
-	if (public == NULL) 
+	if (public == NULL)
 		DST_RET(ISC_R_NOMEMORY);
 	memset(public, 0, sizeof(*public));
 
@@ -750,7 +750,7 @@ dnssafersa_fromfile(dst_key_t *key, const isc_uint16_t id,
 		DST_RET(DST_R_INVALIDPRIVATEKEY);
 
 	rkey = (RSA_Key *) isc_mem_get(mctx, sizeof(RSA_Key));
-	if (rkey == NULL) 
+	if (rkey == NULL)
 		DST_RET(ISC_R_NOMEMORY);
 	memset(rkey, 0, sizeof(*rkey));
 	if (B_CreateKeyObject(&(rkey->rk_Public_Key)) != 0)
@@ -816,7 +816,7 @@ void
 dst__dnssafersa_destroy(void) {
 }
 
-/* 
+/*
  * define memory functions for dnssafe that use the isc_mem functions and a
  * static context.
  */
diff --git a/lib/dns/sec/dst/dst_api.c b/lib/dns/sec/dst/dst_api.c
index c779d0bccf..1e43d55ae0 100644
--- a/lib/dns/sec/dst/dst_api.c
+++ b/lib/dns/sec/dst/dst_api.c
@@ -1,11 +1,11 @@
 /*
  * Portions Copyright (C) 1999, 2000  Internet Software Consortium.
  * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
- * 
+ *
  * 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 AND
  * NETWORK ASSOCIATES DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
  * SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
@@ -19,7 +19,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: dst_api.c,v 1.57 2000/07/31 19:44:14 bwelling Exp $
+ * $Id: dst_api.c,v 1.58 2000/08/01 01:27:45 tale Exp $
  */
 
 #include 
@@ -76,7 +76,7 @@ static isc_result_t	read_public_key(const char *filename,
 static isc_result_t	write_public_key(const dst_key_t *key,
 					 const char *directory);
 static isc_result_t	buildfilename(dns_name_t *name,
-				      const unsigned int id, 
+				      const unsigned int id,
 				      const unsigned int alg,
 				      const unsigned int type,
 				      const char *directory,
@@ -235,7 +235,7 @@ dst_context_verify(dst_context_t *dctx, isc_region_t *sig) {
 
 isc_result_t
 dst_key_computesecret(const dst_key_t *pub, const dst_key_t *priv,
-		  isc_buffer_t *secret) 
+		  isc_buffer_t *secret)
 {
 	REQUIRE(dst_initialized == ISC_TRUE);
 	REQUIRE(VALID_KEY(pub) && VALID_KEY(priv));
@@ -259,7 +259,7 @@ dst_key_computesecret(const dst_key_t *pub, const dst_key_t *priv,
 	return (pub->func->computesecret(pub, priv, secret));
 }
 
-isc_result_t 
+isc_result_t
 dst_key_tofile(const dst_key_t *key, const int type, const char *directory) {
 	isc_result_t ret = ISC_R_SUCCESS;
 
@@ -353,7 +353,7 @@ dst_key_fromnamedfile(const char *filename, const int type, isc_mem_t *mctx,
 		*keyp = pubkey;
 		return (ISC_R_SUCCESS);
 	}
-	
+
 	key = get_key_struct(pubkey->key_name, pubkey->key_alg,
 			     pubkey->key_flags, pubkey->key_proto, 0, mctx);
 	id = pubkey->key_id;
@@ -478,7 +478,7 @@ dst_key_frombuffer(dns_name_t *name, const unsigned int alg,
 	return (ISC_R_SUCCESS);
 }
 
-isc_result_t 
+isc_result_t
 dst_key_tobuffer(const dst_key_t *key, isc_buffer_t *target) {
 	REQUIRE(dst_initialized == ISC_TRUE);
 	REQUIRE(VALID_KEY(key));
@@ -641,7 +641,7 @@ dst_key_isprivate(const dst_key_t *key) {
 isc_boolean_t
 dst_key_iszonekey(const dst_key_t *key) {
 	REQUIRE(VALID_KEY(key));
-      
+
 	if ((key->key_flags & DNS_KEYTYPE_NOAUTH) != 0)
 		return (ISC_FALSE);
 	if ((key->key_flags & DNS_KEYFLAG_OWNERMASK) != DNS_KEYOWNER_ZONE)
@@ -655,7 +655,7 @@ dst_key_iszonekey(const dst_key_t *key) {
 isc_boolean_t
 dst_key_isnullkey(const dst_key_t *key) {
 	REQUIRE(VALID_KEY(key));
-      
+
 	if ((key->key_flags & DNS_KEYFLAG_TYPEMASK) != DNS_KEYTYPE_NOKEY)
 		return (ISC_FALSE);
 	if ((key->key_flags & DNS_KEYFLAG_OWNERMASK) != DNS_KEYOWNER_ZONE)
@@ -748,15 +748,15 @@ dst_region_computeid(const isc_region_t *source) {
  *** Static methods
  ***/
 
-/* 
- * Allocates a key structure and fills in some of the fields. 
+/*
+ * Allocates a key structure and fills in some of the fields.
  */
 static dst_key_t *
 get_key_struct(dns_name_t *name, const unsigned int alg,
 	       const unsigned int flags, const unsigned int protocol,
 	       const unsigned int bits, isc_mem_t *mctx)
 {
-	dst_key_t *key; 
+	dst_key_t *key;
 	isc_result_t result;
 
 	REQUIRE(dst_algorithm_supported(alg) != ISC_FALSE);
@@ -859,26 +859,26 @@ read_public_key(const char *filename, isc_mem_t *mctx, dst_key_t **keyp) {
 				ISC_FALSE, NULL);
 	if (ret != ISC_R_SUCCESS)
 		goto cleanup;
-	
+
 	/* Read the next word: either TTL, 'IN', or 'KEY' */
 	NEXTTOKEN(lex, opt, &token);
 
 	/* If it's a TTL, read the next one */
 	if (token.type == isc_tokentype_number)
 		NEXTTOKEN(lex, opt, &token);
-	
+
 	if (token.type != isc_tokentype_string)
 		BADTOKEN();
 
 	if (strcasecmp(token.value.as_pointer, "IN") == 0)
 		NEXTTOKEN(lex, opt, &token);
-	
+
 	if (token.type != isc_tokentype_string)
 		BADTOKEN();
 
 	if (strcasecmp(token.value.as_pointer, "KEY") != 0)
 		BADTOKEN();
-	
+
 	isc_buffer_init(&b, rdatabuf, sizeof(rdatabuf));
 	ret = dns_rdata_fromtext(&rdata, dns_rdataclass_in, dns_rdatatype_key,
 				 lex, NULL, ISC_FALSE, &b, NULL);
@@ -931,7 +931,7 @@ write_public_key(const dst_key_t *key, const char *directory) {
 		return (DST_R_INVALIDPUBLICKEY);
 
 	isc_buffer_usedregion(&textb, &r);
-	
+
 	/*
 	 * Make the filename.
 	 */
@@ -958,7 +958,7 @@ write_public_key(const dst_key_t *key, const char *directory) {
 }
 
 static isc_result_t
-buildfilename(dns_name_t *name, const unsigned int id, 
+buildfilename(dns_name_t *name, const unsigned int id,
 	      const unsigned int alg, const unsigned int type,
 	      const char *directory, isc_buffer_t *out)
 {
diff --git a/lib/dns/sec/dst/dst_internal.h b/lib/dns/sec/dst/dst_internal.h
index cd1091fa57..eb5a530b27 100644
--- a/lib/dns/sec/dst/dst_internal.h
+++ b/lib/dns/sec/dst/dst_internal.h
@@ -1,11 +1,11 @@
 /*
  * Portions Copyright (C) 2000  Internet Software Consortium.
  * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
- * 
+ *
  * 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 AND
  * NETWORK ASSOCIATES DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
  * SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dst_internal.h,v 1.26 2000/07/31 19:44:15 bwelling Exp $ */
+/* $Id: dst_internal.h,v 1.27 2000/08/01 01:27:46 tale Exp $ */
 
 #ifndef DST_DST_INTERNAL_H
 #define DST_DST_INTERNAL_H 1
diff --git a/lib/dns/sec/dst/dst_lib.c b/lib/dns/sec/dst/dst_lib.c
index 40d00bc4cd..0802a334ef 100644
--- a/lib/dns/sec/dst/dst_lib.c
+++ b/lib/dns/sec/dst/dst_lib.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -17,7 +17,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: dst_lib.c,v 1.5 2000/07/27 09:50:25 tale Exp $
+ * $Id: dst_lib.c,v 1.6 2000/08/01 01:27:48 tale Exp $
  */
 
 #include 
diff --git a/lib/dns/sec/dst/dst_parse.c b/lib/dns/sec/dst/dst_parse.c
index 2ad12bf1a0..68ed8cc65a 100644
--- a/lib/dns/sec/dst/dst_parse.c
+++ b/lib/dns/sec/dst/dst_parse.c
@@ -1,11 +1,11 @@
 /*
  * Portions Copyright (C) 1999, 2000  Internet Software Consortium.
  * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
- * 
+ *
  * 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 AND
  * NETWORK ASSOCIATES DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
  * SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
@@ -19,7 +19,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: dst_parse.c,v 1.22 2000/06/20 04:13:40 tale Exp $
+ * $Id: dst_parse.c,v 1.23 2000/08/01 01:27:49 tale Exp $
  */
 
 #include 
@@ -243,7 +243,7 @@ dst__privstruct_parsefile(dst_key_t *key, const isc_uint16_t id,
 	if (token.type != isc_tokentype_string ||
 	    strcmp(token.value.as_pointer, PRIVATE_KEY_STR) != 0)
 		goto fail;
-	
+
 	NEXTTOKEN(lex, opt, &token);
 	if (token.type != isc_tokentype_string ||
 	    ((char *)token.value.as_pointer)[0] != 'v')
@@ -280,7 +280,7 @@ dst__privstruct_parsefile(dst_key_t *key, const isc_uint16_t id,
 		unsigned char *data;
 		isc_region_t r;
 
-		iret = isc_lex_gettoken(lex, opt, &token); 
+		iret = isc_lex_gettoken(lex, opt, &token);
 		if (iret == ISC_R_EOF)
 			break;
 		if (iret != ISC_R_SUCCESS)
@@ -397,7 +397,7 @@ dst__privstruct_writefile(const dst_key_t *key, const dst_private_t *priv,
 		fwrite(r.base, 1, r.length, fp);
 		fprintf(fp, "\n");
 	}
-	
+
 	fclose(fp);
 	return (ISC_R_SUCCESS);
 }
diff --git a/lib/dns/sec/dst/dst_parse.h b/lib/dns/sec/dst/dst_parse.h
index 41fb5bae4f..b92041b3d5 100644
--- a/lib/dns/sec/dst/dst_parse.h
+++ b/lib/dns/sec/dst/dst_parse.h
@@ -1,11 +1,11 @@
 /*
  * Portions Copyright (C) 2000  Internet Software Consortium.
  * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
- * 
+ *
  * 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 AND
  * NETWORK ASSOCIATES DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
  * SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dst_parse.h,v 1.14 2000/06/22 21:56:37 tale Exp $ */
+/* $Id: dst_parse.h,v 1.15 2000/08/01 01:27:50 tale Exp $ */
 
 #ifndef DST_DST_PARSE_H
 #define DST_DST_PARSE_H 1
diff --git a/lib/dns/sec/dst/dst_result.c b/lib/dns/sec/dst/dst_result.c
index a0f6d4be5d..432cb7855f 100644
--- a/lib/dns/sec/dst/dst_result.c
+++ b/lib/dns/sec/dst/dst_result.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -17,7 +17,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: dst_result.c,v 1.13 2000/07/27 09:50:26 tale Exp $
+ * $Id: dst_result.c,v 1.14 2000/08/01 01:27:51 tale Exp $
  */
 
 #include 
diff --git a/lib/dns/sec/dst/hmac_link.c b/lib/dns/sec/dst/hmac_link.c
index 84c650c4db..7a04ca4958 100644
--- a/lib/dns/sec/dst/hmac_link.c
+++ b/lib/dns/sec/dst/hmac_link.c
@@ -1,11 +1,11 @@
 /*
  * Portions Copyright (C) 1999, 2000  Internet Software Consortium.
  * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
- * 
+ *
  * 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 AND
  * NETWORK ASSOCIATES DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
  * SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
@@ -19,7 +19,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: hmac_link.c,v 1.41 2000/07/31 19:44:18 bwelling Exp $
+ * $Id: hmac_link.c,v 1.42 2000/08/01 01:27:52 tale Exp $
  */
 
 #include 
@@ -112,7 +112,7 @@ hmacmd5_compare(const dst_key_t *key1, const dst_key_t *key2) {
 	hkey1 = (HMAC_Key *)key1->opaque;
 	hkey2 = (HMAC_Key *)key2->opaque;
 
-	if (hkey1 == NULL && hkey2 == NULL) 
+	if (hkey1 == NULL && hkey2 == NULL)
 		return (ISC_TRUE);
 	else if (hkey1 == NULL || hkey2 == NULL)
 		return (ISC_FALSE);
@@ -238,7 +238,7 @@ hmacmd5_tofile(const dst_key_t *key, const char *directory) {
 	return (dst__privstruct_writefile(key, &priv, directory));
 }
 
-static isc_result_t 
+static isc_result_t
 hmacmd5_fromfile(dst_key_t *key, const isc_uint16_t id, const char *filename) {
 	dst_private_t priv;
 	isc_result_t ret;
diff --git a/lib/dns/sec/dst/include/Makefile.in b/lib/dns/sec/dst/include/Makefile.in
index efb74e6e37..9d57e20621 100644
--- a/lib/dns/sec/dst/include/Makefile.in
+++ b/lib/dns/sec/dst/include/Makefile.in
@@ -1,9 +1,9 @@
 # Copyright (C) 1998-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
 # 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
@@ -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.6 2000/07/27 09:50:28 tale Exp $
+# $Id: Makefile.in,v 1.7 2000/08/01 01:27:56 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/dns/sec/dst/include/dst/Makefile.in b/lib/dns/sec/dst/include/dst/Makefile.in
index cd34c1b062..051a08389f 100644
--- a/lib/dns/sec/dst/include/dst/Makefile.in
+++ b/lib/dns/sec/dst/include/dst/Makefile.in
@@ -1,9 +1,9 @@
 # Copyright (C) 1998-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
 # 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
@@ -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.7 2000/07/27 09:50:29 tale Exp $
+# $Id: Makefile.in,v 1.8 2000/08/01 01:27:57 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/dns/sec/dst/include/dst/dst.h b/lib/dns/sec/dst/include/dst/dst.h
index 3acac4c7e6..eab9ce6411 100644
--- a/lib/dns/sec/dst/include/dst/dst.h
+++ b/lib/dns/sec/dst/include/dst/dst.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dst.h,v 1.33 2000/07/31 19:44:21 bwelling Exp $ */
+/* $Id: dst.h,v 1.34 2000/08/01 01:27:58 tale Exp $ */
 
 #ifndef DST_DST_H
 #define DST_DST_H 1
diff --git a/lib/dns/sec/dst/include/dst/lib.h b/lib/dns/sec/dst/include/dst/lib.h
index 20341dfdec..7f7294e392 100644
--- a/lib/dns/sec/dst/include/dst/lib.h
+++ b/lib/dns/sec/dst/include/dst/lib.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lib.h,v 1.4 2000/07/27 09:50:31 tale Exp $ */
+/* $Id: lib.h,v 1.5 2000/08/01 01:27:59 tale Exp $ */
 
 #ifndef DST_LIB_H
 #define DST_LIB_H 1
diff --git a/lib/dns/sec/dst/include/dst/result.h b/lib/dns/sec/dst/include/dst/result.h
index e4f3057d17..5e376f6b2b 100644
--- a/lib/dns/sec/dst/include/dst/result.h
+++ b/lib/dns/sec/dst/include/dst/result.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: result.h,v 1.16 2000/07/27 09:50:32 tale Exp $ */
+/* $Id: result.h,v 1.17 2000/08/01 01:28:00 tale Exp $ */
 
 #ifndef DST_RESULT_H
 #define DST_RESULT_H 1
diff --git a/lib/dns/sec/dst/openssl_link.c b/lib/dns/sec/dst/openssl_link.c
index 13bfe16eb5..4017b33348 100644
--- a/lib/dns/sec/dst/openssl_link.c
+++ b/lib/dns/sec/dst/openssl_link.c
@@ -1,11 +1,11 @@
 /*
  * Portions Copyright (C) 1999, 2000  Internet Software Consortium.
  * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
- * 
+ *
  * 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 AND
  * NETWORK ASSOCIATES DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
  * SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
@@ -19,7 +19,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: openssl_link.c,v 1.32 2000/07/31 19:44:19 bwelling Exp $
+ * $Id: openssl_link.c,v 1.33 2000/08/01 01:27:53 tale Exp $
  */
 #if defined(OPENSSL)
 
@@ -73,7 +73,7 @@ openssldsa_adddata(dst_context_t *dctx, const isc_region_t *data) {
 	isc_sha1_update(sha1ctx, data->base, data->length);
 	return (ISC_R_SUCCESS);
 }
-	
+
 static int
 BN_bn2bin_fixed(BIGNUM *bn, unsigned char *buf, int size) {
 	int bytes = size - BN_num_bytes(bn);
@@ -81,7 +81,7 @@ BN_bn2bin_fixed(BIGNUM *bn, unsigned char *buf, int size) {
 		*buf++ = 0;
 	BN_bn2bin(bn, buf);
 	return (size);
-}	
+}
 
 static isc_result_t
 openssldsa_sign(dst_context_t *dctx, isc_buffer_t *sig) {
@@ -151,7 +151,7 @@ openssldsa_compare(const dst_key_t *key1, const dst_key_t *key2) {
 	dsa1 = (DSA *) key1->opaque;
 	dsa2 = (DSA *) key2->opaque;
 
-	if (dsa1 == NULL && dsa2 == NULL) 
+	if (dsa1 == NULL && dsa2 == NULL)
 		return (ISC_TRUE);
 	else if (dsa1 == NULL || dsa2 == NULL)
 		return (ISC_FALSE);
@@ -364,7 +364,7 @@ openssldsa_tofile(const dst_key_t *key, const char *directory) {
 	return (dst__privstruct_writefile(key, &priv, directory));
 }
 
-static isc_result_t 
+static isc_result_t
 openssldsa_fromfile(dst_key_t *key, const isc_uint16_t id, const char *filename)
 {
 	dst_private_t priv;
diff --git a/lib/dns/sec/dst/openssldh_link.c b/lib/dns/sec/dst/openssldh_link.c
index b71ec55f28..3e5db76f27 100644
--- a/lib/dns/sec/dst/openssldh_link.c
+++ b/lib/dns/sec/dst/openssldh_link.c
@@ -1,11 +1,11 @@
 /*
  * Portions Copyright (C) 1999, 2000  Internet Software Consortium.
  * Portions Copyright (C) 1995-2000 by Network Associates, Inc.
- * 
+ *
  * 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 AND
  * NETWORK ASSOCIATES DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
  * SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
@@ -19,7 +19,7 @@
 
 /*
  * Principal Author: Brian Wellington
- * $Id: openssldh_link.c,v 1.26 2000/07/31 19:44:20 bwelling Exp $
+ * $Id: openssldh_link.c,v 1.27 2000/08/01 01:27:54 tale Exp $
  */
 
 #if defined(OPENSSL)
@@ -85,7 +85,7 @@ openssldh_compare(const dst_key_t *key1, const dst_key_t *key2) {
 	dh1 = (DH *) key1->opaque;
 	dh2 = (DH *) key2->opaque;
 
-	if (dh1 == NULL && dh2 == NULL) 
+	if (dh1 == NULL && dh2 == NULL)
 		return (ISC_TRUE);
 	else if (dh1 == NULL || dh2 == NULL)
 		return (ISC_FALSE);
@@ -114,7 +114,7 @@ openssldh_paramcompare(const dst_key_t *key1, const dst_key_t *key2) {
 	dh1 = (DH *) key1->opaque;
 	dh2 = (DH *) key2->opaque;
 
-	if (dh1 == NULL && dh2 == NULL) 
+	if (dh1 == NULL && dh2 == NULL)
 		return (ISC_TRUE);
 	else if (dh1 == NULL || dh2 == NULL)
 		return (ISC_FALSE);
@@ -419,7 +419,7 @@ openssldh_tofile(const dst_key_t *key, const char *directory) {
 	return (dst__privstruct_writefile(key, &priv, directory));
 }
 
-static isc_result_t 
+static isc_result_t
 openssldh_fromfile(dst_key_t *key, const isc_uint16_t id, const char *filename)
 {
 	dst_private_t priv;
diff --git a/lib/dns/sec/openssl/Makefile.in b/lib/dns/sec/openssl/Makefile.in
index f0176fcfdd..94187be597 100644
--- a/lib/dns/sec/openssl/Makefile.in
+++ b/lib/dns/sec/openssl/Makefile.in
@@ -1,9 +1,9 @@
 # Copyright (C) 1998-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
 # 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
@@ -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.15 2000/07/27 09:50:34 tale Exp $
+# $Id: Makefile.in,v 1.16 2000/08/01 01:28:02 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/dns/sec/openssl/bn_add.c b/lib/dns/sec/openssl/bn_add.c
index 21f1c7ed48..fd967e73da 100644
--- a/lib/dns/sec/openssl/bn_add.c
+++ b/lib/dns/sec/openssl/bn_add.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
diff --git a/lib/dns/sec/openssl/bn_asm.c b/lib/dns/sec/openssl/bn_asm.c
index 7fbb68a53c..01aaea5d27 100644
--- a/lib/dns/sec/openssl/bn_asm.c
+++ b/lib/dns/sec/openssl/bn_asm.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -92,9 +92,9 @@ BN_ULONG bn_mul_add_words(BN_ULONG *rp, BN_ULONG *ap, int num, BN_ULONG w)
 		mul_add(rp[1],ap[1],w,c1); if (--num==0) return c1;
 		mul_add(rp[2],ap[2],w,c1); return c1;
 		}
-	
+
 	return(c1);
-	} 
+	}
 
 BN_ULONG bn_mul_words(BN_ULONG *rp, BN_ULONG *ap, int num, BN_ULONG w)
 	{
@@ -118,7 +118,7 @@ BN_ULONG bn_mul_words(BN_ULONG *rp, BN_ULONG *ap, int num, BN_ULONG w)
 		mul(rp[2],ap[2],w,c1);
 		}
 	return(c1);
-	} 
+	}
 
 void bn_sqr_words(BN_ULONG *r, BN_ULONG *a, int n)
         {
@@ -167,7 +167,7 @@ BN_ULONG bn_mul_add_words(BN_ULONG *rp, BN_ULONG *ap, int num, BN_ULONG w)
 		rp+=4;
 		}
 	return(c);
-	} 
+	}
 
 BN_ULONG bn_mul_words(BN_ULONG *rp, BN_ULONG *ap, int num, BN_ULONG w)
 	{
@@ -194,7 +194,7 @@ BN_ULONG bn_mul_words(BN_ULONG *rp, BN_ULONG *ap, int num, BN_ULONG w)
 		rp+=4;
 		}
 	return(carry);
-	} 
+	}
 
 void bn_sqr_words(BN_ULONG *r, BN_ULONG *a, int n)
         {
diff --git a/lib/dns/sec/openssl/bn_ctx.c b/lib/dns/sec/openssl/bn_ctx.c
index 26b8d9a206..165152aa37 100644
--- a/lib/dns/sec/openssl/bn_ctx.c
+++ b/lib/dns/sec/openssl/bn_ctx.c
@@ -8,7 +8,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
diff --git a/lib/dns/sec/openssl/bn_div.c b/lib/dns/sec/openssl/bn_div.c
index f81adaae5d..adf113dba3 100644
--- a/lib/dns/sec/openssl/bn_div.c
+++ b/lib/dns/sec/openssl/bn_div.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
diff --git a/lib/dns/sec/openssl/bn_err.c b/lib/dns/sec/openssl/bn_err.c
index 47117b1609..4b4da5e661 100644
--- a/lib/dns/sec/openssl/bn_err.c
+++ b/lib/dns/sec/openssl/bn_err.c
@@ -7,7 +7,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
diff --git a/lib/dns/sec/openssl/bn_exp.c b/lib/dns/sec/openssl/bn_exp.c
index 22f10b41c1..a5365df6c2 100644
--- a/lib/dns/sec/openssl/bn_exp.c
+++ b/lib/dns/sec/openssl/bn_exp.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -192,7 +192,7 @@ void atalla_initialize_accelerator_handle(void)
 	{
 	void *dl_handle;
 	int status;
-	unsigned int config_buf[1024]; 
+	unsigned int config_buf[1024];
 	static int tested;
 
 	if(tested)
@@ -237,7 +237,7 @@ void atalla_initialize_accelerator_handle(void)
 			printf("atasi.so library is present but not initialized\n");
 			printf("No HW acceleration available\n");
 			return;
-			}    
+			}
 	        }
 	else
 		{
@@ -245,7 +245,7 @@ void atalla_initialize_accelerator_handle(void)
 		return ;
 	      	}
 
-	/* 
+	/*
 	 * It looks like we have acceleration capabilities.  Load up the
 	 * pointers to our ASI API calls.
 	 */
@@ -469,7 +469,7 @@ int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
 				if (!BN_mod_mul_reciprocal(r,r,r,&recp,ctx))
 					goto err;
 				}
-		
+
 		/* wvalue will be an odd number < 2^window */
 		if (!BN_mod_mul_reciprocal(r,r,&(val[wvalue>>1]),&recp,ctx))
 			goto err;
@@ -618,7 +618,7 @@ int BN_mod_exp_mont(BIGNUM *rr, BIGNUM *a, const BIGNUM *p,
 				if (!BN_mod_mul_montgomery(r,r,r,mont,ctx))
 					goto err;
 				}
-		
+
 		/* wvalue will be an odd number < 2^window */
 		if (!BN_mod_mul_montgomery(r,r,&(val[wvalue>>1]),mont,ctx))
 			goto err;
@@ -731,7 +731,7 @@ int BN_mod_exp_simple(BIGNUM *r, BIGNUM *a, BIGNUM *p, BIGNUM *m,
 				if (!BN_mod_mul(r,r,r,m,ctx))
 					goto err;
 				}
-		
+
 		/* wvalue will be an odd number < 2^window */
 		if (!BN_mod_mul(r,r,&(val[wvalue>>1]),m,ctx))
 			goto err;
diff --git a/lib/dns/sec/openssl/bn_exp2.c b/lib/dns/sec/openssl/bn_exp2.c
index bd296de38f..c28e10dbd6 100644
--- a/lib/dns/sec/openssl/bn_exp2.c
+++ b/lib/dns/sec/openssl/bn_exp2.c
@@ -8,7 +8,7 @@
 /* I've done some timing with different table sizes.
  * The main hassle is that even with bits set at 3, this requires
  * 63 BIGNUMs to store the pre-calculated values.
- *          512   1024 
+ *          512   1024
  * bits=1  75.4%  79.4%
  * bits=2  61.2%  62.4%
  * bits=3  61.3%  59.3%
@@ -173,7 +173,7 @@ int BN_mod_exp2_mont(BIGNUM *rr, BIGNUM *a1, BIGNUM *p1, BIGNUM *a2,
 				if (!BN_mod_mul_montgomery(r,r,r,mont,ctx))
 					goto err;
 				}
-		
+
 		/* wvalue will be an odd number < 2^window */
 		if (xvalue || yvalue)
 			{
diff --git a/lib/dns/sec/openssl/bn_gcd.c b/lib/dns/sec/openssl/bn_gcd.c
index dbc80ae972..72a77541a9 100644
--- a/lib/dns/sec/openssl/bn_gcd.c
+++ b/lib/dns/sec/openssl/bn_gcd.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
diff --git a/lib/dns/sec/openssl/bn_lcl.h b/lib/dns/sec/openssl/bn_lcl.h
index 63f3042213..e883403ac6 100644
--- a/lib/dns/sec/openssl/bn_lcl.h
+++ b/lib/dns/sec/openssl/bn_lcl.h
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
diff --git a/lib/dns/sec/openssl/bn_lib.c b/lib/dns/sec/openssl/bn_lib.c
index a0c0b224ce..d2d4caa62f 100644
--- a/lib/dns/sec/openssl/bn_lib.c
+++ b/lib/dns/sec/openssl/bn_lib.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -231,7 +231,7 @@ int BN_num_bits_word(BN_ULONG l)
 #if defined(SIXTEEN_BIT) || defined(THIRTY_TWO_BIT) || defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG)
 			if (l & 0xff00L)
 				return(bits[(int)(l>>8)]+8);
-			else	
+			else
 #endif
 				return(bits[(int)(l   )]  );
 			}
@@ -322,7 +322,7 @@ BIGNUM *bn_expand2(BIGNUM *b, int words)
 
 	if (words > b->max)
 		{
-		bn_check_top(b);	
+		bn_check_top(b);
 		if (BN_get_flags(b,BN_FLG_STATIC_DATA))
 			{
 			BNerr(BN_F_BN_EXPAND2,BN_R_EXPAND_ON_STATIC_BIGNUM_DATA);
@@ -340,7 +340,7 @@ BIGNUM *bn_expand2(BIGNUM *b, int words)
 		if (B != NULL)
 			{
 #if 0
-			/* This lot is an unrolled loop to copy b->top 
+			/* This lot is an unrolled loop to copy b->top
 			 * BN_ULONGs from B to A
 			 */
 /*
@@ -396,7 +396,7 @@ BIGNUM *bn_expand2(BIGNUM *b, int words)
 				 * a=top&7
 				 * a--;
 				 * goto jump_table[a];
-				 * If top is 0, this makes us jump to 0xffffffc 
+				 * If top is 0, this makes us jump to 0xffffffc
 				 * which is rather bad :-(.
 				 * eric 23-Apr-1998
 				 */
@@ -448,7 +448,7 @@ BIGNUM *bn_expand2(BIGNUM *b, int words)
 			b->d=a;
 			b->max=words;
 #endif
-		
+
 /*		memset(&(p[b->max]),0,((words+1)-b->max)*sizeof(BN_ULONG)); */
 /*	{ int i; for (i=b->max; iri is the size of mont->N in bits (rounded up
 	   to the word size) */
 	al=ri=mont->ri/BN_BITS2;
-	
+
 	nl=n->top;
 	if ((al == 0) || (nl == 0)) { r->top=0; return(1); }
 
@@ -149,7 +149,7 @@ int BN_from_montgomery(BIGNUM *ret, BIGNUM *a, BN_MONT_CTX *mont,
 	for (i=r->top; id[i]=0;
 #else
-	memset(&(r->d[r->top]),0,(max-r->top)*sizeof(BN_ULONG)); 
+	memset(&(r->d[r->top]),0,(max-r->top)*sizeof(BN_ULONG));
 #endif
 
 	r->top=max;
@@ -173,7 +173,7 @@ int BN_from_montgomery(BIGNUM *ret, BIGNUM *a, BN_MONT_CTX *mont,
 			}
 		}
 	bn_fix_top(r);
-	
+
 	/* mont->ri will be a multiple of the word size */
 #if 0
 	BN_rshift(ret,r,mont->ri);
@@ -190,7 +190,7 @@ int BN_from_montgomery(BIGNUM *ret, BIGNUM *a, BN_MONT_CTX *mont,
 	for (i=0; iri);
 
diff --git a/lib/dns/sec/openssl/bn_mul.c b/lib/dns/sec/openssl/bn_mul.c
index 86bebbee8f..6c45bf5935 100644
--- a/lib/dns/sec/openssl/bn_mul.c
+++ b/lib/dns/sec/openssl/bn_mul.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -98,7 +98,7 @@ void bn_mul_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n2,
 	if (n2 == 8)
 		{
 		bn_mul_comba8(r,a,b);
-		return; 
+		return;
 		}
 # endif /* BN_MUL_COMBA */
 	if (n2 < BN_MUL_RECURSIVE_SIZE_NORMAL)
@@ -151,7 +151,7 @@ void bn_mul_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n2,
 			bn_mul_comba4(&(t[n2]),t,&(t[n]));
 		else
 			memset(&(t[n2]),0,8*sizeof(BN_ULONG));
-		
+
 		bn_mul_comba4(r,a,b);
 		bn_mul_comba4(&(r[n2]),&(a[n]),&(b[n]));
 		}
@@ -161,7 +161,7 @@ void bn_mul_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n2,
 			bn_mul_comba8(&(t[n2]),t,&(t[n]));
 		else
 			memset(&(t[n2]),0,16*sizeof(BN_ULONG));
-		
+
 		bn_mul_comba8(r,a,b);
 		bn_mul_comba8(&(r[n2]),&(a[n]),&(b[n]));
 		}
@@ -474,7 +474,7 @@ void bn_mul_high(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, BN_ULONG *l, int n2,
 		bn_sub_words(&(r[n]),&(b[n]),&(b[0]),n);
 		break;
 		}
-		
+
 	oneg=neg;
 	/* t[10] = (a[0]-a[1])*(b[1]-b[0]) */
 	/* r[10] = (a[1]*b[1]) */
@@ -563,7 +563,7 @@ void bn_mul_high(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, BN_ULONG *l, int n2,
 		c2-=(int)(bn_sub_words(&(r[0]),&(r[0]),&(t[n]),n));
 	else
 		c2+=(int)(bn_add_words(&(r[0]),&(r[0]),&(t[n]),n));
-	
+
 	if (c1 != 0) /* Add starting at r[0], could be +ve or -ve */
 		{
 		i=0;
diff --git a/lib/dns/sec/openssl/bn_prime.c b/lib/dns/sec/openssl/bn_prime.c
index bbb1439d03..89e8e35457 100644
--- a/lib/dns/sec/openssl/bn_prime.c
+++ b/lib/dns/sec/openssl/bn_prime.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -63,7 +63,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -151,7 +151,7 @@ BIGNUM *BN_generate_prime(BIGNUM *ret, int bits, int safe, BIGNUM *add,
 	else
 		rnd=ret;
 	BN_init(&t);
-loop: 
+loop:
 	/* make a random number and set the top and bottom bits */
 	if (add == NULL)
 		{
@@ -237,7 +237,7 @@ int BN_is_prime_fasttest(const BIGNUM *a, int checks,
 	if (do_trial_division)
 		{
 		for (i = 1; i < NUMPRIMES; i++)
-			if (BN_mod_word(a, primes[i]) == 0) 
+			if (BN_mod_word(a, primes[i]) == 0)
 				return 0;
 		if (callback != NULL) callback(1, -1, cb_arg);
 		}
@@ -289,7 +289,7 @@ int BN_is_prime_fasttest(const BIGNUM *a, int checks,
 		goto err;
 	if (!BN_MONT_CTX_set(mont, A, ctx))
 		goto err;
-	
+
 	for (i = 0; i < checks; i++)
 		{
 		if (!BN_pseudo_rand(check, BN_num_bits(A1), 0, 0))
@@ -430,7 +430,7 @@ static int probable_prime_dh_safe(BIGNUM *p, int bits, BIGNUM *padd,
 	if (qadd == NULL) goto err;
 
 	if (!BN_rshift1(qadd,padd)) goto err;
-		
+
 	if (!BN_rand(q,bits,0,1)) goto err;
 
 	/* we need ((rnd-rem) % add) == 0 */
diff --git a/lib/dns/sec/openssl/bn_prime.h b/lib/dns/sec/openssl/bn_prime.h
index d63e3daca0..d0033e5a40 100644
--- a/lib/dns/sec/openssl/bn_prime.h
+++ b/lib/dns/sec/openssl/bn_prime.h
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
diff --git a/lib/dns/sec/openssl/bn_print.c b/lib/dns/sec/openssl/bn_print.c
index 0527f88672..e343deea9a 100644
--- a/lib/dns/sec/openssl/bn_print.c
+++ b/lib/dns/sec/openssl/bn_print.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
diff --git a/lib/dns/sec/openssl/bn_rand.c b/lib/dns/sec/openssl/bn_rand.c
index 08f6b68ff0..6ee0916421 100644
--- a/lib/dns/sec/openssl/bn_rand.c
+++ b/lib/dns/sec/openssl/bn_rand.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
diff --git a/lib/dns/sec/openssl/bn_recp.c b/lib/dns/sec/openssl/bn_recp.c
index 6f8202f979..1706be08e5 100644
--- a/lib/dns/sec/openssl/bn_recp.c
+++ b/lib/dns/sec/openssl/bn_recp.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -199,7 +199,7 @@ int BN_div_recp(BIGNUM *dv, BIGNUM *rem, BIGNUM *m, BN_RECP_CTX *recp,
 err:
 	BN_CTX_end(ctx);
 	return(ret);
-	} 
+	}
 
 /* len is the expected size of the result
  * We actually calculate with an extra word of precision, so
diff --git a/lib/dns/sec/openssl/bn_shift.c b/lib/dns/sec/openssl/bn_shift.c
index 3ea3f1c395..f15f2bd8c6 100644
--- a/lib/dns/sec/openssl/bn_shift.c
+++ b/lib/dns/sec/openssl/bn_shift.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
diff --git a/lib/dns/sec/openssl/bn_sqr.c b/lib/dns/sec/openssl/bn_sqr.c
index daaa548f6f..546f13c7be 100644
--- a/lib/dns/sec/openssl/bn_sqr.c
+++ b/lib/dns/sec/openssl/bn_sqr.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -110,7 +110,7 @@ printf("BN_sqr %d * %d\n",a->top,a->top);
 		bn_sqr_comba8(rr->d,a->d);
 #endif
 		}
-	else 
+	else
 		{
 #if defined(BN_RECURSION)
 		if (al < BN_SQR_RECURSIVE_SIZE_NORMAL)
diff --git a/lib/dns/sec/openssl/bn_word.c b/lib/dns/sec/openssl/bn_word.c
index 51d718e1fa..1ba1aca4b9 100644
--- a/lib/dns/sec/openssl/bn_word.c
+++ b/lib/dns/sec/openssl/bn_word.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -97,7 +97,7 @@ BN_ULONG BN_div_word(BIGNUM *a, BN_ULONG w)
 	for (i=a->top-1; i>=0; i--)
 		{
 		BN_ULONG l,d;
-		
+
 		l=a->d[i];
 		d=bn_div_words(ret,l,w);
 		ret=(l-((d*w)&BN_MASK2))&BN_MASK2;
diff --git a/lib/dns/sec/openssl/buffer.c b/lib/dns/sec/openssl/buffer.c
index acbf48b7f2..2fe9f76179 100644
--- a/lib/dns/sec/openssl/buffer.c
+++ b/lib/dns/sec/openssl/buffer.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -136,7 +136,7 @@ char *BUF_strdup(const char *str)
 
 	n=strlen(str);
 	ret=Malloc(n+1);
-	if (ret == NULL) 
+	if (ret == NULL)
 		{
 		BUFerr(BUF_F_BUF_STRDUP,ERR_R_MALLOC_FAILURE);
 		return(NULL);
diff --git a/lib/dns/sec/openssl/cryptlib.c b/lib/dns/sec/openssl/cryptlib.c
index c450c7e131..7b93025cf2 100644
--- a/lib/dns/sec/openssl/cryptlib.c
+++ b/lib/dns/sec/openssl/cryptlib.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
diff --git a/lib/dns/sec/openssl/cryptlib.h b/lib/dns/sec/openssl/cryptlib.h
index de6c17b9bf..33be64edc6 100644
--- a/lib/dns/sec/openssl/cryptlib.h
+++ b/lib/dns/sec/openssl/cryptlib.h
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -69,8 +69,8 @@ extern "C" {
 #include "openssl/e_os.h"
 
 #include 
-#include  
-#include  
+#include 
+#include 
 #include 
 #include 
 
diff --git a/lib/dns/sec/openssl/dh_err.c b/lib/dns/sec/openssl/dh_err.c
index b13e356200..6eca42b868 100644
--- a/lib/dns/sec/openssl/dh_err.c
+++ b/lib/dns/sec/openssl/dh_err.c
@@ -7,7 +7,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
diff --git a/lib/dns/sec/openssl/dh_gen.c b/lib/dns/sec/openssl/dh_gen.c
index 7aff041fb9..bf2dec1f1e 100644
--- a/lib/dns/sec/openssl/dh_gen.c
+++ b/lib/dns/sec/openssl/dh_gen.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -102,7 +102,7 @@ DH *DH_generate_parameters(int prime_len, int generator,
 	t1 = BN_CTX_get(ctx);
 	t2 = BN_CTX_get(ctx);
 	if (t1 == NULL || t2 == NULL) goto err;
-	
+
 	if (generator == DH_GENERATOR_2)
 		{
 		BN_set_word(t1,24);
@@ -127,7 +127,7 @@ DH *DH_generate_parameters(int prime_len, int generator,
 		}
 	else
 		g=generator;
-	
+
 	p=BN_generate_prime(NULL,prime_len,1,t1,t2,callback,cb_arg);
 	if (p == NULL) goto err;
 	if (callback != NULL) callback(3,0,cb_arg);
diff --git a/lib/dns/sec/openssl/dh_key.c b/lib/dns/sec/openssl/dh_key.c
index cf22050110..cf93c0af13 100644
--- a/lib/dns/sec/openssl/dh_key.c
+++ b/lib/dns/sec/openssl/dh_key.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -142,7 +142,7 @@ static int generate_key(DH *dh)
 
 	if (!dh->meth->bn_mod_exp(dh, pub_key,dh->g,priv_key,dh->p,&ctx,mont))
 								goto err;
-		
+
 	dh->pub_key=pub_key;
 	dh->priv_key=priv_key;
 	ok=1;
@@ -166,7 +166,7 @@ static int compute_key(unsigned char *key, BIGNUM *pub_key, DH *dh)
 	BN_CTX_init(&ctx);
 	BN_CTX_start(&ctx);
 	tmp = BN_CTX_get(&ctx);
-	
+
 	if (dh->priv_key == NULL)
 		{
 		DHerr(DH_F_DH_COMPUTE_KEY,DH_R_NO_PRIVATE_VALUE);
diff --git a/lib/dns/sec/openssl/dh_lib.c b/lib/dns/sec/openssl/dh_lib.c
index cc6fe21008..4a7bd22f9c 100644
--- a/lib/dns/sec/openssl/dh_lib.c
+++ b/lib/dns/sec/openssl/dh_lib.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
diff --git a/lib/dns/sec/openssl/dsa_err.c b/lib/dns/sec/openssl/dsa_err.c
index 06e233caa1..789eb9a21a 100644
--- a/lib/dns/sec/openssl/dsa_err.c
+++ b/lib/dns/sec/openssl/dsa_err.c
@@ -7,7 +7,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
diff --git a/lib/dns/sec/openssl/dsa_gen.c b/lib/dns/sec/openssl/dsa_gen.c
index 4de242f88b..bd92355726 100644
--- a/lib/dns/sec/openssl/dsa_gen.c
+++ b/lib/dns/sec/openssl/dsa_gen.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -67,7 +67,7 @@
  * also Appendix 2.2 of FIPS PUB 186-1 (i.e. use SHA as defined in
  * FIPS PUB 180-1) */
 #define HASH    SHA1
-#endif 
+#endif
 
 #ifndef NO_SHA
 
@@ -106,7 +106,7 @@ DSA *DSA_generate_parameters(int bits, unsigned char *seed_in, int seed_len,
 
 	if (seed_len < 20)
 		seed_in = NULL; /* seed buffer too small -- ignore */
-	if (seed_len > 20) 
+	if (seed_len > 20)
 		seed_len = 20; /* App. 2.2 of FIPS PUB 186 allows larger SEED,
 		                * but our internal buffers are restricted to 160 bits*/
 	if ((seed_in != NULL) && (seed_len == 20))
diff --git a/lib/dns/sec/openssl/dsa_key.c b/lib/dns/sec/openssl/dsa_key.c
index 1a247fb1eb..ebc351cd5b 100644
--- a/lib/dns/sec/openssl/dsa_key.c
+++ b/lib/dns/sec/openssl/dsa_key.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
diff --git a/lib/dns/sec/openssl/dsa_lib.c b/lib/dns/sec/openssl/dsa_lib.c
index dea1f7bffb..0b083afdbe 100644
--- a/lib/dns/sec/openssl/dsa_lib.c
+++ b/lib/dns/sec/openssl/dsa_lib.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -136,7 +136,7 @@ DSA *DSA_new_method(DSA_METHOD *meth)
 		}
 	else
 		CRYPTO_new_ex_data(dsa_meth,ret,&ret->ex_data);
-	
+
 	return(ret);
 	}
 
@@ -186,7 +186,7 @@ int DSA_size(DSA *r)
 	bs.data=buf;
 	bs.type=V_ASN1_INTEGER;
 	/* If the top bit is set the asn1 encoding is 1 larger. */
-	buf[0]=0xff;	
+	buf[0]=0xff;
 
 	i=i2d_ASN1_INTEGER(&bs,NULL);
 	i+=i; /* r and s */
@@ -220,7 +220,7 @@ DH *DSA_dup_DH(DSA *r)
 	{
 	/* DSA has p, q, g, optional pub_key, optional priv_key.
 	 * DH has p, optional length, g, optional pub_key, optional priv_key.
-	 */ 
+	 */
 
 	DH *ret = NULL;
 
@@ -229,7 +229,7 @@ DH *DSA_dup_DH(DSA *r)
 	ret = DH_new();
 	if (ret == NULL)
 		goto err;
-	if (r->p != NULL) 
+	if (r->p != NULL)
 		if ((ret->p = BN_dup(r->p)) == NULL)
 			goto err;
 	if (r->q != NULL)
diff --git a/lib/dns/sec/openssl/dsa_ossl.c b/lib/dns/sec/openssl/dsa_ossl.c
index 25dc0d3526..7d98f816e7 100644
--- a/lib/dns/sec/openssl/dsa_ossl.c
+++ b/lib/dns/sec/openssl/dsa_ossl.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -148,7 +148,7 @@ static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)
 	if (ret == NULL) goto err;
 	ret->r = r;
 	ret->s = s;
-	
+
 err:
 	if (!ret)
 		{
@@ -316,7 +316,7 @@ static int dsa_mod_exp(DSA *dsa, BIGNUM *rr, BIGNUM *a1, BIGNUM *p1,
 	dsa = dsa; /* BEW - quiet the compiler */
 	return BN_mod_exp2_mont(rr, a1, p1, a2, p2, m, ctx, in_mont);
 }
-	
+
 static int dsa_bn_mod_exp(DSA *dsa, BIGNUM *r, BIGNUM *a, const BIGNUM *p,
 				const BIGNUM *m, BN_CTX *ctx,
 				BN_MONT_CTX *m_ctx)
diff --git a/lib/dns/sec/openssl/dsa_sign.c b/lib/dns/sec/openssl/dsa_sign.c
index bef95bb370..23f40025c4 100644
--- a/lib/dns/sec/openssl/dsa_sign.c
+++ b/lib/dns/sec/openssl/dsa_sign.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
diff --git a/lib/dns/sec/openssl/dsa_vrf.c b/lib/dns/sec/openssl/dsa_vrf.c
index 2cbaaf7ac1..a3e71669e9 100644
--- a/lib/dns/sec/openssl/dsa_vrf.c
+++ b/lib/dns/sec/openssl/dsa_vrf.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
diff --git a/lib/dns/sec/openssl/err.c b/lib/dns/sec/openssl/err.c
index da67f60c7c..a91b386845 100644
--- a/lib/dns/sec/openssl/err.c
+++ b/lib/dns/sec/openssl/err.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -113,7 +113,7 @@ static ERR_STRING_DATA ERR_str_functs[]=
 	{ERR_PACK(0,SYS_F_FOPEN,0),     	"fopen"},
 	{ERR_PACK(0,SYS_F_CONNECT,0),		"connect"},
 	{ERR_PACK(0,SYS_F_GETSERVBYNAME,0),	"getservbyname"},
-	{ERR_PACK(0,SYS_F_SOCKET,0),		"socket"}, 
+	{ERR_PACK(0,SYS_F_SOCKET,0),		"socket"},
 	{ERR_PACK(0,SYS_F_IOCTLSOCKET,0),	"ioctlsocket"},
 	{ERR_PACK(0,SYS_F_BIND,0),		"bind"},
 	{ERR_PACK(0,SYS_F_LISTEN,0),		"listen"},
@@ -378,7 +378,7 @@ unsigned long ERR_peek_error_line_data(const char **file, int *line,
 
 static unsigned long get_error_values(int inc, const char **file, int *line,
 	     const char **data, int *flags)
-	{	
+	{
 	int i=0;
 	ERR_STATE *es;
 	unsigned long ret;
diff --git a/lib/dns/sec/openssl/ex_data.c b/lib/dns/sec/openssl/ex_data.c
index 0d782d6c9d..f62e3d6dd3 100644
--- a/lib/dns/sec/openssl/ex_data.c
+++ b/lib/dns/sec/openssl/ex_data.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
diff --git a/lib/dns/sec/openssl/include/Makefile.in b/lib/dns/sec/openssl/include/Makefile.in
index 022602a517..80579712fd 100644
--- a/lib/dns/sec/openssl/include/Makefile.in
+++ b/lib/dns/sec/openssl/include/Makefile.in
@@ -1,9 +1,9 @@
 # Copyright (C) 1998-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
 # 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
@@ -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.6 2000/07/27 09:50:35 tale Exp $
+# $Id: Makefile.in,v 1.7 2000/08/01 01:28:55 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/dns/sec/openssl/include/openssl/Makefile.in b/lib/dns/sec/openssl/include/openssl/Makefile.in
index e34a2cf5e3..85b85da3d9 100644
--- a/lib/dns/sec/openssl/include/openssl/Makefile.in
+++ b/lib/dns/sec/openssl/include/openssl/Makefile.in
@@ -1,9 +1,9 @@
 # Copyright (C) 1998-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
 # 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
@@ -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.8 2000/07/27 09:50:36 tale Exp $
+# $Id: Makefile.in,v 1.9 2000/08/01 01:28:56 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/dns/sec/openssl/include/openssl/bio.h b/lib/dns/sec/openssl/include/openssl/bio.h
index 23d702530f..f087a51d3d 100644
--- a/lib/dns/sec/openssl/include/openssl/bio.h
+++ b/lib/dns/sec/openssl/include/openssl/bio.h
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -170,7 +170,7 @@ extern "C" {
 
 /* The next two are used in conjunction with the
  * BIO_should_io_special() condition.  After this returns true,
- * BIO *BIO_get_retry_BIO(BIO *bio, int *reason); will walk the BIO 
+ * BIO *BIO_get_retry_BIO(BIO *bio, int *reason); will walk the BIO
  * stack and return the 'reason' for the special and the offending BIO.
  * Given a BIO, BIO_get_retry_reason(bio) will return the code. */
 /* Returned from the SSL bio when the certificate retrieval code had an error */
diff --git a/lib/dns/sec/openssl/include/openssl/bn.h b/lib/dns/sec/openssl/include/openssl/bn.h
index d875fe5f92..befd6ebf23 100644
--- a/lib/dns/sec/openssl/include/openssl/bn.h
+++ b/lib/dns/sec/openssl/include/openssl/bn.h
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
diff --git a/lib/dns/sec/openssl/include/openssl/buffer.h b/lib/dns/sec/openssl/include/openssl/buffer.h
index 247c8ee62e..2fae870fc8 100644
--- a/lib/dns/sec/openssl/include/openssl/buffer.h
+++ b/lib/dns/sec/openssl/include/openssl/buffer.h
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
diff --git a/lib/dns/sec/openssl/include/openssl/crypto.h b/lib/dns/sec/openssl/include/openssl/crypto.h
index 2a69c5ab4b..53cfa6741f 100644
--- a/lib/dns/sec/openssl/include/openssl/crypto.h
+++ b/lib/dns/sec/openssl/include/openssl/crypto.h
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -184,7 +184,7 @@ typedef int CRYPTO_EX_new(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
 typedef void CRYPTO_EX_free(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
 					int idx, long argl, void *argp);
 /* Called when we need to dup an object */
-typedef int CRYPTO_EX_dup(CRYPTO_EX_DATA *to, CRYPTO_EX_DATA *from, void *from_d, 
+typedef int CRYPTO_EX_dup(CRYPTO_EX_DATA *to, CRYPTO_EX_DATA *from, void *from_d,
 					int idx, long argl, void *argp);
 
 /* This stuff is basically class callback functions
diff --git a/lib/dns/sec/openssl/include/openssl/dh.h b/lib/dns/sec/openssl/include/openssl/dh.h
index c164c14989..7982a13e5c 100644
--- a/lib/dns/sec/openssl/include/openssl/dh.h
+++ b/lib/dns/sec/openssl/include/openssl/dh.h
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -69,7 +69,7 @@ extern "C" {
 
 #include 
 #include 
-	
+
 #define DH_FLAG_CACHE_MONT_P	0x01
 
 typedef struct dh_st DH;
diff --git a/lib/dns/sec/openssl/include/openssl/dsa.h b/lib/dns/sec/openssl/include/openssl/dsa.h
index 243775f4f8..6b8a78ce1f 100644
--- a/lib/dns/sec/openssl/include/openssl/dsa.h
+++ b/lib/dns/sec/openssl/include/openssl/dsa.h
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
diff --git a/lib/dns/sec/openssl/include/openssl/e_os.h b/lib/dns/sec/openssl/include/openssl/e_os.h
index 1a3e49d149..9a15144f4a 100644
--- a/lib/dns/sec/openssl/include/openssl/e_os.h
+++ b/lib/dns/sec/openssl/include/openssl/e_os.h
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -199,7 +199,7 @@ extern "C" {
 #  endif
 
 #  ifdef VMS
-  /* some programs don't include stdlib, so exit() and others give implicit 
+  /* some programs don't include stdlib, so exit() and others give implicit
      function warnings */
 #    include 
 #    if defined(__DECC)
@@ -359,7 +359,7 @@ extern HINSTANCE _hInstance;
 #define MD2_DIGEST_LENGTH 16
 #endif
 #ifdef NO_MD5
-#define MD5_Init MD5Init 
+#define MD5_Init MD5Init
 #define MD5_Update MD5Update
 #define MD5_Final MD5Final
 #define MD5_DIGEST_LENGTH 16
diff --git a/lib/dns/sec/openssl/include/openssl/err.h b/lib/dns/sec/openssl/include/openssl/err.h
index 8c5e1ce314..3dff1b0589 100644
--- a/lib/dns/sec/openssl/include/openssl/err.h
+++ b/lib/dns/sec/openssl/include/openssl/err.h
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -185,7 +185,7 @@ typedef struct err_state_st
 #define SYS_F_WSASTARTUP	9 /* Winsock stuff */
 #define SYS_F_OPENDIR		10
 
-#define ERR_R_FATAL		32	
+#define ERR_R_FATAL		32
 /* reasons */
 #define ERR_R_SYS_LIB	ERR_LIB_SYS
 #define ERR_R_BN_LIB	ERR_LIB_BN
diff --git a/lib/dns/sec/openssl/include/openssl/lhash.h b/lib/dns/sec/openssl/include/openssl/lhash.h
index 8c52bb9376..117bc207c3 100644
--- a/lib/dns/sec/openssl/include/openssl/lhash.h
+++ b/lib/dns/sec/openssl/include/openssl/lhash.h
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
diff --git a/lib/dns/sec/openssl/include/openssl/rand.h b/lib/dns/sec/openssl/include/openssl/rand.h
index 20ff757c9d..93bff6261f 100644
--- a/lib/dns/sec/openssl/include/openssl/rand.h
+++ b/lib/dns/sec/openssl/include/openssl/rand.h
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
diff --git a/lib/dns/sec/openssl/include/openssl/safestack.h b/lib/dns/sec/openssl/include/openssl/safestack.h
index 4e6aa15c75..ea4f0c5c11 100644
--- a/lib/dns/sec/openssl/include/openssl/safestack.h
+++ b/lib/dns/sec/openssl/include/openssl/safestack.h
@@ -6,7 +6,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
diff --git a/lib/dns/sec/openssl/include/openssl/sha.h b/lib/dns/sec/openssl/include/openssl/sha.h
index 9113e53e37..11985f788e 100644
--- a/lib/dns/sec/openssl/include/openssl/sha.h
+++ b/lib/dns/sec/openssl/include/openssl/sha.h
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
diff --git a/lib/dns/sec/openssl/include/openssl/stack.h b/lib/dns/sec/openssl/include/openssl/stack.h
index 9779b4557d..04390a730c 100644
--- a/lib/dns/sec/openssl/include/openssl/stack.h
+++ b/lib/dns/sec/openssl/include/openssl/stack.h
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
diff --git a/lib/dns/sec/openssl/lhash.c b/lib/dns/sec/openssl/lhash.c
index 252b59310c..70482d2a78 100644
--- a/lib/dns/sec/openssl/lhash.c
+++ b/lib/dns/sec/openssl/lhash.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -106,7 +106,7 @@
 
 const char *lh_version="lhash" OPENSSL_VERSION_PTEXT;
 
-#undef MIN_NODES 
+#undef MIN_NODES
 #define MIN_NODES	16
 #define UP_LOAD		(2*LH_LOAD_MULT) /* load times 256  (default 2) */
 #define DOWN_LOAD	(LH_LOAD_MULT)   /* load times 256  (default 1) */
@@ -310,7 +310,7 @@ static void expand(LHASH *lh)
 	n2= &(lh->b[p+(int)lh->pmax]);
 	*n2=NULL;        /* 27/07/92 - eay - undefined pointer bug */
 	nni=lh->num_alloc_nodes;
-	
+
 	for (np= *n1; np != NULL; )
 		{
 #ifndef NO_HASH_COMP
@@ -442,7 +442,7 @@ unsigned long lh_strhash(const char *c)
 /*
 	unsigned char b[16];
 	MD5(c,strlen(c),b);
-	return(b[0]|(b[1]<<8)|(b[2]<<16)|(b[3]<<24)); 
+	return(b[0]|(b[1]<<8)|(b[2]<<16)|(b[3]<<24));
 */
 
 	n=0x100;
diff --git a/lib/dns/sec/openssl/md32_common.h b/lib/dns/sec/openssl/md32_common.h
index 300ba43f39..765dc7f22e 100644
--- a/lib/dns/sec/openssl/md32_common.h
+++ b/lib/dns/sec/openssl/md32_common.h
@@ -7,7 +7,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
diff --git a/lib/dns/sec/openssl/md5_locl.h b/lib/dns/sec/openssl/md5_locl.h
index 40c2c8196b..73784ae15c 100644
--- a/lib/dns/sec/openssl/md5_locl.h
+++ b/lib/dns/sec/openssl/md5_locl.h
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
diff --git a/lib/dns/sec/openssl/mem.c b/lib/dns/sec/openssl/mem.c
index 057b18d291..6cd7e2840a 100644
--- a/lib/dns/sec/openssl/mem.c
+++ b/lib/dns/sec/openssl/mem.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
diff --git a/lib/dns/sec/openssl/mem_dbg.c b/lib/dns/sec/openssl/mem_dbg.c
index 15783c4e4e..6e6051655d 100644
--- a/lib/dns/sec/openssl/mem_dbg.c
+++ b/lib/dns/sec/openssl/mem_dbg.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -61,7 +61,7 @@
 
 #include 
 #include 
-#include 	
+#include 
 #include 
 #include 
 #include 
@@ -95,7 +95,7 @@ typedef struct app_mem_info_st
  *   CRYPTO_pop_info()           to pop an entry,
  *   CRYPTO_remove_all_info()    to pop all entries.
  */
-	{	
+	{
 	unsigned long thread;
 	const char *file;
 	int line;
@@ -209,7 +209,7 @@ int CRYPTO_is_mem_check_on(void)
 		CRYPTO_w_unlock(CRYPTO_LOCK_MALLOC);
 		}
 	return(ret);
-	}	
+	}
 
 
 void CRYPTO_dbg_set_options(long bits)
@@ -569,7 +569,7 @@ static void print_leak(MEM *m, MEM_LEAK *l)
 	if (options & V_CRYPTO_MDEBUG_TIME)
 		{
 		lcl = localtime(&m->time);
-	
+
 		sprintf(bufp, "[%02d:%02d:%02d] ",
 			lcl->tm_hour,lcl->tm_min,lcl->tm_sec);
 		bufp += strlen(bufp);
@@ -590,7 +590,7 @@ static void print_leak(MEM *m, MEM_LEAK *l)
 	bufp += strlen(bufp);
 
 	BIO_puts(l->bio,buf);
-	
+
 	l->chunks++;
 	l->bytes+=m->num;
 
@@ -599,7 +599,7 @@ static void print_leak(MEM *m, MEM_LEAK *l)
 	if (!amip)
 		return;
 	ti=amip->thread;
-	
+
 	do
 		{
 		int buf_len;
@@ -623,13 +623,13 @@ static void print_leak(MEM *m, MEM_LEAK *l)
 			buf_len = strlen(buf);
 			}
 		sprintf(buf + buf_len, "\"\n");
-		
+
 		BIO_puts(l->bio,buf);
 
 		amip = amip->next;
 		}
 	while(amip && amip->thread == ti);
-		
+
 #ifdef LEVITTE_DEBUG
 	if (amip)
 		{
@@ -683,7 +683,7 @@ void CRYPTO_mem_leaks(BIO *b)
 			}
 		if (amih != NULL)
 			{
-			if (lh_num_items(amih) == 0) 
+			if (lh_num_items(amih) == 0)
 				{
 				lh_free(amih);
 				amih = NULL;
diff --git a/lib/dns/sec/openssl/rand_lib.c b/lib/dns/sec/openssl/rand_lib.c
index 5faf841f75..7ec917e622 100644
--- a/lib/dns/sec/openssl/rand_lib.c
+++ b/lib/dns/sec/openssl/rand_lib.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
diff --git a/lib/dns/sec/openssl/sha1_one.c b/lib/dns/sec/openssl/sha1_one.c
index 63de73c8ee..1c8a57b79f 100644
--- a/lib/dns/sec/openssl/sha1_one.c
+++ b/lib/dns/sec/openssl/sha1_one.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
diff --git a/lib/dns/sec/openssl/sha1dgst.c b/lib/dns/sec/openssl/sha1dgst.c
index c35159b473..5aae10a3c4 100644
--- a/lib/dns/sec/openssl/sha1dgst.c
+++ b/lib/dns/sec/openssl/sha1dgst.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
diff --git a/lib/dns/sec/openssl/sha_locl.h b/lib/dns/sec/openssl/sha_locl.h
index ecbe65e8d2..df3fe4df0b 100644
--- a/lib/dns/sec/openssl/sha_locl.h
+++ b/lib/dns/sec/openssl/sha_locl.h
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -164,9 +164,9 @@ void HASH_INIT (SHA_CTX *c)
  * I've just become aware of another tweak to be made, again from Wei Dai,
  * in F_40_59, (x&a)|(y&a) -> (x|y)&a
  */
-#define	F_00_19(b,c,d)	((((c) ^ (d)) & (b)) ^ (d)) 
+#define	F_00_19(b,c,d)	((((c) ^ (d)) & (b)) ^ (d))
 #define	F_20_39(b,c,d)	((b) ^ (c) ^ (d))
-#define F_40_59(b,c,d)	(((b) & (c)) | (((b)|(c)) & (d))) 
+#define F_40_59(b,c,d)	(((b) & (c)) | (((b)|(c)) & (d)))
 #define	F_60_79(b,c,d)	F_20_39(b,c,d)
 
 #define BODY_00_15(i,a,b,c,d,e,f,xi) \
@@ -326,8 +326,8 @@ void HASH_BLOCK_HOST_ORDER (SHA_CTX *c, const void *d, int num)
 	BODY_60_79(77,B,C,D,E,T,A,X(13),X(15),X( 5),X(10));
 	BODY_60_79(78,A,B,C,D,E,T,X(14),X( 0),X( 6),X(11));
 	BODY_60_79(79,T,A,B,C,D,E,X(15),X( 1),X( 7),X(12));
-	
-	c->h0=(c->h0+E)&0xffffffffL; 
+
+	c->h0=(c->h0+E)&0xffffffffL;
 	c->h1=(c->h1+T)&0xffffffffL;
 	c->h2=(c->h2+A)&0xffffffffL;
 	c->h3=(c->h3+B)&0xffffffffL;
@@ -453,8 +453,8 @@ void HASH_BLOCK_DATA_ORDER (SHA_CTX *c, const void *p, int num)
 	BODY_60_79(77,B,C,D,E,T,A,X(13),X(15),X( 5),X(10));
 	BODY_60_79(78,A,B,C,D,E,T,X(14),X( 0),X( 6),X(11));
 	BODY_60_79(79,T,A,B,C,D,E,X(15),X( 1),X( 7),X(12));
-	
-	c->h0=(c->h0+E)&0xffffffffL; 
+
+	c->h0=(c->h0+E)&0xffffffffL;
 	c->h1=(c->h1+T)&0xffffffffL;
 	c->h2=(c->h2+A)&0xffffffffL;
 	c->h3=(c->h3+B)&0xffffffffL;
diff --git a/lib/dns/sec/openssl/stack.c b/lib/dns/sec/openssl/stack.c
index e414f4d49c..ccc59aca23 100644
--- a/lib/dns/sec/openssl/stack.c
+++ b/lib/dns/sec/openssl/stack.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -159,7 +159,7 @@ int sk_insert(STACK *st, char *data, int loc)
 		t=(char **)&(st->data[1]);
 		for (i=st->num; i>=loc; i--)
 			t[i]=f[i];
-			
+
 #ifdef undef /* no memmove on sunos :-( */
 		memmove( (char *)&(st->data[loc+1]),
 			(char *)&(st->data[loc]),
diff --git a/lib/dns/sec/openssl/th-lock.c b/lib/dns/sec/openssl/th-lock.c
index e1b26d3ed1..124907c2d4 100644
--- a/lib/dns/sec/openssl/th-lock.c
+++ b/lib/dns/sec/openssl/th-lock.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
diff --git a/lib/dns/sec/rename.h b/lib/dns/sec/rename.h
index b4ddc84648..78eca83de3 100644
--- a/lib/dns/sec/rename.h
+++ b/lib/dns/sec/rename.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rename.h,v 1.9 2000/07/27 09:50:22 tale Exp $ */
+/* $Id: rename.h,v 1.10 2000/08/01 01:26:39 tale Exp $ */
 
 #ifndef SEC_RENAME_H
 #define SEC_RENAME_H 1
diff --git a/lib/dns/ssu.c b/lib/dns/ssu.c
index 9c39345108..143512c69b 100644
--- a/lib/dns/ssu.c
+++ b/lib/dns/ssu.c
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: ssu.c,v 1.12 2000/07/27 09:46:37 tale Exp $
+ * $Id: ssu.c,v 1.13 2000/08/01 01:22:55 tale Exp $
  * Principal Author: Brian Wellington
  */
 
@@ -281,7 +281,7 @@ dns_ssutable_checkrules(dns_ssutable_t *table, dns_name_t *signer,
 		else if (rule->matchtype == DNS_SSUMATCHTYPE_WILDCARD) {
 			if (!dns_name_matcheswildcard(name, rule->name))
 				continue;
-			
+
 		}
 		else if (rule->matchtype == DNS_SSUMATCHTYPE_SELF) {
 			if (!dns_name_equal(signer, name))
diff --git a/lib/dns/tcpmsg.c b/lib/dns/tcpmsg.c
index 2a63eca130..89fe5fe25f 100644
--- a/lib/dns/tcpmsg.c
+++ b/lib/dns/tcpmsg.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tcpmsg.c,v 1.21 2000/07/27 09:46:38 tale Exp $ */
+/* $Id: tcpmsg.c,v 1.22 2000/08/01 01:22:56 tale Exp $ */
 
 #include 
 
diff --git a/lib/dns/time.c b/lib/dns/time.c
index ca50be4c14..3b887f4aae 100644
--- a/lib/dns/time.c
+++ b/lib/dns/time.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: time.c,v 1.15 2000/07/27 09:46:39 tale Exp $ */
+/* $Id: time.c,v 1.16 2000/08/01 01:22:57 tale Exp $ */
 
 #include 
 
diff --git a/lib/dns/tkey.c b/lib/dns/tkey.c
index 6cc53b5a30..e3afba4e01 100644
--- a/lib/dns/tkey.c
+++ b/lib/dns/tkey.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: tkey.c,v 1.48 2000/07/27 09:46:41 tale Exp $
+ * $Id: tkey.c,v 1.49 2000/08/01 01:22:58 tale Exp $
  * Principal Author: Brian Wellington
  */
 
diff --git a/lib/dns/tkeyconf.c b/lib/dns/tkeyconf.c
index d85610072c..36600c9518 100644
--- a/lib/dns/tkeyconf.c
+++ b/lib/dns/tkeyconf.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tkeyconf.c,v 1.12 2000/07/27 09:46:42 tale Exp $ */
+/* $Id: tkeyconf.c,v 1.13 2000/08/01 01:22:59 tale Exp $ */
 
 #include 
 
diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c
index 276a5ca63f..d384db7d5b 100644
--- a/lib/dns/tsig.c
+++ b/lib/dns/tsig.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: tsig.c,v 1.81 2000/07/31 21:07:11 tale Exp $
+ * $Id: tsig.c,v 1.82 2000/08/01 01:23:00 tale Exp $
  * Principal Author: Brian Wellington
  */
 
@@ -167,7 +167,7 @@ dns_tsigkey_create(dns_name_t *name, dns_name_t *algorithm,
 				 isc_result_totext(ret));
 		return (ISC_R_UNEXPECTED);
 	}
-	
+
 	tkey->magic = TSIG_MAGIC;
 
 	if (key != NULL)
@@ -310,7 +310,7 @@ dns_tsig_sign(dns_message_t *msg) {
 		isc_buffer_putuint32(&otherbuf,
 				     (isc_uint32_t)(tsig.timesigned &
 						    0xFFFFFFFF));
-		
+
 	}
 	if (!dns_tsigkey_empty(key) && tsig.error != dns_tsigerror_badsig) {
 		unsigned char header[DNS_MESSAGE_HEADERLEN];
@@ -606,7 +606,7 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg,
 		if (ret != ISC_R_SUCCESS)
 			return (ret);
 	}
-	
+
 	/*
 	 * Do the key name and algorithm match that of the query?
 	 */
@@ -630,7 +630,7 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg,
 		ret = ISC_R_NOTFOUND;
 		if (ring1 != NULL)
 			ret = dns_tsigkey_find(&tsigkey, keyname,
-					       &tsig.algorithm, ring1); 
+					       &tsig.algorithm, ring1);
 		if (ret == ISC_R_NOTFOUND && ring2 != NULL)
 			ret = dns_tsigkey_find(&tsigkey, keyname,
 					       &tsig.algorithm, ring2);
@@ -855,7 +855,7 @@ tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg) {
 		ret = dns_rdata_tostruct(&rdata, &tsig, NULL);
 		if (ret != ISC_R_SUCCESS)
 			goto cleanup_querystruct;
-	
+
 		/*
 		 * Do the key name and algorithm match that of the query?
 		 */
@@ -1067,7 +1067,7 @@ isc_result_t
 dns_tsigkeyring_create(isc_mem_t *mctx, dns_tsig_keyring_t **ringp) {
 	isc_result_t result;
 	dns_tsig_keyring_t *ring;
-	
+
 	REQUIRE(mctx != NULL);
 	REQUIRE(ringp != NULL);
 	REQUIRE(*ringp == NULL);
@@ -1075,7 +1075,7 @@ dns_tsigkeyring_create(isc_mem_t *mctx, dns_tsig_keyring_t **ringp) {
 	ring = isc_mem_get(mctx, sizeof(dns_tsig_keyring_t));
 	if (ring == NULL)
 		return (ISC_R_NOMEMORY);
-		
+
 	result = isc_rwlock_init(&ring->lock, 0, 0);
 	if (result != ISC_R_SUCCESS) {
 		UNEXPECTED_ERROR(__FILE__, __LINE__,
@@ -1083,7 +1083,7 @@ dns_tsigkeyring_create(isc_mem_t *mctx, dns_tsig_keyring_t **ringp) {
 				 isc_result_totext(result));
 		return (ISC_R_UNEXPECTED);
 	}
-	
+
 	ring->keys = NULL;
 	result = dns_rbt_create(mctx, free_tsignode, NULL, &ring->keys);
 	if (result != ISC_R_SUCCESS) {
diff --git a/lib/dns/tsigconf.c b/lib/dns/tsigconf.c
index 639fe82e27..f146d61d9e 100644
--- a/lib/dns/tsigconf.c
+++ b/lib/dns/tsigconf.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tsigconf.c,v 1.10 2000/07/27 09:46:44 tale Exp $ */
+/* $Id: tsigconf.c,v 1.11 2000/08/01 01:23:02 tale Exp $ */
 
 #include 
 
@@ -135,7 +135,7 @@ dns_tsigkeyring_fromconfig(dns_c_view_t *confview, dns_c_ctx_t *confctx,
 		goto failure;
 
 	if (confview != NULL) {
-		keylist = NULL;	
+		keylist = NULL;
 		result = dns_c_view_getkeydefs(confview, &keylist);
 		if (result == ISC_R_SUCCESS)
 			result = add_initial_keys(keylist, ring, mctx);
diff --git a/lib/dns/ttl.c b/lib/dns/ttl.c
index 3c36a1742a..72d491e7cf 100644
--- a/lib/dns/ttl.c
+++ b/lib/dns/ttl.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ttl.c,v 1.19 2000/07/27 09:46:45 tale Exp $ */
+/* $Id: ttl.c,v 1.20 2000/08/01 01:23:03 tale Exp $ */
 
 #include 
 
@@ -114,7 +114,7 @@ dns_ttl_totext(isc_uint32_t src, isc_boolean_t verbose, isc_buffer_t *target) {
 	if (x == 1 && !verbose) {
 		isc_region_t region;
 		/*
-		 * The unit letter is the last character in the 
+		 * The unit letter is the last character in the
 		 * used region of the buffer.
 		 *
 		 * toupper() does not need its argument to be masked of cast
diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index 408bec3815..c65bbe5193 100644
--- a/lib/dns/validator.c
+++ b/lib/dns/validator.c
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: validator.c,v 1.70 2000/07/27 18:42:06 bwelling Exp $ */
+/* $Id: validator.c,v 1.71 2000/08/01 01:23:04 tale Exp $ */
 
 #include 
 
@@ -114,7 +114,7 @@ validator_done(dns_validator_t *val, isc_result_t result) {
 	val->event->ev_action = val->action;
 	val->event->ev_arg = val->arg;
 	isc_task_sendanddetach(&task, (isc_event_t **)&val->event);
-	
+
 }
 
 static void
@@ -324,7 +324,7 @@ keyvalidated(isc_task_t *task, isc_event_t *event) {
 			goto out;
 		}
 	} else {
-		validator_log(val, ISC_LOG_DEBUG(3), 
+		validator_log(val, ISC_LOG_DEBUG(3),
 			      "keyvalidated: got %s",
 			      dns_result_totext(eresult));
 		validator_done(val, eresult);
@@ -438,7 +438,7 @@ authvalidated(isc_task_t *task, isc_event_t *event) {
 	validator_log(val, ISC_LOG_DEBUG(3), "in authvalidated");
 	LOCK(&val->lock);
 	if (eresult != ISC_R_SUCCESS) {
-		validator_log(val, ISC_LOG_DEBUG(3), 
+		validator_log(val, ISC_LOG_DEBUG(3),
 			      "authvalidated: got %s",
 			      dns_result_totext(eresult));
 		result = nxtvalidate(val, ISC_TRUE);
@@ -486,7 +486,7 @@ negauthvalidated(isc_task_t *task, isc_event_t *event) {
 		auth_nonpending(val->event->message);
 		validator_done(val, ISC_R_SUCCESS);
 	} else {
-		validator_log(val, ISC_LOG_DEBUG(3), 
+		validator_log(val, ISC_LOG_DEBUG(3),
 			      "negauthvalidated: got %s",
 			      dns_result_totext(eresult));
 		validator_done(val, eresult);
@@ -547,7 +547,7 @@ nullkeyvalidated(isc_task_t *task, isc_event_t *event) {
  * Try to find a null zone key among those in 'rdataset'.  If found, build
  * a dst_key_t for it and point val->key at it.
  */
-static inline isc_boolean_t 
+static inline isc_boolean_t
 containsnullkey(dns_validator_t *val, dns_rdataset_t *rdataset) {
 	isc_result_t result;
 	dst_key_t *key = NULL;
@@ -586,7 +586,7 @@ containsnullkey(dns_validator_t *val, dns_rdataset_t *rdataset) {
  *
  * If val->key is non-NULL, this returns the next matching key.
  */
-static inline isc_result_t 
+static inline isc_result_t
 get_dst_key(dns_validator_t *val, dns_rdata_sig_t *siginfo,
 	    dns_rdataset_t *rdataset)
 {
@@ -923,13 +923,13 @@ validate(dns_validator_t *val, isc_boolean_t resume) {
 		if (val->siginfo == NULL)
 			return (ISC_R_NOMEMORY);
 		dns_rdata_tostruct(&rdata, val->siginfo, NULL);
-		
+
 		/*
 		 * At this point we could check that the signature algorithm
 		 * was known and "sufficiently good".  For now, any algorithm
 		 * is acceptable.
 		 */
-		
+
 		if (!resume) {
 			result = get_key(val, val->siginfo);
 			if (result == DNS_R_CONTINUE)
@@ -1089,7 +1089,7 @@ nxtvalidate(dns_validator_t *val, isc_boolean_t resume) {
 			if (result != ISC_R_SUCCESS)
 				return (result);
 			return (DNS_R_WAIT);
-						      
+
 		}
 	}
 	if (result == ISC_R_NOMORE)
@@ -1204,7 +1204,7 @@ proveunsecure(dns_validator_t *val, isc_boolean_t resume) {
 				      "found keyset, looking for null key");
 			if (!containsnullkey(val, &val->frdataset))
 				continue;
-		
+
 			if (val->frdataset.trust >= dns_trust_secure) {
 				validator_log(val, ISC_LOG_DEBUG(3),
 					      "insecurity proof succeeded");
@@ -1286,7 +1286,7 @@ validator_start(isc_task_t *task, isc_event_t *event) {
 	val = vevent->validator;
 
 	validator_log(val, ISC_LOG_DEBUG(3), "starting");
-	
+
 	LOCK(&val->lock);
 
 	if (val->event->rdataset != NULL && val->event->sigrdataset != NULL) {
@@ -1299,7 +1299,7 @@ validator_start(isc_task_t *task, isc_event_t *event) {
 		 */
 		validator_log(val, ISC_LOG_DEBUG(3),
 			      "attempting positive response validation");
-	
+
 		result = validate(val, ISC_FALSE);
 		if (result == DNS_R_NOVALIDSIG &&
 		    (val->attributes & VALATTR_TRIEDVERIFY) == 0)
@@ -1318,7 +1318,7 @@ validator_start(isc_task_t *task, isc_event_t *event) {
 		 */
 		validator_log(val, ISC_LOG_DEBUG(3),
 			      "attempting insecurity proof");
-	
+
 		result = proveunsecure(val, ISC_FALSE);
 	} else if (val->event->rdataset == NULL &&
 		 val->event->sigrdataset == NULL)
@@ -1328,7 +1328,7 @@ validator_start(isc_task_t *task, isc_event_t *event) {
 		 */
 		validator_log(val, ISC_LOG_DEBUG(3),
 			      "attempting negative response validation");
-	
+
 		result = nxtvalidate(val, ISC_FALSE);
 	} else {
 		/*
@@ -1423,7 +1423,7 @@ dns_validator_create(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type,
  cleanup_val:
 	dns_view_detach(&val->view);
 	isc_mem_put(view->mctx, val, sizeof *val);
-	
+
 	return (result);
 }
 
@@ -1519,7 +1519,7 @@ validator_logv(dns_validator_t *val, isc_logcategory_t *category,
 		char typebuf[256];
 		isc_buffer_t b;
 		isc_region_t r;
-		
+
 		dns_name_format(val->event->name, namebuf, sizeof(namebuf));
 
 		isc_buffer_init(&b, (unsigned char *)typebuf, sizeof(typebuf));
@@ -1536,7 +1536,7 @@ validator_logv(dns_validator_t *val, isc_logcategory_t *category,
 	} else {
 		isc_log_write(dns_lctx, category, module, level,
 			      "validator @%p: %s", val, msgbuf);
-		
+
 	}
 }
 
diff --git a/lib/dns/version.c b/lib/dns/version.c
index ec7f811b03..52d15b41f2 100644
--- a/lib/dns/version.c
+++ b/lib/dns/version.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.c,v 1.7 2000/07/27 09:46:47 tale Exp $ */
+/* $Id: version.c,v 1.8 2000/08/01 01:23:05 tale Exp $ */
 
 char dns_version[] = VERSION;
 
diff --git a/lib/dns/view.c b/lib/dns/view.c
index 7658208e53..56f360783a 100644
--- a/lib/dns/view.c
+++ b/lib/dns/view.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: view.c,v 1.73 2000/07/31 21:06:59 explorer Exp $ */
+/* $Id: view.c,v 1.74 2000/08/01 01:23:06 tale Exp $ */
 
 #include 
 
@@ -136,7 +136,7 @@ dns_view_create(isc_mem_t *mctx, dns_rdataclass_t rdclass,
 
 	/*
 	 * Initialize configuration data with default values.
-	 */	
+	 */
 	view->recursion = ISC_TRUE;
 	view->auth_nxdomain = ISC_FALSE; /* Was true in BIND 8 */
 	view->additionalfromcache = ISC_TRUE;
@@ -164,20 +164,20 @@ dns_view_create(isc_mem_t *mctx, dns_rdataclass_t rdclass,
 		       DNS_EVENT_VIEWREQSHUTDOWN, req_shutdown,
 		       view, NULL, NULL, NULL);
 	view->magic = DNS_VIEW_MAGIC;
-	
+
 	*viewp = view;
 
 	return (ISC_R_SUCCESS);
 
  cleanup_dynkeys:
-	dns_tsigkeyring_destroy(&view->dynamickeys);	
+	dns_tsigkeyring_destroy(&view->dynamickeys);
 
  cleanup_trustedkeys:
 	dns_keytable_detach(&view->trustedkeys);
 
  cleanup_secroots:
 	dns_keytable_detach(&view->secroots);
-	
+
  cleanup_zt:
 	dns_zt_detach(&view->zonetable);
 
@@ -207,9 +207,9 @@ destroy(dns_view_t *view) {
 
 	if (view->peers != NULL)
 		dns_peerlist_detach(&view->peers);
-	if (view->dynamickeys != NULL)	
+	if (view->dynamickeys != NULL)
 		dns_tsigkeyring_destroy(&view->dynamickeys);
-	if (view->statickeys != NULL)	
+	if (view->statickeys != NULL)
 		dns_tsigkeyring_destroy(&view->statickeys);
 	if (view->adb != NULL)
 		dns_adb_detach(&view->adb);
@@ -339,13 +339,13 @@ static void
 resolver_shutdown(isc_task_t *task, isc_event_t *event) {
 	dns_view_t *view = event->ev_arg;
 	isc_boolean_t done;
-	
+
 	REQUIRE(event->ev_type == DNS_EVENT_VIEWRESSHUTDOWN);
 	REQUIRE(DNS_VIEW_VALID(view));
 	REQUIRE(view->task == task);
 
 	UNUSED(task);
-	
+
 	LOCK(&view->lock);
 
 	view->attributes |= DNS_VIEWATTR_RESSHUTDOWN;
@@ -363,13 +363,13 @@ static void
 adb_shutdown(isc_task_t *task, isc_event_t *event) {
 	dns_view_t *view = event->ev_arg;
 	isc_boolean_t done;
-	
+
 	REQUIRE(event->ev_type == DNS_EVENT_VIEWADBSHUTDOWN);
 	REQUIRE(DNS_VIEW_VALID(view));
 	REQUIRE(view->task == task);
 
 	UNUSED(task);
-	
+
 	LOCK(&view->lock);
 
 	view->attributes |= DNS_VIEWATTR_ADBSHUTDOWN;
@@ -387,13 +387,13 @@ static void
 req_shutdown(isc_task_t *task, isc_event_t *event) {
 	dns_view_t *view = event->ev_arg;
 	isc_boolean_t done;
-	
+
 	REQUIRE(event->ev_type == DNS_EVENT_VIEWREQSHUTDOWN);
 	REQUIRE(DNS_VIEW_VALID(view));
 	REQUIRE(view->task == task);
 
 	UNUSED(task);
-	
+
 	LOCK(&view->lock);
 
 	view->attributes |= DNS_VIEWATTR_REQSHUTDOWN;
@@ -543,7 +543,7 @@ dns_view_addzone(dns_view_t *view, dns_zone_t *zone) {
 
 void
 dns_view_freeze(dns_view_t *view) {
-	
+
 	/*
 	 * Freeze view.
 	 */
diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c
index 3327f390bc..452a1a8e57 100644
--- a/lib/dns/xfrin.c
+++ b/lib/dns/xfrin.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xfrin.c,v 1.86 2000/07/27 09:46:50 tale Exp $ */
+/* $Id: xfrin.c,v 1.87 2000/08/01 01:23:07 tale Exp $ */
 
 #include 
 
@@ -99,7 +99,7 @@ struct dns_xfrin_ctx {
 	int			sends;		/* Send in progress */
 	int			recvs;	  	/* Receive in progress */
 	isc_boolean_t		shuttingdown;
-	
+
 	dns_name_t 		name; 		/* Name of zone to transfer */
 	dns_rdataclass_t 	rdclass;
 
@@ -126,7 +126,7 @@ struct dns_xfrin_ctx {
 	dns_dbversion_t 	*ver;
 	dns_diff_t 		diff;		/* Pending database changes */
 	int 			difflen;	/* Number of pending tuples */
-	
+
 	xfrin_state_t 		state;
 	isc_uint32_t 		end_serial;
 	isc_boolean_t 		is_ixfr;
@@ -141,20 +141,20 @@ struct dns_xfrin_ctx {
 
 	/*
 	 * AXFR- and IXFR-specific data.  Only one is used at a time
-	 * according to the is_ixfr flag, so this could be a union, 
-	 * but keeping them separate makes it a bit simpler to clean 
+	 * according to the is_ixfr flag, so this could be a union,
+	 * but keeping them separate makes it a bit simpler to clean
 	 * things up when destroying the context.
 	 */
 	struct {
 		dns_addrdatasetfunc_t add_func;
 		dns_dbload_t	      *add_private;
 	} axfr;
-	
+
 	struct {
 		isc_uint32_t 	request_serial;
 		isc_uint32_t 	end_serial;
 		dns_journal_t 	*journal;
-		
+
 	} ixfr;
 };
 
@@ -215,7 +215,7 @@ static isc_result_t
 render(dns_message_t *msg, isc_buffer_t *buf);
 
 static void
-xfrin_logv(int level, dns_name_t *zonename, isc_sockaddr_t *masteraddr, 
+xfrin_logv(int level, dns_name_t *zonename, isc_sockaddr_t *masteraddr,
 	   const char *fmt, va_list ap);
 static void
 xfrin_log1(int level, dns_name_t *zonename, isc_sockaddr_t *masteraddr,
@@ -313,7 +313,7 @@ ixfr_init(dns_xfrin_ctx_t *xfr) {
 	isc_result_t result;
 
 	if (xfr->reqtype != dns_rdatatype_ixfr) {
-		xfrin_log(xfr, ISC_LOG_ERROR, 
+		xfrin_log(xfr, ISC_LOG_ERROR,
 			  "got incremental response to AXFR request");
 		return (DNS_R_FORMERR);
 	}
@@ -443,7 +443,7 @@ xfr_rr(dns_xfrin_ctx_t *xfr, dns_name_t *name, isc_uint32_t ttl,
 		}
 		xfr->state = XFRST_FIRSTDATA;
 		break;
-		
+
 	case XFRST_FIRSTDATA:
 		/*
 		 * If the transfer begins with one SOA record, it is an AXFR,
@@ -469,7 +469,7 @@ xfr_rr(dns_xfrin_ctx_t *xfr, dns_name_t *name, isc_uint32_t ttl,
 		CHECK(ixfr_putdata(xfr, DNS_DIFFOP_DEL, name, ttl, rdata));
 		xfr->state = XFRST_IXFR_DEL;
 		break;
-		
+
 	case XFRST_IXFR_DEL:
 		if (rdata->type == dns_rdatatype_soa) {
 			isc_uint32_t soa_serial = dns_soa_getserial(rdata);
@@ -479,13 +479,13 @@ xfr_rr(dns_xfrin_ctx_t *xfr, dns_name_t *name, isc_uint32_t ttl,
 		}
 		CHECK(ixfr_putdata(xfr, DNS_DIFFOP_DEL, name, ttl, rdata));
 		break;
-		
+
 	case XFRST_IXFR_ADDSOA:
 		INSIST(rdata->type == dns_rdatatype_soa);
 		CHECK(ixfr_putdata(xfr, DNS_DIFFOP_ADD, name, ttl, rdata));
 		xfr->state = XFRST_IXFR_ADD;
 		break;
-		
+
 	case XFRST_IXFR_ADD:
 		if (rdata->type == dns_rdatatype_soa) {
 			isc_uint32_t soa_serial = dns_soa_getserial(rdata);
@@ -535,7 +535,7 @@ dns_xfrin_create(dns_zone_t *zone, dns_rdatatype_t xfrtype,
 	REQUIRE(xfrp != NULL && *xfrp == NULL);
 
 	(void)dns_zone_getdb(zone, &db);
-	
+
 	CHECK(xfrin_create(mctx, zone, db, task, timermgr, socketmgr, zonename,
 			   dns_zone_getclass(zone), xfrtype, masteraddr,
 			   tsigkey, &xfr));
@@ -611,7 +611,7 @@ xfrin_create(isc_mem_t *mctx,
 	isc_result_t result;
 	isc_interval_t maxinterval, idleinterval;
 	isc_time_t expires;
-	
+
 	xfr = isc_mem_get(mctx, sizeof(*xfr));
 	if (xfr == NULL)
 		return (ISC_R_NOMEMORY);
@@ -629,7 +629,7 @@ xfrin_create(isc_mem_t *mctx,
 	xfr->sends = 0;
 	xfr->recvs = 0;
 	xfr->shuttingdown = ISC_FALSE;
-	
+
 	dns_name_init(&xfr->name, NULL);
 	xfr->rdclass = rdclass;
 	xfr->reqtype = reqtype;
@@ -670,11 +670,11 @@ xfrin_create(isc_mem_t *mctx,
 	xfr->axfr.add_private = NULL;
 
 	CHECK(dns_name_dup(zonename, mctx, &xfr->name));
-	
+
 	isc_interval_set(&maxinterval, dns_zone_getmaxxfrin(xfr->zone), 0);
 	CHECK(isc_time_nowplusinterval(&expires, &maxinterval));
 	isc_interval_set(&idleinterval, dns_zone_getidlein(xfr->zone), 0);
-	
+
 	CHECK(isc_timer_create(timermgr, isc_timertype_once,
 			       &expires, &idleinterval, task,
 			       xfrin_timeout, xfr, &xfr->timer));
@@ -691,14 +691,14 @@ xfrin_create(isc_mem_t *mctx,
 	default:
 		INSIST(0);
 	}
-	
+
 	isc_buffer_init(&xfr->qbuffer, xfr->qbuffer_data,
 			sizeof(xfr->qbuffer_data));
 
 	xfr->magic = XFRIN_MAGIC;
 	*xfrp = xfr;
 	return (ISC_R_SUCCESS);
-	
+
  failure:
 	xfrin_fail(xfr, result, "creating transfer context");
 	return (result);
@@ -760,17 +760,17 @@ xfrin_connect_done(isc_task_t *task, isc_event_t *event) {
 		maybe_free(xfr);
 		return;
 	}
-	
+
 	CHECK(evresult);
 	xfrin_log(xfr, ISC_LOG_DEBUG(3), "connected");
-	
+
 	dns_tcpmsg_init(xfr->mctx, xfr->socket, &xfr->tcpmsg);
 	xfr->tcpmsg_valid = ISC_TRUE;
 
 	CHECK(xfrin_send_request(xfr));
  failure:
 	if (result != ISC_R_SUCCESS)
-		xfrin_fail(xfr, result, "connect"); 
+		xfrin_fail(xfr, result, "connect");
 }
 
 /*
@@ -791,7 +791,7 @@ tuple2msgname(dns_difftuple_t *tuple, dns_message_t *msg, dns_name_t **target)
 	CHECK(dns_message_gettemprdata(msg, &rdata));
 	dns_rdata_init(rdata);
 	*rdata = tuple->rdata; /* Struct assignment. */
-	
+
 	CHECK(dns_message_gettemprdatalist(msg, &rdl));
 	dns_rdatalist_init(rdl);
 	rdl->type = tuple->rdata.type;
@@ -812,7 +812,7 @@ tuple2msgname(dns_difftuple_t *tuple, dns_message_t *msg, dns_name_t **target)
  failure:
 	return (result);
 }
-		
+
 
 /*
  * Build an *XFR request and send its length prefix.
@@ -844,7 +844,7 @@ xfrin_send_request(dns_xfrin_ctx_t *xfr) {
 	dns_rdataset_init(qrdataset);
 	dns_rdataset_makequestion(qrdataset, xfr->rdclass, xfr->reqtype);
 	ISC_LIST_APPEND(qname->list, qrdataset, link);
-	
+
 	dns_message_addname(msg, qname, DNS_SECTION_QUESTION);
 
 	if (xfr->reqtype == dns_rdatatype_ixfr) {
@@ -914,13 +914,13 @@ xfrin_sendlen_done(isc_task_t *task, isc_event_t *event) {
 
 	INSIST(event->ev_type == ISC_SOCKEVENT_SENDDONE);
 	isc_event_free(&event);
-	
+
 	xfr->sends--;
 	if (xfr->shuttingdown) {
 		maybe_free(xfr);
 		return;
 	}
-	
+
 	xfrin_log(xfr, ISC_LOG_DEBUG(3), "sent request length prefix");
 	CHECK(evresult);
 
@@ -946,7 +946,7 @@ xfrin_send_done(isc_task_t *task, isc_event_t *event) {
 
 	INSIST(event->ev_type == ISC_SOCKEVENT_SENDDONE);
 
-	xfr->sends--;	
+	xfr->sends--;
 	xfrin_log(xfr, ISC_LOG_DEBUG(3), "sent request data");
 	CHECK(sev->result);
 
@@ -972,11 +972,11 @@ xfrin_recv_done(isc_task_t *task, isc_event_t *ev) {
 	REQUIRE(VALID_XFRIN(xfr));
 
 	UNUSED(task);
-	
+
 	INSIST(ev->ev_type == DNS_EVENT_TCPMSG);
 	tcpmsg = ev->ev_sender;
 	isc_event_free(&ev);
-	
+
 	xfr->recvs--;
 	if (xfr->shuttingdown) {
 		maybe_free(xfr);
@@ -989,7 +989,7 @@ xfrin_recv_done(isc_task_t *task, isc_event_t *ev) {
 		  tcpmsg->buffer.used);
 
 	CHECK(isc_timer_touch(xfr->timer));
-	
+
 	CHECK(dns_message_create(xfr->mctx, DNS_MESSAGE_INTENTPARSE, &msg));
 
 	dns_message_settsigkey(msg, xfr->tsigkey);
@@ -1027,7 +1027,7 @@ xfrin_recv_done(isc_task_t *task, isc_event_t *ev) {
 	     result = dns_message_nextname(msg, DNS_SECTION_ANSWER))
 	{
 		dns_rdataset_t *rds;
-		
+
 		name = NULL;
 		dns_message_currentname(msg, DNS_SECTION_ANSWER, &name);
 		if (!dns_name_issubdomain(name, &xfr->name)) {
@@ -1084,7 +1084,7 @@ xfrin_recv_done(isc_task_t *task, isc_event_t *ev) {
 	 * Update the number of messages received.
 	 */
 	xfr->nmsg++;
-	
+
 	/*
 	 * Copy the context back.
 	 */
@@ -1119,7 +1119,7 @@ xfrin_recv_done(isc_task_t *task, isc_event_t *ev) {
 		xfr->recvs++;
 	}
 	return;
-	
+
  failure:
 	if (msg != NULL)
 		dns_message_destroy(&msg);
@@ -1178,28 +1178,28 @@ maybe_free(dns_xfrin_ctx_t *xfr) {
 
 	if (xfr->tcpmsg_valid)
 		dns_tcpmsg_invalidate(&xfr->tcpmsg);
-	
+
 	if ((xfr->name.attributes & DNS_NAMEATTR_DYNAMIC) != 0)
 		dns_name_free(&xfr->name, xfr->mctx);
 
 	if (xfr->ver != NULL)
 		dns_db_closeversion(xfr->db, &xfr->ver, ISC_FALSE);
 
-	if (xfr->db != NULL) 
+	if (xfr->db != NULL)
 		dns_db_detach(&xfr->db);
 
 	if (xfr->zone != NULL)
 		dns_zone_detach(&xfr->zone);
-		
+
 	isc_mem_put(xfr->mctx, xfr, sizeof(*xfr));
 }
 
 /*
  * Log incoming zone transfer messages in a format like
- * transfer of  from 
:  
+ * transfer of  from 
: 
  */
 static void
-xfrin_logv(int level, dns_name_t *zonename, isc_sockaddr_t *masteraddr, 
+xfrin_logv(int level, dns_name_t *zonename, isc_sockaddr_t *masteraddr,
 	   const char *fmt, va_list ap)
 {
 	char zntext[1024];
@@ -1210,7 +1210,7 @@ xfrin_logv(int level, dns_name_t *zonename, isc_sockaddr_t *masteraddr,
 	isc_sockaddr_format(masteraddr, mastertext, sizeof(mastertext));
 	vsnprintf(msgtext, sizeof(msgtext), fmt, ap);
 
-	isc_log_write(dns_lctx, DNS_LOGCATEGORY_XFER_IN, 
+	isc_log_write(dns_lctx, DNS_LOGCATEGORY_XFER_IN,
 		      DNS_LOGMODULE_XFER_IN, level,
 		      "transfer of '%s' from %s: %s",
 		      zntext, mastertext, msgtext);
@@ -1221,7 +1221,7 @@ xfrin_logv(int level, dns_name_t *zonename, isc_sockaddr_t *masteraddr,
  */
 
 static void
-xfrin_log1(int level, dns_name_t *zonename, isc_sockaddr_t *masteraddr, 
+xfrin_log1(int level, dns_name_t *zonename, isc_sockaddr_t *masteraddr,
 	   const char *fmt, ...)
 {
         va_list ap;
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 09623310b6..03e8847df7 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.171 2000/07/28 20:13:47 bwelling Exp $ */
+/* $Id: zone.c,v 1.172 2000/08/01 01:23:09 tale Exp $ */
 
 #include 
 
@@ -163,13 +163,13 @@ struct dns_zone {
 	isc_uint32_t		sigvalidityinterval;
 	dns_view_t		*view;
 	/*
-	 * Zones in certain states such as "waiting for zone transfer" 
+	 * Zones in certain states such as "waiting for zone transfer"
 	 * or "zone transfer in progress" are kept on per-state linked lists
 	 * in the zone manager using the 'statelink' field.  The 'statelist'
 	 * field points at the list the zone is currently on.  It the zone
 	 * is not on any such list, statelist is NULL.
 	 */
-	ISC_LINK(dns_zone_t)	statelink;	
+	ISC_LINK(dns_zone_t)	statelink;
 	dns_zonelist_t	        *statelist;
 };
 
@@ -184,7 +184,7 @@ struct dns_zone {
 #define DNS_ZONEFLG_EXITING      0x00000040U     /* zone is being destroyed */
 #define DNS_ZONEFLG_EXPIRED      0x00000080U     /* zone has expired */
 #define DNS_ZONEFLG_NEEDREFRESH	0x00000100U	/* refresh check needed */
-#define DNS_ZONEFLG_UPTODATE	0x00000200U	/* zone contents are 
+#define DNS_ZONEFLG_UPTODATE	0x00000200U	/* zone contents are
 						 * uptodate */
 #define DNS_ZONEFLG_NEEDNOTIFY	0x00000400U	/* need to send out notify
 						 * messages */
@@ -212,7 +212,7 @@ struct dns_zonemgr {
 	dns_zonelist_t		zones;
 	dns_zonelist_t		waiting_for_xfrin;
 	dns_zonelist_t		xfrin_in_progress;
-	
+
 	/* Locked by conflock. */
 	int			transfersin;
 	int			transfersperns;
@@ -318,7 +318,7 @@ isc_result_t
 dns_zone_create(dns_zone_t **zonep, isc_mem_t *mctx) {
 	isc_result_t result;
 	dns_zone_t *zone;
-	
+
 	REQUIRE(zonep != NULL && *zonep == NULL);
 	REQUIRE(mctx != NULL);
 
@@ -393,7 +393,7 @@ dns_zone_create(dns_zone_t **zonep, isc_mem_t *mctx) {
 	zone->view = NULL;
 	ISC_LINK_INIT(zone, statelink);
 	zone->statelist = NULL;
-	
+
 	zone->magic = ZONE_MAGIC;
 	ISC_EVENT_INIT(&zone->ctlevent, sizeof(zone->ctlevent), 0, NULL,
 		       DNS_EVENT_ZONECONTROL, zone_shutdown, zone, zone,
@@ -423,12 +423,12 @@ zone_free(dns_zone_t *zone) {
 		dns_request_destroy(&zone->request); /* XXXMPA */
 
 	INSIST(zone->statelist == NULL);
-	
+
 	if (zone->task != NULL)
 		isc_task_detach(&zone->task);
 	if (zone->zmgr)
 		dns_zonemgr_releasezone(zone->zmgr, zone);
-	
+
 	/* Unmanaged objects */
 	if (zone->dbname != NULL)
 		isc_mem_free(zone->mctx, zone->dbname);
@@ -546,7 +546,7 @@ dns_zone_setview(dns_zone_t *zone, dns_view_t *view) {
 		dns_view_weakdetach(&zone->view);
 	dns_view_weakattach(view, &zone->view);
 }
-     
+
 
 dns_view_t *
 dns_zone_getview(dns_zone_t *zone) {
@@ -554,7 +554,7 @@ dns_zone_getview(dns_zone_t *zone) {
 
 	return (zone->view);
 }
-     
+
 
 isc_result_t
 dns_zone_setorigin(dns_zone_t *zone, dns_name_t *origin) {
@@ -599,7 +599,7 @@ default_journal(dns_zone_t *zone) {
 	REQUIRE(DNS_ZONE_VALID(zone));
 	REQUIRE(zone->dbname != NULL);
 
-	if (zone->journal != NULL) 
+	if (zone->journal != NULL)
 		isc_mem_free(zone->mctx, zone->journal);
 	len = strlen(zone->dbname) + sizeof ".jnl"; 	/* includes '\0' */
 	zone->journal = isc_mem_allocate(zone->mctx, len);
@@ -794,7 +794,7 @@ dns_zone_load(dns_zone_t *zone) {
 			isc_time_t t;
 
 			result = isc_file_getmodtime(zone->dbname, &t);
-						     
+
 			if (result == ISC_R_SUCCESS)
 				zone->expiretime = isc_time_seconds(&t) +
 						   zone->expire;
@@ -821,7 +821,7 @@ dns_zone_load(dns_zone_t *zone) {
 						    sizeof(isc_event_t));
 		dns_db_ondestroy(db, zone->task, &e);
 	}
-#endif	
+#endif
 
 	if (zone->db != NULL) {
 		result = zone_replacedb(zone, db, ISC_FALSE);
@@ -831,7 +831,7 @@ dns_zone_load(dns_zone_t *zone) {
 		dns_db_attach(db, &zone->db);
 		zone->flags |= DNS_ZONEFLG_LOADED|DNS_ZONEFLG_NEEDNOTIFY;
 	}
-	result = ISC_R_SUCCESS; 
+	result = ISC_R_SUCCESS;
 
  cleanup:
 	UNLOCK(&zone->lock);
@@ -1011,19 +1011,19 @@ void
 dns_zone_detach(dns_zone_t **zonep) {
 	dns_zone_t *zone;
 	isc_boolean_t free_now = ISC_FALSE;
-	
+
 	REQUIRE(zonep != NULL && DNS_ZONE_VALID(*zonep));
 
 	zone = *zonep;
 	LOCK(&zone->lock);
-	
+
 	REQUIRE(zone->erefs > 0);
 	zone->erefs--;
 	if (zone->erefs == 0) {
 		/*
 		 * We just detached the last external reference.
 		 */
-		if (zone->task != NULL) {	
+		if (zone->task != NULL) {
 			/*
 			 * This zone is being managed.  Post
 			 * its control event and let it clean
@@ -1257,7 +1257,7 @@ dns_zone_setalsonotify(dns_zone_t *zone, isc_sockaddr_t *notify,
 	REQUIRE(DNS_ZONE_VALID(zone));
 	REQUIRE((notify == NULL && count == 0) ||
 		(notify != NULL && count != 0));
-	
+
 	LOCK(&zone->lock);
 	if (zone->notify != NULL) {
 		isc_mem_put(zone->mctx, zone->notify,
@@ -1428,7 +1428,7 @@ dns_zone_getdb(dns_zone_t *zone, dns_db_t **dpb) {
 /*
  * Co-ordinates the starting of routine jobs.
  */
- 
+
 void
 dns_zone_maintenance(dns_zone_t *zone) {
 	const char me[] = "dns_zone_maintenance";
@@ -1441,13 +1441,13 @@ dns_zone_maintenance(dns_zone_t *zone) {
 	/*
 	 * Configuring the view of this zone may have
 	 * failed, for example because the config file
-	 * had a syntax error.  In that case, the view 
+	 * had a syntax error.  In that case, the view
 	 * adb or resolver, and we had better not try
 	 * to do maintenance on it.
 	 */
 	if (zone->view == NULL || zone->view->adb == NULL)
 		return;
-	
+
 	isc_stdtime_get(&now);
 
 	/*
@@ -1457,7 +1457,7 @@ dns_zone_maintenance(dns_zone_t *zone) {
 	case dns_zone_slave:
 	case dns_zone_stub:
 		LOCK(&zone->lock);
-		if (now >= zone->expiretime && 
+		if (now >= zone->expiretime &&
 		    DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED)) {
 			zone_expire(zone);
 			zone->refreshtime = now;
@@ -1621,7 +1621,7 @@ zone_dump(dns_zone_t *zone) {
 	int buflen;
 	FILE *f = NULL;
 	int n;
-	
+
 	/*
 	 * 'zone' locked by caller.
 	 */
@@ -1792,7 +1792,7 @@ process_adb_event(isc_task_t *task, isc_event_t *ev) {
 
 	notify = ev->ev_arg;
 	REQUIRE(DNS_NOTIFY_VALID(notify));
-	INSIST(task == notify->zone->task);	
+	INSIST(task == notify->zone->task);
 	result = ev->ev_type;
 	isc_event_free(&ev);
 	dns_zone_iattach(notify->zone, &zone);
@@ -2049,7 +2049,7 @@ dns_zone_notify(dns_zone_t *zone) {
 				     dns_rdatatype_none, 0, &soardset, NULL);
 	if (result != ISC_R_SUCCESS)
 		goto cleanup2;
-	
+
 	/*
 	 * Find master server's name.
 	 */
@@ -2077,7 +2077,7 @@ dns_zone_notify(dns_zone_t *zone) {
 				     dns_rdatatype_none, 0, &nsrdset, NULL);
 	if (result != ISC_R_SUCCESS)
 		goto cleanup3;
-	
+
 	result = dns_rdataset_first(&nsrdset);
 	while (result == ISC_R_SUCCESS) {
 		dns_rdataset_current(&nsrdset, &rdata);
@@ -2131,8 +2131,8 @@ dns_zone_notify(dns_zone_t *zone) {
  *** Private
  ***/
 
-static inline isc_result_t 
-save_nsrrset(dns_message_t *message, dns_name_t *name, 
+static inline isc_result_t
+save_nsrrset(dns_message_t *message, dns_name_t *name,
 	     dns_db_t *db, dns_dbversion_t *version)
 {
 	dns_rdataset_t *nsrdataset = NULL;
@@ -2433,7 +2433,7 @@ refresh_callback(isc_task_t *task, isc_event_t *event) {
 	isc_sockaddr_format(&zone->masteraddr, master, sizeof(master));
 
 	isc_stdtime_get(&now);
-	
+
 	if (revent->result != ISC_R_SUCCESS) {
 		zone_log(zone, me, ISC_LOG_INFO, "failure for %s: %s",
 		         master, dns_result_totext(revent->result));
@@ -2664,9 +2664,9 @@ queue_soa_query(dns_zone_t *zone) {
 	/*
 	 * Attach so that we won't clean up
 	 * until the event is delivered.
-	 */	
+	 */
 	dns_zone_iattach(zone, &dummy);
-	
+
 	e->ev_arg = zone;
 	e->ev_sender = NULL;
 	result = isc_ratelimiter_enqueue(zone->zmgr->rl, zone->task, &e);
@@ -2752,7 +2752,7 @@ soa_query(isc_task_t *task, isc_event_t *event) {
 		return;
 	}
 
-	/* 
+	/*
 	 * XXX Optimisation: Create message when zone is setup and reuse.
 	 */
 	result = create_query(zone, dns_rdatatype_soa, &message);
@@ -2778,7 +2778,7 @@ soa_query(isc_task_t *task, isc_event_t *event) {
 						zone->view->dynamickeys);
 	}
 
-	options = DNS_ZONE_FLAG(zone, DNS_ZONEFLG_USEVC) ? 
+	options = DNS_ZONE_FLAG(zone, DNS_ZONEFLG_USEVC) ?
 		  DNS_REQUESTOPT_TCP : 0;
 	result = dns_request_create(zone->view->requestmgr, message,
 				    &zone->masteraddr, options, key,
@@ -2886,7 +2886,7 @@ ns_query(dns_zone_t *zone, dns_rdataset_t *soardataset, dns_stub_t *stub) {
 
 	}
 
-	/* 
+	/*
 	 * XXX Optimisation: Create message when zone is setup and reuse.
 	 */
 	result = create_query(zone, dns_rdatatype_ns, &message);
@@ -2955,7 +2955,7 @@ zone_shutdown(isc_task_t *task, isc_event_t *event) {
 	UNUSED(task);
 	REQUIRE(DNS_ZONE_VALID(zone));
 	INSIST(event->ev_type == DNS_EVENT_ZONECONTROL);
-	INSIST(zone->erefs == 0);	
+	INSIST(zone->erefs == 0);
 	zone_log(zone, "zone_shutdown", ISC_LOG_DEBUG(3), "shutting down");
 	LOCK(&zone->lock);
 	zone->flags |= DNS_ZONEFLG_EXITING;
@@ -2972,7 +2972,7 @@ zone_shutdown(isc_task_t *task, isc_event_t *event) {
 		RWUNLOCK(&zone->zmgr->rwlock, isc_rwlocktype_write);
 		zone->statelist = NULL;
 	}
-	
+
 	if (zone->xfr != NULL)
 		dns_xfrin_shutdown(zone->xfr);
 
@@ -2996,7 +2996,7 @@ zone_shutdown(isc_task_t *task, isc_event_t *event) {
 
 	if (zone->view != NULL)
 		dns_view_weakdetach(&zone->view);
-	    
+
 	exit_check(zone);
 }
 
@@ -3012,7 +3012,7 @@ zone_timer(isc_task_t *task, isc_event_t *event) {
 	/* XXX if we use a view, we need to lock its configuration, too. */
 	dns_zone_maintenance(zone);
 	dns_zonemgr_unlockconf(zone->zmgr, isc_rwlocktype_read);
-	
+
 	isc_event_free(&event);
 }
 
@@ -3142,7 +3142,7 @@ notify_createmessage(dns_zone_t *zone, dns_message_t **messagep)
 	dns_message_addname(message, tempname, DNS_SECTION_QUESTION);
 	tempname = NULL;
 	temprdataset = NULL;
-	
+
 	/*
 	 * If the zone is dialup we are done as we don't want to send
 	 * the current soa so as to force a refresh query.
@@ -3265,7 +3265,7 @@ dns_zone_notifyreceive(dns_zone_t *zone, isc_sockaddr_t *from,
 	 * against the zones serial and return if <= current serial
 	 *
 	 * If a refresh check is progress, if so just record the
-	 * fact we received a NOTIFY and from where and return. 
+	 * fact we received a NOTIFY and from where and return.
 	 * We will perform a new refresh check when the current one
 	 * completes. Return ISC_R_SUCCESS.
 	 *
@@ -3323,7 +3323,7 @@ dns_zone_notifyreceive(dns_zone_t *zone, isc_sockaddr_t *from,
 		result = dns_message_findname(msg, DNS_SECTION_ANSWER,
 					      &zone->origin,
 					      dns_rdatatype_soa,
-					      dns_rdatatype_none, NULL, 
+					      dns_rdatatype_none, NULL,
 					      &rdataset);
 		if (result == ISC_R_SUCCESS)
 			result = dns_rdataset_first(rdataset);
@@ -3341,7 +3341,7 @@ dns_zone_notifyreceive(dns_zone_t *zone, isc_sockaddr_t *from,
 					return (ISC_R_SUCCESS);
 				}
 			}
-		} 
+		}
 	}
 
 	/*
@@ -3477,7 +3477,7 @@ dns_zone_getchecknames(dns_zone_t *zone) {
 
 void
 dns_zone_setjournalsize(dns_zone_t *zone, isc_int32_t size) {
-	
+
 	REQUIRE(DNS_ZONE_VALID(zone));
 
 	zone->journalsize = size;
@@ -3485,7 +3485,7 @@ dns_zone_setjournalsize(dns_zone_t *zone, isc_int32_t size) {
 
 isc_int32_t
 dns_zone_getjournalsize(dns_zone_t *zone) {
-	
+
 	REQUIRE(DNS_ZONE_VALID(zone));
 
 	return (zone->journalsize);
@@ -3534,7 +3534,7 @@ message_count(dns_message_t *msg, dns_section_t section, dns_rdatatype_t type)
 		name = NULL;
 		dns_message_currentname(msg, section, &name);
 
-		for (curr = ISC_LIST_TAIL(name->list); curr != NULL; 
+		for (curr = ISC_LIST_TAIL(name->list); curr != NULL;
 		     curr = ISC_LIST_PREV(curr, link)) {
 			if (curr->type == type)
 				count++;
@@ -3648,7 +3648,7 @@ notify_done(isc_task_t *task, isc_event_t *event) {
         const char me[] = "notify_done";
 	dns_notify_t *notify;
 	dns_zone_t *zone = NULL;
-	
+
 	UNUSED(task);
 
 	notify = event->ev_arg;
@@ -3751,7 +3751,7 @@ dns_zone_equal(dns_zone_t *oldzone, dns_zone_t *newzone) {
 isc_result_t
 dns_zone_replacedb(dns_zone_t *zone, dns_db_t *db, isc_boolean_t dump) {
 	isc_result_t result;
-	
+
 	REQUIRE(DNS_ZONE_VALID(zone));
 	LOCK(&zone->lock);
 	result = zone_replacedb(zone, db, dump);
@@ -3770,7 +3770,7 @@ zone_replacedb(dns_zone_t *zone, dns_db_t *db, isc_boolean_t dump) {
 	dns_db_currentversion(db, &ver);
 
 	/*
-	 * The initial version of a slave zone is always dumped; 
+	 * The initial version of a slave zone is always dumped;
 	 * subsequent versions may be journalled instead if this
 	 * is enabled in the configuration.
 	 */
@@ -3815,13 +3815,13 @@ zone_replacedb(dns_zone_t *zone, dns_db_t *db, isc_boolean_t dump) {
 	isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL,
 		      DNS_LOGMODULE_ZONE, ISC_LOG_DEBUG(3),
 		      "replacing zone database");
-	
+
 	if (zone->db != NULL)
 		dns_db_detach(&zone->db);
 	dns_db_attach(db, &zone->db);
 	zone->flags |= DNS_ZONEFLG_LOADED|DNS_ZONEFLG_NEEDNOTIFY;
 	return (ISC_R_SUCCESS);
-	
+
  fail:
 	dns_db_closeversion(db, &ver, ISC_FALSE);
 	return (result);
@@ -3906,7 +3906,7 @@ zone_xfrdone(dns_zone_t *zone, isc_result_t result) {
 			zone->refreshtime = now + zone->refresh;
 			zone->expiretime = now + zone->expire;
 		}
-	
+
 		break;
 
 	default:
@@ -3936,13 +3936,13 @@ zone_xfrdone(dns_zone_t *zone, isc_result_t result) {
 	 * This transfer finishing freed up a transfer quota slot.
 	 * Let any zones waiting for quota have it.
 	 */
-	RWLOCK(&zone->zmgr->rwlock, isc_rwlocktype_write);	
+	RWLOCK(&zone->zmgr->rwlock, isc_rwlocktype_write);
 	ISC_LIST_UNLINK(zone->zmgr->xfrin_in_progress, zone, statelink);
 	zone->statelist = NULL;
 	if (!DNS_ZONE_FLAG(zone, DNS_ZONEFLG_EXITING))
 		zmgr_resume_xfrs(zone->zmgr);
 	RWUNLOCK(&zone->zmgr->rwlock, isc_rwlocktype_write);
-	
+
 	/*
 	 * Retry with a different server if necessary.
 	 */
@@ -3967,14 +3967,14 @@ dns_zone_setssutable(dns_zone_t *zone, dns_ssutable_t *table) {
 
 void
 dns_zone_setsigvalidityinterval(dns_zone_t *zone, isc_uint32_t interval) {
-	REQUIRE(DNS_ZONE_VALID(zone));     
+	REQUIRE(DNS_ZONE_VALID(zone));
 
 	zone->sigvalidityinterval = interval;
 }
 
 isc_uint32_t
 dns_zone_getsigvalidityinterval(dns_zone_t *zone) {
-	REQUIRE(DNS_ZONE_VALID(zone));     	
+	REQUIRE(DNS_ZONE_VALID(zone));
 
 	return (zone->sigvalidityinterval);
 }
@@ -3989,11 +3989,11 @@ queue_xfrin(dns_zone_t *zone) {
 
 	INSIST(zone->statelist == NULL);
 
-	RWLOCK(&zmgr->rwlock, isc_rwlocktype_write);	
+	RWLOCK(&zmgr->rwlock, isc_rwlocktype_write);
 	ISC_LIST_APPEND(zmgr->waiting_for_xfrin, zone, statelink);
 	zone->statelist = &zmgr->waiting_for_xfrin;
 	result = zmgr_start_xfrin_ifquota(zmgr, zone);
-	RWUNLOCK(&zmgr->rwlock, isc_rwlocktype_write);	
+	RWUNLOCK(&zmgr->rwlock, isc_rwlocktype_write);
 
 	if (result == ISC_R_QUOTA) {
 		zone_log(zone, me, ISC_LOG_DEBUG(1),
@@ -4023,27 +4023,27 @@ got_transfer_quota(isc_task_t *task, isc_event_t *event) {
 	isc_netaddr_t masterip;
 	isc_boolean_t gotkey = ISC_FALSE;
 	dns_view_t *view = NULL;
-	
+
 	UNUSED(task);
-	
+
 	INSIST(task == zone->task);
 
 	if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_EXITING)) {
 		result = ISC_R_CANCELED;
 		goto cleanup;
 	}
-	
+
 	isc_sockaddr_format(&zone->masteraddr, mastertext, sizeof(mastertext));
-	
+
 	isc_netaddr_fromsockaddr(&masterip, &zone->masteraddr);
 	(void)dns_peerlist_peerbyaddr(zone->view->peers,
 				      &masterip, &peer);
-	
+
 	/*
 	 * Decide whether we should request IXFR or AXFR.
 	 */
 	if (zone->db == NULL) {
-		zone_log(zone, me, ISC_LOG_DEBUG(3), 
+		zone_log(zone, me, ISC_LOG_DEBUG(3),
 			 "no database exists yet, requesting AXFR of "
 			 "initial version from %s", mastertext);
 		xfrtype = dns_rdatatype_axfr;
@@ -4052,7 +4052,7 @@ got_transfer_quota(isc_task_t *task, isc_event_t *event) {
 		if (peer != NULL &&
 		    dns_peer_getrequestixfr(peer, &use_ixfr) ==
 		    ISC_R_SUCCESS) {
-			; /* Using peer setting */ 
+			; /* Using peer setting */
 		} else {
 			use_ixfr = zone->view->requestixfr;
 		}
@@ -4060,7 +4060,7 @@ got_transfer_quota(isc_task_t *task, isc_event_t *event) {
 			zone_log(zone, me, ISC_LOG_DEBUG(3),
 				 "IXFR disabled, requesting AXFR from %s",
 				 mastertext);
-			xfrtype = dns_rdatatype_axfr;			
+			xfrtype = dns_rdatatype_axfr;
 		} else {
 			zone_log(zone, me, ISC_LOG_DEBUG(3),
 				 "requesting IXFR from %s",
@@ -4121,7 +4121,7 @@ got_transfer_quota(isc_task_t *task, isc_event_t *event) {
 
 	if (tsigkey != NULL)
 		dns_tsigkey_detach(&tsigkey);
-	
+
 	isc_event_free(&event);
 
 	dns_zone_detach(&zone); /* XXXAG */
@@ -4130,7 +4130,7 @@ got_transfer_quota(isc_task_t *task, isc_event_t *event) {
 }
 
 /***
- ***	Zone manager. 
+ ***	Zone manager.
  ***/
 
 isc_result_t
@@ -4176,9 +4176,9 @@ dns_zonemgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr,
 
 	zmgr->transfersin = 10;
 	zmgr->transfersperns = 2;
-	
+
 	/* Create the zone task pool. */
-	result = isc_taskpool_create(taskmgr, mctx, 
+	result = isc_taskpool_create(taskmgr, mctx,
 				     8 /* XXX */, 0, &zmgr->zonetasks);
 	if (result != ISC_R_SUCCESS)
 		goto free_conflock;
@@ -4205,7 +4205,7 @@ dns_zonemgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr,
  free_task:
 	isc_task_detach(&zmgr->task);
  free_taskpool:
-	isc_taskpool_destroy(&zmgr->zonetasks);	
+	isc_taskpool_destroy(&zmgr->zonetasks);
  free_conflock:
 	isc_rwlock_destroy(&zmgr->conflock);
  free_rwlock:
@@ -4219,7 +4219,7 @@ dns_zonemgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr,
 isc_result_t
 dns_zonemgr_managezone(dns_zonemgr_t *zmgr, dns_zone_t *zone) {
 	isc_result_t result;
-	
+
 	REQUIRE(DNS_ZONE_VALID(zone));
 	REQUIRE(DNS_ZONEMGR_VALID(zmgr));
 
@@ -4256,7 +4256,7 @@ dns_zonemgr_managezone(dns_zonemgr_t *zmgr, dns_zone_t *zone) {
 
  cleanup_task:
 	isc_task_detach(&zone->task);
-	
+
  unlock:
 	UNLOCK(&zone->lock);
 	RWUNLOCK(&zmgr->rwlock, isc_rwlocktype_write);
@@ -4266,7 +4266,7 @@ dns_zonemgr_managezone(dns_zonemgr_t *zmgr, dns_zone_t *zone) {
 void
 dns_zonemgr_releasezone(dns_zonemgr_t *zmgr, dns_zone_t *zone) {
 	isc_boolean_t free_now = ISC_FALSE;
-	
+
 	REQUIRE(DNS_ZONE_VALID(zone));
 	REQUIRE(DNS_ZONEMGR_VALID(zmgr));
 	REQUIRE(zone->zmgr == zmgr);
@@ -4279,7 +4279,7 @@ dns_zonemgr_releasezone(dns_zonemgr_t *zmgr, dns_zone_t *zone) {
 	zmgr->refs--;
 	if (zmgr->refs == 0)
 		free_now = ISC_TRUE;
-	
+
 	UNLOCK(&zone->lock);
 	RWUNLOCK(&zmgr->rwlock, isc_rwlocktype_write);
 
@@ -4305,7 +4305,7 @@ void
 dns_zonemgr_detach(dns_zonemgr_t **zmgrp) {
 	dns_zonemgr_t *zmgr;
 	isc_boolean_t free_now = ISC_FALSE;
-	
+
 	REQUIRE(zmgrp != NULL);
 	zmgr = *zmgrp;
 	REQUIRE(DNS_ZONEMGR_VALID(zmgr));
@@ -4420,7 +4420,7 @@ static void
 zmgr_resume_xfrs(dns_zonemgr_t *zmgr) {
 	static char me[] = "zmgr_resume_xfrs";
 	dns_zone_t *zone;
-	
+
 	for (zone = ISC_LIST_HEAD(zmgr->waiting_for_xfrin);
 	     zone != NULL;
 	     zone = ISC_LIST_NEXT(zone, statelink))
@@ -4434,21 +4434,21 @@ zmgr_resume_xfrs(dns_zonemgr_t *zmgr) {
 			break;
 		} else if (result == ISC_R_QUOTA) {
 			/*
-			 * Not enough quota.  This is probably the per-server 
-			 * quota, because we only get called when a unit of 
-			 * global quota has just been freed.  Try the next 
+			 * Not enough quota.  This is probably the per-server
+			 * quota, because we only get called when a unit of
+			 * global quota has just been freed.  Try the next
 			 * zone, it may succeed if it uses another master.
 			 */
 			continue;
 		} else {
-			zone_log(zone, me, ISC_LOG_DEBUG(3), 
+			zone_log(zone, me, ISC_LOG_DEBUG(3),
 				 "starting zone transfer: %s",
 				 isc_result_totext(result));
 			break;
 		}
 	}
 }
-		
+
 /*
  * Try to start an incoming zone transfer for 'zone', quota permitting.
  *
@@ -4489,7 +4489,7 @@ zmgr_start_xfrin_ifquota(dns_zonemgr_t *zmgr, dns_zone_t *zone) {
 	if (peer != NULL)
 		(void)dns_peer_gettransfers(peer, &maxtransfersperns);
 
-	/* 
+	/*
 	 * Count the total number of transfers that are in progress,
 	 * and the number of transfers in progress from this master.
 	 * We linearly scan a list of all transfers; if this turns
@@ -4541,7 +4541,7 @@ zmgr_start_xfrin_ifquota(dns_zonemgr_t *zmgr, dns_zone_t *zone) {
 	zone->erefs++;
 	isc_task_send(zone->task, &e);
 	UNLOCK(&zone->lock);
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -4554,7 +4554,7 @@ dns_zonemgr_dbdestroyed(isc_task_t *task, isc_event_t *event) {
 	UNUSED(task);
 
 	isc_event_free(&event);
-	
+
 	isc_log_write(dns_lctx, DNS_LOGCATEGORY_GENERAL,
 		      DNS_LOGMODULE_ZONE, ISC_LOG_INFO,
 		      "database (%p) destroyed", (void*) db);
diff --git a/lib/dns/zoneconf.c b/lib/dns/zoneconf.c
index 9353903cf7..237bad5d2f 100644
--- a/lib/dns/zoneconf.c
+++ b/lib/dns/zoneconf.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zoneconf.c,v 1.50 2000/07/31 19:36:48 explorer Exp $ */
+/* $Id: zoneconf.c,v 1.51 2000/08/01 01:23:10 tale Exp $ */
 
 #include 
 
@@ -199,7 +199,7 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_c_view_t *cview,
 
 		} else
 			RETERR(dns_zone_setalsonotify(zone, NULL, 0));
-		
+
 		RETERR(configure_zone_acl(czone, cctx, cview, ac, zone,
 					  dns_c_zone_getallowtransfer,
 					  dns_c_view_gettransferacl,
@@ -219,10 +219,10 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_c_view_t *cview,
 		dns_zone_setmaxxfrout(zone, uintval);
 
 		result = dns_c_zone_getmaxtransidleout(czone, &uintval);
-		if (result != ISC_R_SUCCESS && cview != NULL) 
+		if (result != ISC_R_SUCCESS && cview != NULL)
 			result = dns_c_view_getmaxtransferidleout(cview,
 								  &uintval);
-		if (result != ISC_R_SUCCESS) 
+		if (result != ISC_R_SUCCESS)
 			result = dns_c_ctx_getmaxtransferidleout(cctx,
 								 &uintval);
 		if (result != ISC_R_SUCCESS)
@@ -280,13 +280,13 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_c_view_t *cview,
 #else /* NOMINUM_PUBLIC */
 			result = dns_zone_setmasters(zone, iplist->ips,
 						     iplist->nextidx);
-#endif /* NOMINUM_PUBLIC */		    
+#endif /* NOMINUM_PUBLIC */
 		else
 			result = dns_zone_setmasters(zone, NULL, 0);
 		RETERR(result);
 
 		result = dns_c_zone_getmaxtranstimein(czone, &uintval);
-		if (result != ISC_R_SUCCESS) 
+		if (result != ISC_R_SUCCESS)
 			result = dns_c_ctx_getmaxtransfertimein(cctx,
 								&uintval);
 		if (result != ISC_R_SUCCESS)
@@ -294,7 +294,7 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_c_view_t *cview,
 		dns_zone_setmaxxfrin(zone, uintval);
 
 		result = dns_c_zone_getmaxtransidlein(czone, &uintval);
-		if (result != ISC_R_SUCCESS) 
+		if (result != ISC_R_SUCCESS)
 			result = dns_c_ctx_getmaxtransferidlein(cctx,
 								&uintval);
 		if (result != ISC_R_SUCCESS)
@@ -312,10 +312,10 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_c_view_t *cview,
 		dns_zone_setxfrsource4(zone, &sockaddr);
 
 		result = dns_c_zone_gettransfersourcev6(czone, &sockaddr);
-		if (result != ISC_R_SUCCESS && cview != NULL) 
+		if (result != ISC_R_SUCCESS && cview != NULL)
 			result = dns_c_view_gettransfersourcev6(cview,
 								&sockaddr);
-		if (result != ISC_R_SUCCESS) 
+		if (result != ISC_R_SUCCESS)
 			result = dns_c_ctx_gettransfersourcev6(cctx,
 							       &sockaddr);
 		if (result != ISC_R_SUCCESS)
@@ -323,7 +323,7 @@ dns_zone_configure(dns_c_ctx_t *cctx, dns_c_view_t *cview,
 		dns_zone_setxfrsource6(zone, &sockaddr);
 
 		break;
-		
+
 	default:
 		break;
 	}
@@ -348,12 +348,12 @@ dns_zone_reusable(dns_zone_t *zone, dns_c_zone_t *czone) {
 
 	return (ISC_TRUE);
 }
-	
+
 isc_result_t
 dns_zonemgr_configure(dns_c_ctx_t *cctx, dns_zonemgr_t *zmgr) {
 	isc_uint32_t val;
 	isc_result_t result;
-	
+
 	result = dns_c_ctx_gettransfersin(cctx, &val);
 	if (result != ISC_R_SUCCESS)
 		val = 10;
diff --git a/lib/dns/zt.c b/lib/dns/zt.c
index cc02aa2a3d..1821520674 100644
--- a/lib/dns/zt.c
+++ b/lib/dns/zt.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zt.c,v 1.23 2000/07/27 09:46:54 tale Exp $ */
+/* $Id: zt.c,v 1.24 2000/08/01 01:23:12 tale Exp $ */
 
 #include 
 
@@ -181,7 +181,7 @@ dns_zt_detach(dns_zt_t **ztp) {
 	zt = *ztp;
 
 	RWLOCK(&zt->rwlock, isc_rwlocktype_write);
-	
+
 	INSIST(zt->references > 0);
 	zt->references--;
 	if (zt->references == 0)
@@ -260,7 +260,7 @@ dns_zt_apply(dns_zt_t *zt, isc_boolean_t stop,
 		/*
 		 * The tree is empty.
 		 */
-		result = ISC_R_NOMORE; 
+		result = ISC_R_NOMORE;
 	}
 	while (result == DNS_R_NEWORIGIN || result == ISC_R_SUCCESS) {
 		result = dns_rbtnodechain_current(&chain, NULL, NULL,
@@ -292,6 +292,6 @@ auto_detach(void *data, void *arg) {
 	dns_zone_t *zone = data;
 
 	UNUSED(arg);
-	
+
 	dns_zone_detach(&zone);
 }
diff --git a/lib/isc/Makefile.in b/lib/isc/Makefile.in
index 31d20b5530..dfc74eb435 100644
--- a/lib/isc/Makefile.in
+++ b/lib/isc/Makefile.in
@@ -1,9 +1,9 @@
 # Copyright (C) 1998-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
 # 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
@@ -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.63 2000/07/27 09:50:37 tale Exp $
+# $Id: Makefile.in,v 1.64 2000/08/01 01:29:12 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/isc/assertions.c b/lib/isc/assertions.c
index 73a64b145b..8011ca9d02 100644
--- a/lib/isc/assertions.c
+++ b/lib/isc/assertions.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1997-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: assertions.c,v 1.11 2000/07/27 09:50:38 tale Exp $ */
+/* $Id: assertions.c,v 1.12 2000/08/01 01:29:13 tale Exp $ */
 
 #include 
 
diff --git a/lib/isc/base64.c b/lib/isc/base64.c
index afd038387c..d595c171f3 100644
--- a/lib/isc/base64.c
+++ b/lib/isc/base64.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: base64.c,v 1.17 2000/07/27 09:50:40 tale Exp $ */
+/* $Id: base64.c,v 1.18 2000/08/01 01:29:14 tale Exp $ */
 
 #include 
 
@@ -106,7 +106,7 @@ isc_base64_tobuffer(isc_lex_t *lexer, isc_buffer_t *target, int length) {
 	char *s;
 	int n;
 
-	
+
 	while (!seen_end && (length != 0)) {
 		if (length > 0)
 			RETERR(gettoken(lexer, &token, isc_tokentype_string,
@@ -182,7 +182,7 @@ isc_base64_decodestring(isc_mem_t *mctx, char *cstr, isc_buffer_t *target) {
 	if (result == ISC_R_SUCCESS) {
 		isopen = ISC_TRUE;
 		result = isc_base64_tobuffer(lex, target, -1);
-	}	
+	}
 
 	if (isopen)
 		(void)isc_lex_close(lex);
diff --git a/lib/isc/bitstring.c b/lib/isc/bitstring.c
index c221f6e3e5..4f6a609ded 100644
--- a/lib/isc/bitstring.c
+++ b/lib/isc/bitstring.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: bitstring.c,v 1.6 2000/07/27 09:50:41 tale Exp $ */
+/* $Id: bitstring.c,v 1.7 2000/08/01 01:29:15 tale Exp $ */
 
 #include 
 
@@ -102,7 +102,7 @@ isc_bitstring_copy(isc_bitstring_t *source, unsigned int sbitpos,
 		tbitpos = PADDED(target->size) - tbitpos - 1;
 		REQUIRE(tbitpos >= n - 1);
 		tbitpos -= n - 1;
-	} else		
+	} else
 		REQUIRE(tlast<= target->size);
 
 	if (tlast > target->length)
diff --git a/lib/isc/buffer.c b/lib/isc/buffer.c
index afac1c2d11..1c43589e67 100644
--- a/lib/isc/buffer.c
+++ b/lib/isc/buffer.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: buffer.c,v 1.33 2000/07/27 09:50:42 tale Exp $ */
+/* $Id: buffer.c,v 1.34 2000/08/01 01:29:16 tale Exp $ */
 
 #include 
 
@@ -46,7 +46,7 @@ isc__buffer_invalidate(isc_buffer_t *b) {
 	REQUIRE(ISC_BUFFER_VALID(b));
 	REQUIRE(!ISC_LINK_LINKED(b, link));
 	REQUIRE(b->mctx == NULL);
-	
+
 	ISC__BUFFER_INVALIDATE(b);
 }
 
@@ -355,7 +355,7 @@ isc_buffer_copyregion(isc_buffer_t *b, isc_region_t *r) {
 	REQUIRE(r != NULL);
 
 	/*
-	 * XXXDCL 
+	 * XXXDCL
 	 */
 	base = isc_buffer_used(b);
 	available = isc_buffer_availablelength(b);
diff --git a/lib/isc/bufferlist.c b/lib/isc/bufferlist.c
index 979a049d60..73b91f30c0 100644
--- a/lib/isc/bufferlist.c
+++ b/lib/isc/bufferlist.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: bufferlist.c,v 1.10 2000/07/27 09:50:43 tale Exp $ */
+/* $Id: bufferlist.c,v 1.11 2000/08/01 01:29:18 tale Exp $ */
 
 #include 
 
diff --git a/lib/isc/commandline.c b/lib/isc/commandline.c
index 2fec57268d..62bda7accc 100644
--- a/lib/isc/commandline.c
+++ b/lib/isc/commandline.c
@@ -1,10 +1,10 @@
 /*
  * Portions Copyright (C) 1999, 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
  * 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
@@ -48,7 +48,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: commandline.c,v 1.9 2000/07/27 09:50:44 tale Exp $ */
+/* $Id: commandline.c,v 1.10 2000/08/01 01:29:19 tale Exp $ */
 
 /*
  * This file was adapted from the NetBSD project's source tree, RCS ID:
diff --git a/lib/isc/error.c b/lib/isc/error.c
index e3cb36aee9..3f58a57c50 100644
--- a/lib/isc/error.c
+++ b/lib/isc/error.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: error.c,v 1.12 2000/07/27 09:50:45 tale Exp $ */
+/* $Id: error.c,v 1.13 2000/08/01 01:29:20 tale Exp $ */
 
 #include 
 
diff --git a/lib/isc/event.c b/lib/isc/event.c
index d1a5d13bcd..b4420d2904 100644
--- a/lib/isc/event.c
+++ b/lib/isc/event.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: event.c,v 1.12 2000/07/27 09:50:46 tale Exp $ */
+/* $Id: event.c,v 1.13 2000/08/01 01:29:21 tale Exp $ */
 
 /*
  * Principal Author: Bob Halley
@@ -77,7 +77,7 @@ isc_event_allocate(isc_mem_t *mctx, void *sender, isc_eventtype_t type,
 void
 isc_event_free(isc_event_t **eventp) {
 	isc_event_t *event;
-	
+
 	REQUIRE(eventp != NULL);
 	event = *eventp;
 	REQUIRE(event != NULL);
diff --git a/lib/isc/fsaccess.c b/lib/isc/fsaccess.c
index 440613858a..a713d87966 100644
--- a/lib/isc/fsaccess.c
+++ b/lib/isc/fsaccess.c
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: fsaccess.c,v 1.3 2000/07/27 09:50:48 tale Exp $ */
+/* $Id: fsaccess.c,v 1.4 2000/08/01 01:29:22 tale Exp $ */
 
 /*
  * This file contains the OS-independent functionality of the API.
diff --git a/lib/isc/heap.c b/lib/isc/heap.c
index 39c3c41f5e..9c724f3d6d 100644
--- a/lib/isc/heap.c
+++ b/lib/isc/heap.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1997-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: heap.c,v 1.25 2000/07/27 09:50:49 tale Exp $ */
+/* $Id: heap.c,v 1.26 2000/08/01 01:29:23 tale Exp $ */
 
 /*
  * Heap implementation of priority queues adapted from the following:
@@ -94,7 +94,7 @@ isc_heap_create(isc_mem_t *mctx, isc_heapcompare_t compare,
 	heap->index = index;
 
 	*heapp = heap;
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -128,7 +128,7 @@ resize(isc_heap_t *heap) {
 		return (ISC_FALSE);
 	if (heap->array != NULL) {
 		memcpy(new_array, heap->array, heap->size * sizeof (void *));
-		isc_mem_put(heap->mctx, heap->array, 
+		isc_mem_put(heap->mctx, heap->array,
 			    heap->size * sizeof (void *));
 	}
 	heap->size = new_size;
@@ -141,7 +141,7 @@ static void
 float_up(isc_heap_t *heap, unsigned int i, void *elt) {
 	unsigned int p;
 
-	for (p = heap_parent(i); 
+	for (p = heap_parent(i);
 	     i > 1 && heap->compare(elt, heap->array[p]);
 	     i = p, p = heap_parent(i)) {
 		heap->array[i] = heap->array[p];
@@ -189,7 +189,7 @@ isc_heap_insert(isc_heap_t *heap, void *elt) {
 	i = ++heap->last;
 	if (heap->last >= heap->size && !resize(heap))
 		return (ISC_R_NOMEMORY);
-	
+
 	float_up(heap, i, elt);
 
 	return (ISC_R_SUCCESS);
@@ -220,7 +220,7 @@ void
 isc_heap_increased(isc_heap_t *heap, unsigned int i) {
 	REQUIRE(VALID_HEAP(heap));
 	REQUIRE(i >= 1 && i <= heap->last);
-	
+
 	float_up(heap, i, heap->array[i]);
 }
 
@@ -228,7 +228,7 @@ void
 isc_heap_decreased(isc_heap_t *heap, unsigned int i) {
 	REQUIRE(VALID_HEAP(heap));
 	REQUIRE(i >= 1 && i <= heap->last);
-	
+
 	sink_down(heap, i, heap->array[i]);
 }
 
diff --git a/lib/isc/hmacmd5.c b/lib/isc/hmacmd5.c
index 78cebb5936..3341ba4fb0 100644
--- a/lib/isc/hmacmd5.c
+++ b/lib/isc/hmacmd5.c
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: hmacmd5.c,v 1.3 2000/07/27 09:50:50 tale Exp $ */
+/* $Id: hmacmd5.c,v 1.4 2000/08/01 01:29:24 tale Exp $ */
 
 /*
  * This code implements the HMAC-MD5 keyed hash algorithm
diff --git a/lib/isc/include/Makefile.in b/lib/isc/include/Makefile.in
index 4e5b2f3696..ccab7ff158 100644
--- a/lib/isc/include/Makefile.in
+++ b/lib/isc/include/Makefile.in
@@ -1,9 +1,9 @@
 # Copyright (C) 1998-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
 # 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
@@ -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.8 2000/07/27 09:51:22 tale Exp $
+# $Id: Makefile.in,v 1.9 2000/08/01 01:29:56 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/isc/include/isc/Makefile.in b/lib/isc/include/isc/Makefile.in
index f61fd946e9..1cb186beca 100644
--- a/lib/isc/include/isc/Makefile.in
+++ b/lib/isc/include/isc/Makefile.in
@@ -1,9 +1,9 @@
 # Copyright (C) 1998-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
 # 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
@@ -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.41 2000/07/27 09:51:23 tale Exp $
+# $Id: Makefile.in,v 1.42 2000/08/01 01:29:57 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/isc/include/isc/assertions.h b/lib/isc/include/isc/assertions.h
index 7ab563ef09..fbe31be275 100644
--- a/lib/isc/include/isc/assertions.h
+++ b/lib/isc/include/isc/assertions.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1997-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
  * 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
@@ -16,7 +16,7 @@
  */
 
 /*
- * $Id: assertions.h,v 1.12 2000/07/27 09:51:24 tale Exp $
+ * $Id: assertions.h,v 1.13 2000/08/01 01:29:58 tale Exp $
  */
 
 #ifndef ISC_ASSERTIONS_H
diff --git a/lib/isc/include/isc/base64.h b/lib/isc/include/isc/base64.h
index 18973c01cb..b8b7a0a061 100644
--- a/lib/isc/include/isc/base64.h
+++ b/lib/isc/include/isc/base64.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: base64.h,v 1.11 2000/07/27 09:51:25 tale Exp $ */
+/* $Id: base64.h,v 1.12 2000/08/01 01:29:59 tale Exp $ */
 
 #ifndef ISC_BASE64_H
 #define ISC_BASE64_H 1
@@ -36,7 +36,7 @@ isc_base64_totext(isc_region_t *source, int wordlength,
  * Convert data into base64 encoded text.
  *
  * Notes:
- *	The base64 encoded text in 'target' will be divided into 
+ *	The base64 encoded text in 'target' will be divided into
  *	words of at most 'wordlength' characters, separated by
  * 	the 'wordbreak' string.  No parentheses will surround
  *	the text.
@@ -85,7 +85,7 @@ isc_base64_tobuffer(isc_lex_t *lexer, isc_buffer_t *target, int length);
  *	'length' is an integer
  *
  * Ensures:
- *	target will contain the data represented by the base64 encoded 
+ *	target will contain the data represented by the base64 encoded
  *	string parsed by the lexer.  No more than length bytes will be read,
  *	if length is positive.  The 'used' pointer in target will be
  *	advanced as necessary.
diff --git a/lib/isc/include/isc/bitstring.h b/lib/isc/include/isc/bitstring.h
index cc215dca35..ed798a7e62 100644
--- a/lib/isc/include/isc/bitstring.h
+++ b/lib/isc/include/isc/bitstring.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: bitstring.h,v 1.4 2000/07/27 09:51:26 tale Exp $ */
+/* $Id: bitstring.h,v 1.5 2000/08/01 01:30:00 tale Exp $ */
 
 #ifndef ISC_BITSTRING_H
 #define ISC_BITSTRING_H 1
diff --git a/lib/isc/include/isc/boolean.h b/lib/isc/include/isc/boolean.h
index 9e09395a6e..4d53ff9b88 100644
--- a/lib/isc/include/isc/boolean.h
+++ b/lib/isc/include/isc/boolean.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: boolean.h,v 1.10 2000/07/27 09:51:27 tale Exp $ */
+/* $Id: boolean.h,v 1.11 2000/08/01 01:30:01 tale Exp $ */
 
 #ifndef ISC_BOOLEAN_H
 #define ISC_BOOLEAN_H 1
diff --git a/lib/isc/include/isc/buffer.h b/lib/isc/include/isc/buffer.h
index 77ce1a05c0..963e74d56e 100644
--- a/lib/isc/include/isc/buffer.h
+++ b/lib/isc/include/isc/buffer.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: buffer.h,v 1.34 2000/07/27 09:51:28 tale Exp $ */
+/* $Id: buffer.h,v 1.35 2000/08/01 01:30:02 tale Exp $ */
 
 #ifndef ISC_BUFFER_H
 #define ISC_BUFFER_H 1
@@ -237,7 +237,7 @@ isc__buffer_invalidate(isc_buffer_t *b);
  *	If assertion checking is enabled, future attempts to use 'b' without
  *	calling isc_buffer_init() on it will cause an assertion failure.
  */
-		
+
 void
 isc__buffer_region(isc_buffer_t *b, isc_region_t *r);
 /*
diff --git a/lib/isc/include/isc/bufferlist.h b/lib/isc/include/isc/bufferlist.h
index 1e3de3a557..92f8f2ae2c 100644
--- a/lib/isc/include/isc/bufferlist.h
+++ b/lib/isc/include/isc/bufferlist.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: bufferlist.h,v 1.8 2000/07/27 09:51:30 tale Exp $ */
+/* $Id: bufferlist.h,v 1.9 2000/08/01 01:30:04 tale Exp $ */
 
 #ifndef ISC_BUFFERLIST_H
 #define ISC_BUFFERLIST_H 1
diff --git a/lib/isc/include/isc/commandline.h b/lib/isc/include/isc/commandline.h
index e15ad658b8..4171ff8ef0 100644
--- a/lib/isc/include/isc/commandline.h
+++ b/lib/isc/include/isc/commandline.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: commandline.h,v 1.5 2000/07/27 09:51:31 tale Exp $ */
+/* $Id: commandline.h,v 1.6 2000/08/01 01:30:05 tale Exp $ */
 
 #ifndef ISC_COMMANDLINE_H
 #define ISC_COMMANDLINE_H 1
diff --git a/lib/isc/include/isc/entropy.h b/lib/isc/include/isc/entropy.h
index 2542a61e1e..375bb90495 100644
--- a/lib/isc/include/isc/entropy.h
+++ b/lib/isc/include/isc/entropy.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: entropy.h,v 1.20 2000/07/27 09:51:32 tale Exp $ */
+/* $Id: entropy.h,v 1.21 2000/08/01 01:30:06 tale Exp $ */
 
 #ifndef ISC_ENTROPY_H
 #define ISC_ENTROPY_H 1
@@ -27,7 +27,7 @@
 /*
  * Entropy
  *
- * The entropy API 
+ * The entropy API
  *
  * MP:
  *	The entropy object is locked internally.  All callbacks into
diff --git a/lib/isc/include/isc/error.h b/lib/isc/include/isc/error.h
index 9b7c8abc37..3eb2840051 100644
--- a/lib/isc/include/isc/error.h
+++ b/lib/isc/include/isc/error.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: error.h,v 1.11 2000/07/27 09:51:33 tale Exp $ */
+/* $Id: error.h,v 1.12 2000/08/01 01:30:07 tale Exp $ */
 
 #ifndef ISC_ERROR_H
 #define ISC_ERROR_H 1
diff --git a/lib/isc/include/isc/event.h b/lib/isc/include/isc/event.h
index 4bffeaf640..274f6de723 100644
--- a/lib/isc/include/isc/event.h
+++ b/lib/isc/include/isc/event.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: event.h,v 1.21 2000/07/27 09:51:34 tale Exp $ */
+/* $Id: event.h,v 1.22 2000/08/01 01:30:08 tale Exp $ */
 
 #ifndef ISC_EVENT_H
 #define ISC_EVENT_H 1
@@ -52,7 +52,7 @@ typedef void (*isc_eventdestructor_t)(isc_event_t *);
  * The ISC_EVENTATTR_CANCELED attribute is intended to indicate
  * that an event is delivered as a result of a canceled operation
  * rather than successful completion, by mutual agreement
- * between the sender and receiver.  It is not set or used by 
+ * between the sender and receiver.  It is not set or used by
  * the task system.
  */
 #define ISC_EVENTATTR_CANCELED		0x00000002
@@ -70,11 +70,11 @@ do { \
 	(event)->ev_destroy_arg = (da); \
 	ISC_LINK_INIT((event), ev_link); \
 } while (0)
-	
+
 /*
  * This structure is public because "subclassing" it may be useful when
  * defining new event types.
- */ 
+ */
 struct isc_event {
 	ISC_EVENT_COMMON(struct isc_event);
 };
diff --git a/lib/isc/include/isc/eventclass.h b/lib/isc/include/isc/eventclass.h
index ff9457c439..8d1ebad7bb 100644
--- a/lib/isc/include/isc/eventclass.h
+++ b/lib/isc/include/isc/eventclass.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: eventclass.h,v 1.10 2000/07/27 09:51:35 tale Exp $ */
+/* $Id: eventclass.h,v 1.11 2000/08/01 01:30:09 tale Exp $ */
 
 #ifndef ISC_EVENTCLASS_H
 #define ISC_EVENTCLASS_H 1
diff --git a/lib/isc/include/isc/file.h b/lib/isc/include/isc/file.h
index 85d24009e5..a2ea5c6ed9 100644
--- a/lib/isc/include/isc/file.h
+++ b/lib/isc/include/isc/file.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: file.h,v 1.8 2000/07/27 09:51:36 tale Exp $ */
+/* $Id: file.h,v 1.9 2000/08/01 01:30:10 tale Exp $ */
 
 #ifndef ISC_FILE_H
 #define ISC_FILE_H 1
@@ -60,7 +60,7 @@ isc_file_getmodtime(const char *file, isc_time_t *time);
  *		Hardware error interacting with the filesystem.
  *	ISC_R_UNEXPECTED
  *		Something totally unexpected happened.
- *	
+ *
  */
 
 isc_result_t
@@ -100,7 +100,7 @@ isc_result_t
 isc_file_openunique(char *templet, FILE **fp);
 /*
  * Create and open a file with a unique name based on 'templet'.
- * 
+ *
  * Notes:
  *	'template' is a reserved work in C++.  If you want to complain
  *	about the spelling of 'templet', first look it up in the
diff --git a/lib/isc/include/isc/formatcheck.h b/lib/isc/include/isc/formatcheck.h
index 19795f6dbb..ffb8aa9dd8 100644
--- a/lib/isc/include/isc/formatcheck.h
+++ b/lib/isc/include/isc/formatcheck.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: formatcheck.h,v 1.4 2000/07/27 09:51:37 tale Exp $ */
+/* $Id: formatcheck.h,v 1.5 2000/08/01 01:30:11 tale Exp $ */
 
 #ifndef ISC_FORMATCHECK_H
 #define ISC_FORMATCHECK_H 1
diff --git a/lib/isc/include/isc/fsaccess.h b/lib/isc/include/isc/fsaccess.h
index 76e28f9ea1..16d383cfbe 100644
--- a/lib/isc/include/isc/fsaccess.h
+++ b/lib/isc/include/isc/fsaccess.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: fsaccess.h,v 1.5 2000/07/27 09:51:38 tale Exp $ */
+/* $Id: fsaccess.h,v 1.6 2000/08/01 01:30:12 tale Exp $ */
 
 #ifndef ISC_FSACCESS_H
 #define ISC_FSACCESS_H 1
@@ -38,7 +38,7 @@
  * in BIND9, and so resolving how to handle the various incompatibilities has
  * been a purely theoretical exercise with no operational experience to
  * indicate how flawed the thinking may be.
- * 
+ *
  * Some of the more notable dumbing down of NT for this API includes:
  *
  *   o Each of FILE_READ_DATA and FILE_READ_EA are set with ISC_FSACCESS_READ.
@@ -92,7 +92,7 @@
  *
  * The Windows standard access right "DELETE" doesn't have a direct
  * equivalent in the Unix world, so it isn't clear what should be done
- * with it. 
+ * with it.
  *
  * The Unix sticky bit is not supported.  While NT does have a concept
  * of allowing users to create files in a directory but not delete or
diff --git a/lib/isc/include/isc/heap.h b/lib/isc/include/isc/heap.h
index e633be9de3..b7a8c60aea 100644
--- a/lib/isc/include/isc/heap.h
+++ b/lib/isc/include/isc/heap.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1997-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: heap.h,v 1.14 2000/07/27 09:51:39 tale Exp $ */
+/* $Id: heap.h,v 1.15 2000/08/01 01:30:14 tale Exp $ */
 
 #ifndef ISC_HEAP_H
 #define ISC_HEAP_H 1
@@ -25,7 +25,7 @@
 
 ISC_LANG_BEGINDECLS
 
-/* 
+/*
  * The comparision function returns ISC_TRUE if the first argument has
  * higher priority than the second argument, and ISC_FALSE otherwise.
  */
diff --git a/lib/isc/include/isc/hmacmd5.h b/lib/isc/include/isc/hmacmd5.h
index 7a175e33e3..31f1abfcc9 100644
--- a/lib/isc/include/isc/hmacmd5.h
+++ b/lib/isc/include/isc/hmacmd5.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: hmacmd5.h,v 1.2 2000/07/27 09:51:40 tale Exp $ */
+/* $Id: hmacmd5.h,v 1.3 2000/08/01 01:30:15 tale Exp $ */
 
 /*
  * This is the header file for the HMAC-MD5 keyed hash algorithm
diff --git a/lib/isc/include/isc/interfaceiter.h b/lib/isc/include/isc/interfaceiter.h
index ebd83efac3..a09835f1ba 100644
--- a/lib/isc/include/isc/interfaceiter.h
+++ b/lib/isc/include/isc/interfaceiter.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: interfaceiter.h,v 1.8 2000/07/27 09:51:42 tale Exp $ */
+/* $Id: interfaceiter.h,v 1.9 2000/08/01 01:30:16 tale Exp $ */
 
 #ifndef ISC_INTERFACEITER_H
 #define ISC_INTERFACEITER_H 1
@@ -52,7 +52,7 @@
 
 struct isc_interface {
 	char name[32];			/* Interface name, null-terminated. */
-	unsigned int af;		/* Address family. */ 
+	unsigned int af;		/* Address family. */
 	isc_netaddr_t address;		/* Local address. */
 	isc_netaddr_t netmask;		/* Network mask. */
 	isc_netaddr_t dstaddress; 	/* Destination address
@@ -93,7 +93,7 @@ isc_interfaceiter_first(isc_interfaceiter_t *iter);
  *	ISC_R_SUCCESS		Success.
  *	ISC_R_NOMORE		There are no interfaces.
  */
-     
+
 isc_result_t
 isc_interfaceiter_current(isc_interfaceiter_t *iter,
 			  isc_interface_t *ifdata);
@@ -108,7 +108,7 @@ isc_interfaceiter_current(isc_interfaceiter_t *iter,
  * Returns:
  *	ISC_R_SUCCESS		Success.
  */
-     
+
 isc_result_t
 isc_interfaceiter_next(isc_interfaceiter_t *iter);
 /*
diff --git a/lib/isc/include/isc/ipv6.h b/lib/isc/include/isc/ipv6.h
index 09ff86b22e..65680c4764 100644
--- a/lib/isc/include/isc/ipv6.h
+++ b/lib/isc/include/isc/ipv6.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ipv6.h,v 1.15 2000/07/27 09:51:43 tale Exp $ */
+/* $Id: ipv6.h,v 1.16 2000/08/01 01:30:17 tale Exp $ */
 
 #ifndef ISC_IPV6_H
 #define ISC_IPV6_H 1
diff --git a/lib/isc/include/isc/lang.h b/lib/isc/include/isc/lang.h
index f90008f149..e35a9d795d 100644
--- a/lib/isc/include/isc/lang.h
+++ b/lib/isc/include/isc/lang.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lang.h,v 1.4 2000/07/27 09:51:44 tale Exp $ */
+/* $Id: lang.h,v 1.5 2000/08/01 01:30:18 tale Exp $ */
 
 #ifndef ISC_LANG_H
 #define ISC_LANG_H 1
diff --git a/lib/isc/include/isc/lex.h b/lib/isc/include/isc/lex.h
index a29ed1271b..7fe8ae7ce4 100644
--- a/lib/isc/include/isc/lex.h
+++ b/lib/isc/include/isc/lex.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lex.h,v 1.21 2000/07/27 09:51:45 tale Exp $ */
+/* $Id: lex.h,v 1.22 2000/08/01 01:30:19 tale Exp $ */
 
 #ifndef ISC_LEX_H
 #define ISC_LEX_H 1
@@ -209,7 +209,7 @@ isc_lex_setspecials(isc_lex_t *lex, isc_lexspecials_t specials);
  * whitespace, they delimit strings and numbers.
  *
  * Note:
- *	Comment processing takes precedence over special character	
+ *	Comment processing takes precedence over special character
  *	recognition.
  *
  * Requires:
diff --git a/lib/isc/include/isc/lfsr.h b/lib/isc/include/isc/lfsr.h
index bbd243d3d3..9935929220 100644
--- a/lib/isc/include/isc/lfsr.h
+++ b/lib/isc/include/isc/lfsr.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lfsr.h,v 1.7 2000/07/27 09:51:46 tale Exp $ */
+/* $Id: lfsr.h,v 1.8 2000/08/01 01:30:20 tale Exp $ */
 
 #ifndef ISC_LFSR_H
 #define ISC_LFSR_H 1
diff --git a/lib/isc/include/isc/lib.h b/lib/isc/include/isc/lib.h
index d7821cfe8f..acf28c0b16 100644
--- a/lib/isc/include/isc/lib.h
+++ b/lib/isc/include/isc/lib.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lib.h,v 1.4 2000/07/27 09:51:47 tale Exp $ */
+/* $Id: lib.h,v 1.5 2000/08/01 01:30:21 tale Exp $ */
 
 #ifndef ISC_LIB_H
 #define ISC_LIB_H 1
diff --git a/lib/isc/include/isc/list.h b/lib/isc/include/isc/list.h
index e5a5c7d2ad..a97d655d96 100644
--- a/lib/isc/include/isc/list.h
+++ b/lib/isc/include/isc/list.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1997-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: list.h,v 1.12 2000/07/27 09:51:48 tale Exp $ */
+/* $Id: list.h,v 1.13 2000/08/01 01:30:22 tale Exp $ */
 
 #ifndef ISC_LIST_H
 #define ISC_LIST_H 1
diff --git a/lib/isc/include/isc/log.h b/lib/isc/include/isc/log.h
index 52c46a572c..d0d815a8f6 100644
--- a/lib/isc/include/isc/log.h
+++ b/lib/isc/include/isc/log.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log.h,v 1.27 2000/07/27 09:51:49 tale Exp $ */
+/* $Id: log.h,v 1.28 2000/08/01 01:30:23 tale Exp $ */
 
 #ifndef ISC_LOG_H
 #define ISC_LOG_H 1
@@ -157,7 +157,7 @@ isc_log_create(isc_mem_t *mctx, isc_log_t **lctxp, isc_logconfig_t **lcfgp);
  * Ensures:
  *	*lctxp will point to a valid logging context if all of the necessary
  *	memory was allocated, or NULL otherwise.
- *	*lcfgp will point to a valid logging configuration if all of the 
+ *	*lcfgp will point to a valid logging configuration if all of the
  *	necessary memory was allocated, or NULL otherwise.
  *	On failure, no additional memory is allocated.
  *
@@ -470,7 +470,7 @@ isc_log_usechannel(isc_logconfig_t *lcfg, const char *name,
  *
  * Requires:
  *	lcfg is a valid logging configuration.
- *	
+ *
  *	category is NULL or has an id that is in the range of known ids.
  *
  *	module is NULL or has an id that is in the range of known ids.
@@ -622,7 +622,7 @@ isc_log_getdebuglevel(isc_log_t *lctx);
  *
  * Requires:
  *	lctx is a valid logging context.
- *	
+ *
  * Ensures:
  *	The current logging debugging level is returned.
  */
@@ -784,7 +784,7 @@ isc_logcategory_t *
 isc_log_categorybyname(isc_log_t *lctx, const char *name);
 /*
  * Find a category by its name.
- * 
+ *
  * Notes:
  *	The string name of a category is not required to be unique.
  *
@@ -802,7 +802,7 @@ isc_logmodule_t *
 isc_log_modulebyname(isc_log_t *lctx, const char *name);
 /*
  * Find a module by its name.
- * 
+ *
  * Notes:
  *	The string name of a module is not required to be unique.
  *
diff --git a/lib/isc/include/isc/magic.h b/lib/isc/include/isc/magic.h
index 4c11b36416..3405373d7c 100644
--- a/lib/isc/include/isc/magic.h
+++ b/lib/isc/include/isc/magic.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: magic.h,v 1.9 2000/07/27 09:51:50 tale Exp $ */
+/* $Id: magic.h,v 1.10 2000/08/01 01:30:25 tale Exp $ */
 
 #ifndef ISC_MAGIC_H
 #define ISC_MAGIC_H 1
diff --git a/lib/isc/include/isc/md5.h b/lib/isc/include/isc/md5.h
index 34b1730376..e2f5f527ba 100644
--- a/lib/isc/include/isc/md5.h
+++ b/lib/isc/include/isc/md5.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: md5.h,v 1.6 2000/07/27 09:51:51 tale Exp $ */
+/* $Id: md5.h,v 1.7 2000/08/01 01:30:26 tale Exp $ */
 
 /*
  * This is the header file for the MD5 message-digest algorithm.
diff --git a/lib/isc/include/isc/mem.h b/lib/isc/include/isc/mem.h
index 6498e2f30e..5e1d77fe3b 100644
--- a/lib/isc/include/isc/mem.h
+++ b/lib/isc/include/isc/mem.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1997-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mem.h,v 1.39 2000/07/27 09:51:53 tale Exp $ */
+/* $Id: mem.h,v 1.40 2000/08/01 01:30:27 tale Exp $ */
 
 #ifndef ISC_MEM_H
 #define ISC_MEM_H 1
diff --git a/lib/isc/include/isc/msgcat.h b/lib/isc/include/isc/msgcat.h
index 8b378828e2..cd7cbed6dd 100644
--- a/lib/isc/include/isc/msgcat.h
+++ b/lib/isc/include/isc/msgcat.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: msgcat.h,v 1.6 2000/07/27 09:51:54 tale Exp $ */
+/* $Id: msgcat.h,v 1.7 2000/08/01 01:30:28 tale Exp $ */
 
 #ifndef ISC_MSGCAT_H
 #define ISC_MSGCAT_H 1
diff --git a/lib/isc/include/isc/mutexblock.h b/lib/isc/include/isc/mutexblock.h
index 5ade63a2f2..3931d3cf33 100644
--- a/lib/isc/include/isc/mutexblock.h
+++ b/lib/isc/include/isc/mutexblock.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mutexblock.h,v 1.8 2000/07/27 09:51:55 tale Exp $ */
+/* $Id: mutexblock.h,v 1.9 2000/08/01 01:30:29 tale Exp $ */
 
 #ifndef ISC_MUTEXBLOCK_H
 #define ISC_MUTEXBLOCK_H 1
diff --git a/lib/isc/include/isc/netaddr.h b/lib/isc/include/isc/netaddr.h
index 185ca63085..9cc2d0e313 100644
--- a/lib/isc/include/isc/netaddr.h
+++ b/lib/isc/include/isc/netaddr.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: netaddr.h,v 1.14 2000/07/27 09:51:56 tale Exp $ */
+/* $Id: netaddr.h,v 1.15 2000/08/01 01:30:30 tale Exp $ */
 
 #ifndef ISC_NETADDR_H
 #define ISC_NETADDR_H 1
@@ -63,7 +63,7 @@ isc_result_t
 isc_netaddr_totext(const isc_netaddr_t *netaddr, isc_buffer_t *target);
 /*
  * Append a text representation of 'sockaddr' to the buffer 'target'.
- * The text is NOT null terminated.  Handles IPv4 and IPv6 addresses.  
+ * The text is NOT null terminated.  Handles IPv4 and IPv6 addresses.
  *
  * Returns:
  *	ISC_R_SUCCESS
diff --git a/lib/isc/include/isc/ondestroy.h b/lib/isc/include/isc/ondestroy.h
index 595c89628a..30d867a48b 100644
--- a/lib/isc/include/isc/ondestroy.h
+++ b/lib/isc/include/isc/ondestroy.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ondestroy.h,v 1.5 2000/07/27 09:51:57 tale Exp $ */
+/* $Id: ondestroy.h,v 1.6 2000/08/01 01:30:31 tale Exp $ */
 
 #ifndef ISC_ONDESTROY_H
 #define ISC_ONDESTROY_H 1
@@ -30,7 +30,7 @@ ISC_LANG_BEGINDECLS
  *
  * Any class ``X'' of objects that wants to send out notifications
  * on its destruction should declare a field of type isc_ondestroy_t
- * (call it 'ondest'). 
+ * (call it 'ondest').
  *
  * 	typedef struct {
  * 		...
@@ -41,14 +41,14 @@ ISC_LANG_BEGINDECLS
  * When an object ``A'' of type X is created
  * it must initialize the field ondest with a call to
  *
- * 	isc_ondestroy_init(&A->ondest). 
+ * 	isc_ondestroy_init(&A->ondest).
  *
  * X should also provide a registration function for third-party
  * objects to call to register their interest in being told about
  * the destruction of a particular instance of X.
  *
  *	isc_result_t
- * 	X_ondestroy(X *instance, isc_task_t *task, 
+ * 	X_ondestroy(X *instance, isc_task_t *task,
  * 		     isc_event_t **eventp) {
  * 		return(isc_ondestroy_register(&instance->ondest, task,eventp));
  * 	}
diff --git a/lib/isc/include/isc/os.h b/lib/isc/include/isc/os.h
index c66c977139..45a86bbb33 100644
--- a/lib/isc/include/isc/os.h
+++ b/lib/isc/include/isc/os.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: os.h,v 1.3 2000/07/27 09:51:58 tale Exp $ */
+/* $Id: os.h,v 1.4 2000/08/01 01:30:32 tale Exp $ */
 
 #ifndef ISC_OS_H
 #define ISC_OS_H 1
diff --git a/lib/isc/include/isc/platform.h.in b/lib/isc/include/isc/platform.h.in
index 0f012840f1..d99e229509 100644
--- a/lib/isc/include/isc/platform.h.in
+++ b/lib/isc/include/isc/platform.h.in
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: platform.h.in,v 1.13 2000/07/27 09:51:59 tale Exp $ */
+/* $Id: platform.h.in,v 1.14 2000/08/01 01:30:33 tale Exp $ */
 
 #ifndef ISC_PLATFORM_H
 #define ISC_PLATFORM_H 1
diff --git a/lib/isc/include/isc/print.h b/lib/isc/include/isc/print.h
index b52eef105a..1c6fb69747 100644
--- a/lib/isc/include/isc/print.h
+++ b/lib/isc/include/isc/print.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: print.h,v 1.9 2000/07/27 09:52:00 tale Exp $ */
+/* $Id: print.h,v 1.10 2000/08/01 01:30:34 tale Exp $ */
 
 #ifndef ISC_PRINT_H
 #define ISC_PRINT_H 1
diff --git a/lib/isc/include/isc/quota.h b/lib/isc/include/isc/quota.h
index 1d64e2637b..8e4e3c5b61 100644
--- a/lib/isc/include/isc/quota.h
+++ b/lib/isc/include/isc/quota.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: quota.h,v 1.6 2000/07/27 09:52:01 tale Exp $ */
+/* $Id: quota.h,v 1.7 2000/08/01 01:30:36 tale Exp $ */
 
 #ifndef ISC_QUOTA_H
 #define ISC_QUOTA_H 1
@@ -58,7 +58,7 @@ struct isc_quota {
 isc_result_t
 isc_quota_init(isc_quota_t *quota, int max);
 /*
- * Initialize a quota object. 
+ * Initialize a quota object.
  *
  * Returns:
  * 	ISC_R_SUCCESS
diff --git a/lib/isc/include/isc/random.h b/lib/isc/include/isc/random.h
index 234aa543cd..65a318d170 100644
--- a/lib/isc/include/isc/random.h
+++ b/lib/isc/include/isc/random.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: random.h,v 1.6 2000/07/27 09:52:02 tale Exp $ */
+/* $Id: random.h,v 1.7 2000/08/01 01:30:37 tale Exp $ */
 
 #ifndef ISC_RANDOM_H
 #define ISC_RANDOM_H 1
diff --git a/lib/isc/include/isc/ratelimiter.h b/lib/isc/include/isc/ratelimiter.h
index 610648c84e..e366ced986 100644
--- a/lib/isc/include/isc/ratelimiter.h
+++ b/lib/isc/include/isc/ratelimiter.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ratelimiter.h,v 1.11 2000/07/27 09:52:04 tale Exp $ */
+/* $Id: ratelimiter.h,v 1.12 2000/08/01 01:30:38 tale Exp $ */
 
 #ifndef ISC_RATELIMITER_H
 #define ISC_RATELIMITER_H 1
@@ -26,7 +26,7 @@
 
 /*
  * A rate limiter is a mechanism for dispatching events at a limited
- * rate.  This is intended to be used when sending zone maintenance 
+ * rate.  This is intended to be used when sending zone maintenance
  * SOA queries, NOTIFY messages, etc.
  */
 
@@ -82,7 +82,7 @@ isc_ratelimiter_enqueue(isc_ratelimiter_t *rl, isc_task_t *task,
  * Requires:
  *	An interval has been set by calling
  *	isc_ratelimiter_setinterval().
- * 	
+ *
  *	'task' to be non NULL.
  *	'(*eventp)->ev_sender' to be NULL.
  */
diff --git a/lib/isc/include/isc/region.h b/lib/isc/include/isc/region.h
index d0757618e8..e28cb32d2d 100644
--- a/lib/isc/include/isc/region.h
+++ b/lib/isc/include/isc/region.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: region.h,v 1.13 2000/07/27 09:52:05 tale Exp $ */
+/* $Id: region.h,v 1.14 2000/08/01 01:30:39 tale Exp $ */
 
 #ifndef ISC_REGION_H
 #define ISC_REGION_H 1
diff --git a/lib/isc/include/isc/result.h b/lib/isc/include/isc/result.h
index f4db1de3f0..06c7f9f049 100644
--- a/lib/isc/include/isc/result.h
+++ b/lib/isc/include/isc/result.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: result.h,v 1.46 2000/07/27 09:52:06 tale Exp $ */
+/* $Id: result.h,v 1.47 2000/08/01 01:30:40 tale Exp $ */
 
 #ifndef ISC_RESULT_H
 #define ISC_RESULT_H 1
diff --git a/lib/isc/include/isc/resultclass.h b/lib/isc/include/isc/resultclass.h
index 1197341dc8..abe1ec4634 100644
--- a/lib/isc/include/isc/resultclass.h
+++ b/lib/isc/include/isc/resultclass.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resultclass.h,v 1.8 2000/07/27 09:52:07 tale Exp $ */
+/* $Id: resultclass.h,v 1.9 2000/08/01 01:30:41 tale Exp $ */
 
 #ifndef ISC_RESULTCLASS_H
 #define ISC_RESULTCLASS_H 1
diff --git a/lib/isc/include/isc/rwlock.h b/lib/isc/include/isc/rwlock.h
index b677bde0f4..a304390150 100644
--- a/lib/isc/include/isc/rwlock.h
+++ b/lib/isc/include/isc/rwlock.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rwlock.h,v 1.12 2000/07/27 09:52:08 tale Exp $ */
+/* $Id: rwlock.h,v 1.13 2000/08/01 01:30:42 tale Exp $ */
 
 #ifndef ISC_RWLOCK_H
 #define ISC_RWLOCK_H 1
diff --git a/lib/isc/include/isc/serial.h b/lib/isc/include/isc/serial.h
index 1a8546aeef..0bcbfe42ee 100644
--- a/lib/isc/include/isc/serial.h
+++ b/lib/isc/include/isc/serial.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: serial.h,v 1.7 2000/07/27 09:52:09 tale Exp $ */
+/* $Id: serial.h,v 1.8 2000/08/01 01:30:43 tale Exp $ */
 
 #ifndef ISC_SERIAL_H
 #define ISC_SERIAL_H 1
diff --git a/lib/isc/include/isc/sha1.h b/lib/isc/include/isc/sha1.h
index 697a0b18f3..52068ba5da 100644
--- a/lib/isc/include/isc/sha1.h
+++ b/lib/isc/include/isc/sha1.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -18,7 +18,7 @@
 #ifndef ISC_SHA1_H
 #define ISC_SHA1_H 1
 
-/* $Id: sha1.h,v 1.6 2000/07/27 09:52:10 tale Exp $ */
+/* $Id: sha1.h,v 1.7 2000/08/01 01:30:44 tale Exp $ */
 
 /*	$NetBSD: sha1.h,v 1.2 1998/05/29 22:55:44 thorpej Exp $	*/
 
@@ -35,10 +35,10 @@
 
 typedef struct {
 	isc_uint32_t state[5];
-	isc_uint32_t count[2];  
+	isc_uint32_t count[2];
 	unsigned char buffer[64];
 } isc_sha1_t;
-  
+
 ISC_LANG_BEGINDECLS
 
 void
diff --git a/lib/isc/include/isc/sockaddr.h b/lib/isc/include/isc/sockaddr.h
index 6fa9b3664c..43b6c5bc21 100644
--- a/lib/isc/include/isc/sockaddr.h
+++ b/lib/isc/include/isc/sockaddr.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sockaddr.h,v 1.31 2000/07/27 09:52:11 tale Exp $ */
+/* $Id: sockaddr.h,v 1.32 2000/08/01 01:30:45 tale Exp $ */
 
 #ifndef ISC_SOCKADDR_H
 #define ISC_SOCKADDR_H 1
diff --git a/lib/isc/include/isc/socket.h b/lib/isc/include/isc/socket.h
index 669562d64c..e1c2068b84 100644
--- a/lib/isc/include/isc/socket.h
+++ b/lib/isc/include/isc/socket.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.h,v 1.48 2000/07/27 09:52:12 tale Exp $ */
+/* $Id: socket.h,v 1.49 2000/08/01 01:30:47 tale Exp $ */
 
 #ifndef ISC_SOCKET_H
 #define ISC_SOCKET_H 1
@@ -238,7 +238,7 @@ isc_socket_cancel(isc_socket_t *sock, isc_task_t *task,
  *	Cancel pending isc_socket_connect() call.
  */
 
-void 
+void
 isc_socket_shutdown(isc_socket_t *sock, unsigned int how);
 /*
  * Shutdown 'socket' according to 'how'.
@@ -278,7 +278,7 @@ isc_socket_attach(isc_socket_t *sock, isc_socket_t **socketp);
  *	*socketp is attached to socket.
  */
 
-void 
+void
 isc_socket_detach(isc_socket_t **socketp);
 /*
  * Detach *socketp from its socket.
@@ -630,7 +630,7 @@ isc_socketmgr_destroy(isc_socketmgr_t **managerp);
  * Destroy a socket manager.
  *
  * Notes:
- *	
+ *
  *	This routine blocks until there are no sockets left in the manager,
  *	so if the caller holds any socket references using the manager, it
  *	must detach them before calling isc_socketmgr_destroy() or it will
diff --git a/lib/isc/include/isc/stdio.h b/lib/isc/include/isc/stdio.h
index 6fa05288a7..d69290885b 100644
--- a/lib/isc/include/isc/stdio.h
+++ b/lib/isc/include/isc/stdio.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: stdio.h,v 1.4 2000/07/27 09:52:13 tale Exp $ */
+/* $Id: stdio.h,v 1.5 2000/08/01 01:30:48 tale Exp $ */
 
 #ifndef ISC_STDIO_H
 #define ISC_STDIO_H 1
diff --git a/lib/isc/include/isc/string.h b/lib/isc/include/isc/string.h
index 7227fd8d59..2bf687c527 100644
--- a/lib/isc/include/isc/string.h
+++ b/lib/isc/include/isc/string.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: string.h,v 1.7 2000/07/27 09:52:14 tale Exp $ */
+/* $Id: string.h,v 1.8 2000/08/01 01:30:49 tale Exp $ */
 
 #ifndef ISC_STRING_H
 #define ISC_STRING_H 1
@@ -32,10 +32,10 @@ isc_uint64_t
 isc_string_touint64(char *source, char **endp, int base);
 /*
  * Convert the string pointed to by 'source' to isc_uint64_t.
- * 
+ *
  * On successful conversion 'endp' points to the first character
  * after conversion is complete.
- * 
+ *
  * 'base': 0 or 2..36
  *
  * If base is 0 the base is computed from the string type.
@@ -45,7 +45,7 @@ isc_string_touint64(char *source, char **endp, int base);
 
 
 char *
-isc_string_separate(char **stringp, const char *delim); 
+isc_string_separate(char **stringp, const char *delim);
 
 #ifdef ISC_PLATFORM_NEEDSTRSEP
 #define strsep isc_string_separate
diff --git a/lib/isc/include/isc/symtab.h b/lib/isc/include/isc/symtab.h
index ce39722cb6..eab9b289a5 100644
--- a/lib/isc/include/isc/symtab.h
+++ b/lib/isc/include/isc/symtab.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1996-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: symtab.h,v 1.13 2000/07/27 09:52:16 tale Exp $ */
+/* $Id: symtab.h,v 1.14 2000/08/01 01:30:50 tale Exp $ */
 
 #ifndef ISC_SYMTAB_H
 #define ISC_SYMTAB_H 1
diff --git a/lib/isc/include/isc/task.h b/lib/isc/include/isc/task.h
index 9eac6aae1f..bfa0055f28 100644
--- a/lib/isc/include/isc/task.h
+++ b/lib/isc/include/isc/task.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: task.h,v 1.46 2000/07/27 09:52:17 tale Exp $ */
+/* $Id: task.h,v 1.47 2000/08/01 01:30:51 tale Exp $ */
 
 #ifndef ISC_TASK_H
 #define ISC_TASK_H 1
@@ -230,7 +230,7 @@ isc_task_purgerange(isc_task_t *task, void *sender, isc_eventtype_t first,
  *	Events in the event queue of 'task' whose sender is 'sender', whose
  *	type is >= first and <= last, and whose tag is 'tag' will be purged,
  *	unless they are marked as unpurgable.
- *	
+ *
  *	A sender of NULL will match any sender.  A NULL tag matches any
  *	tag.
  *
@@ -320,7 +320,7 @@ isc_task_unsendrange(isc_task_t *task, void *sender, isc_eventtype_t first,
  *	Events in the event queue of 'task' whose sender is 'sender', whose
  *	type is >= first and <= last, and whose tag is 'tag' will be dequeued
  *	and appended to *events.
- *	
+ *
  *	A sender of NULL will match any sender.  A NULL tag matches any
  *	tag.
  *
diff --git a/lib/isc/include/isc/taskpool.h b/lib/isc/include/isc/taskpool.h
index a35f8bb876..8556cda1bd 100644
--- a/lib/isc/include/isc/taskpool.h
+++ b/lib/isc/include/isc/taskpool.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: taskpool.h,v 1.5 2000/07/27 09:52:18 tale Exp $ */
+/* $Id: taskpool.h,v 1.6 2000/08/01 01:30:52 tale Exp $ */
 
 #ifndef ISC_TASKPOOL_H
 #define ISC_TASKPOOL_H 1
@@ -27,14 +27,14 @@
 /*
  * Task Pool
  *
- * A task pool is a mechanism for sharing a small number of tasks 
+ * A task pool is a mechanism for sharing a small number of tasks
  * among a large number of objects such that each object is
  * assigned a unique task, but each task may be shared by several
  * objects.
  *
- * Task pools are used to let objects that can exist in large 
+ * Task pools are used to let objects that can exist in large
  * numbers (e.g., zones) use tasks for synchronization without
- * the memory overhead and unfair scheduling competition that 
+ * the memory overhead and unfair scheduling competition that
  * could result from creating a separate task for each object.
  */
 
@@ -65,7 +65,7 @@ isc_taskpool_create(isc_taskmgr_t *tmgr, isc_mem_t *mctx,
 /*
  * Create a task pool of "ntasks" tasks, each with quantum
  * "quantum".
- * 
+ *
  * Requires:
  *
  *	'tmgr' is a valid task manager.
diff --git a/lib/isc/include/isc/timer.h b/lib/isc/include/isc/timer.h
index b6f447e975..4990fc4c7f 100644
--- a/lib/isc/include/isc/timer.h
+++ b/lib/isc/include/isc/timer.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: timer.h,v 1.26 2000/07/27 09:52:19 tale Exp $ */
+/* $Id: timer.h,v 1.27 2000/08/01 01:30:53 tale Exp $ */
 
 #ifndef ISC_TIMER_H
 #define ISC_TIMER_H 1
@@ -41,7 +41,7 @@
  *	'inactive' timers generate no events.
  *
  * Timers can change type.  It is typical to create a timer as
- * an 'inactive' timer and then change it into a 'ticker' or 
+ * an 'inactive' timer and then change it into a 'ticker' or
  * 'once' timer.
  *
  * MP:
@@ -245,7 +245,7 @@ isc_timer_attach(isc_timer_t *timer, isc_timer_t **timerp);
  *	*timerp is attached to timer.
  */
 
-void 
+void
 isc_timer_detach(isc_timer_t **timerp);
 /*
  * Detach *timerp from its timer.
@@ -305,7 +305,7 @@ isc_timermgr_destroy(isc_timermgr_t **managerp);
  * Destroy a timer manager.
  *
  * Notes:
- *	
+ *
  *	This routine blocks until there are no timers left in the manager,
  *	so if the caller holds any timer references using the manager, it
  *	must detach them before calling isc_timermgr_destroy() or it will
diff --git a/lib/isc/include/isc/types.h b/lib/isc/include/isc/types.h
index b84fb8855b..f05afe4baa 100644
--- a/lib/isc/include/isc/types.h
+++ b/lib/isc/include/isc/types.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: types.h,v 1.28 2000/07/27 09:52:20 tale Exp $ */
+/* $Id: types.h,v 1.29 2000/08/01 01:30:54 tale Exp $ */
 
 #ifndef ISC_TYPES_H
 #define ISC_TYPES_H 1
diff --git a/lib/isc/include/isc/util.h b/lib/isc/include/isc/util.h
index 0c0e9a6a0b..e5d2aa3f55 100644
--- a/lib/isc/include/isc/util.h
+++ b/lib/isc/include/isc/util.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: util.h,v 1.14 2000/07/27 09:52:21 tale Exp $ */
+/* $Id: util.h,v 1.15 2000/08/01 01:30:55 tale Exp $ */
 
 #ifndef ISC_UTIL_H
 #define ISC_UTIL_H 1
diff --git a/lib/isc/inet_aton.c b/lib/isc/inet_aton.c
index cf44a6d8b8..bcb6714810 100644
--- a/lib/isc/inet_aton.c
+++ b/lib/isc/inet_aton.c
@@ -1,10 +1,10 @@
 /*
  * Portions Copyright (C) 1996-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
  * 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
@@ -18,7 +18,7 @@
 /*
  * Copyright (c) 1983, 1990, 1993
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,7 +34,7 @@
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -50,14 +50,14 @@
 
 /*
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * 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, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -70,7 +70,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)inet_addr.c	8.1 (Berkeley) 6/17/93";
-static char rcsid[] = "$Id: inet_aton.c,v 1.13 2000/07/27 09:50:51 tale Exp $";
+static char rcsid[] = "$Id: inet_aton.c,v 1.14 2000/08/01 01:29:25 tale Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include 
@@ -81,7 +81,7 @@ static char rcsid[] = "$Id: inet_aton.c,v 1.13 2000/07/27 09:50:51 tale Exp $";
 #include 
 #include 
 
-/* 
+/*
  * Check whether "cp" is a valid ascii representation
  * of an Internet address and convert to a binary address.
  * Returns 1 if the address is valid, 0 if not.
diff --git a/lib/isc/inet_ntop.c b/lib/isc/inet_ntop.c
index 1fbacf54f9..84f613a011 100644
--- a/lib/isc/inet_ntop.c
+++ b/lib/isc/inet_ntop.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1996-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
  * 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
@@ -17,7 +17,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char rcsid[] =
-	"$Id: inet_ntop.c,v 1.8 2000/07/27 09:50:52 tale Exp $";
+	"$Id: inet_ntop.c,v 1.9 2000/08/01 01:29:26 tale Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include 
@@ -38,7 +38,7 @@ static char rcsid[] =
 
 static const char *inet_ntop4(const unsigned char *src, char *dst,
 			      size_t size);
-				  
+
 #ifdef AF_INET6
 static const char *inet_ntop6(const unsigned char *src, char *dst,
 			      size_t size);
@@ -175,7 +175,7 @@ inet_ntop6(const unsigned char *src, char *dst, size_t size)
 		tp += sprintf(tp, "%x", words[i]);
 	}
 	/* Was it a trailing run of 0x00's? */
-	if (best.base != -1 && (best.base + best.len) == 
+	if (best.base != -1 && (best.base + best.len) ==
 	    (NS_IN6ADDRSZ / NS_INT16SZ))
 		*tp++ = ':';
 	*tp++ = '\0';
diff --git a/lib/isc/inet_pton.c b/lib/isc/inet_pton.c
index 939201c70e..4cccf1e3fb 100644
--- a/lib/isc/inet_pton.c
+++ b/lib/isc/inet_pton.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1996-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
  * 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
@@ -17,7 +17,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char rcsid[] =
-	"$Id: inet_pton.c,v 1.7 2000/07/27 09:50:53 tale Exp $";
+	"$Id: inet_pton.c,v 1.8 2000/08/01 01:29:28 tale Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include 
diff --git a/lib/isc/lex.c b/lib/isc/lex.c
index 41b43c1f70..b259294c80 100644
--- a/lib/isc/lex.c
+++ b/lib/isc/lex.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lex.c,v 1.34 2000/07/27 09:50:54 tale Exp $ */
+/* $Id: lex.c,v 1.35 2000/08/01 01:29:29 tale Exp $ */
 
 #include 
 
@@ -90,7 +90,7 @@ isc_lex_create(isc_mem_t *mctx, size_t max_token, isc_lex_t **lexp) {
 	/*
 	 * Create a lexer.
 	 */
-	
+
 	REQUIRE(lexp != NULL && *lexp == NULL);
 	REQUIRE(max_token > 0);
 
@@ -111,7 +111,7 @@ isc_lex_create(isc_mem_t *mctx, size_t max_token, isc_lex_t **lexp) {
 	memset(lex->specials, 0, 256);
 	INIT_LIST(lex->sources);
 	lex->magic = LEX_MAGIC;
-	
+
 	*lexp = lex;
 
 	return (ISC_R_SUCCESS);
@@ -229,7 +229,7 @@ isc_lex_openfile(isc_lex_t *lex, const char *filename) {
 		return (result);
 
 	flockfile(stream);
-	
+
 	return (new_source(lex, ISC_TRUE, ISC_TRUE, stream, filename));
 }
 
@@ -279,7 +279,7 @@ isc_lex_close(isc_lex_t *lex) {
 	source = HEAD(lex->sources);
 	if (source == NULL)
 		return (ISC_R_NOMORE);
-	
+
 	UNLINK(lex->sources, source, link);
 	if (source->is_file) {
 		funlockfile((FILE *)(source->input));
@@ -306,7 +306,7 @@ typedef enum {
 
 #define IWSEOL (ISC_LEXOPT_INITIALWS | ISC_LEXOPT_EOL)
 
-static void 
+static void
 pushback(inputsource *source, int c) {
 	INSIST(source->char_count < 2);
 	source->chars[source->char_count++] = c;
@@ -404,7 +404,7 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) {
 
 		if (c == '\n')
 			source->line++;
-		
+
 		if (lex->comment_ok && !no_comments) {
 			if (!escaped && c == ';' &&
 			    ((lex->comments & ISC_LEXCOMMENT_DNSMASTERFILE)
@@ -534,7 +534,7 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) {
 						v = &(tokenp->value);
 						v->as_textregion.base =
 							lex->data;
-						v->as_textregion.length = 
+						v->as_textregion.length =
 							lex->max_token -
 							remaining;
 					}
@@ -566,7 +566,7 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) {
 				pushback(source, c);
 				tokenp->type = isc_tokentype_string;
 				tokenp->value.as_textregion.base = lex->data;
-				tokenp->value.as_textregion.length = 
+				tokenp->value.as_textregion.length =
 					lex->max_token - remaining;
 				done = ISC_TRUE;
 				continue;
@@ -647,7 +647,7 @@ isc_lex_gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *tokenp) {
 					tokenp->type = isc_tokentype_qstring;
 					tokenp->value.as_textregion.base =
 						lex->data;
-					tokenp->value.as_textregion.length = 
+					tokenp->value.as_textregion.length =
 						lex->max_token - remaining;
 					no_comments = ISC_FALSE;
 					done = ISC_TRUE;
@@ -693,7 +693,7 @@ isc_lex_ungettoken(isc_lex_t *lex, isc_token_t *tokenp) {
 	REQUIRE(source != NULL);
 	REQUIRE(!source->have_token);
 	REQUIRE(tokenp != NULL);
-	
+
 	source->token = *tokenp;
 	source->have_token = ISC_TRUE;
 }
diff --git a/lib/isc/lfsr.c b/lib/isc/lfsr.c
index 860eb64434..f98147d373 100644
--- a/lib/isc/lfsr.c
+++ b/lib/isc/lfsr.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lfsr.c,v 1.9 2000/07/27 09:50:55 tale Exp $ */
+/* $Id: lfsr.c,v 1.10 2000/08/01 01:29:30 tale Exp $ */
 
 #include 
 
diff --git a/lib/isc/lib.c b/lib/isc/lib.c
index 418da9cac4..0fbbf74693 100644
--- a/lib/isc/lib.c
+++ b/lib/isc/lib.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lib.c,v 1.5 2000/07/27 09:50:57 tale Exp $ */
+/* $Id: lib.c,v 1.6 2000/08/01 01:29:31 tale Exp $ */
 
 #include 
 
diff --git a/lib/isc/log.c b/lib/isc/log.c
index 1a61c2efa5..c612afabad 100644
--- a/lib/isc/log.c
+++ b/lib/isc/log.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log.c,v 1.41 2000/07/27 09:50:58 tale Exp $ */
+/* $Id: log.c,v 1.42 2000/08/01 01:29:32 tale Exp $ */
 
 /* Principal Authors: DCL */
 
@@ -262,7 +262,7 @@ isc_log_create(isc_mem_t *mctx, isc_log_t **lctxp, isc_logconfig_t **lcfgp) {
 		lctx->debug_level = 0;
 
 		ISC_LIST_INIT(lctx->messages);
-		
+
 		RUNTIME_CHECK(isc_mutex_init(&lctx->lock) == ISC_R_SUCCESS);
 
 		/*
@@ -290,7 +290,7 @@ isc_log_create(isc_mem_t *mctx, isc_log_t **lctxp, isc_logconfig_t **lcfgp) {
 		*lctxp = lctx;
 		if (lcfgp != NULL)
 			*lcfgp = lcfg;
-	
+
 	} else
 		if (lctx != NULL)
 			isc_log_destroy(&lctx);
@@ -523,7 +523,7 @@ isc_logconfig_destroy(isc_logconfig_t **lcfgp) {
 
 	lcfg->dynamic = ISC_FALSE;
 	if (lcfg->tag != NULL)
-		isc_mem_free(lcfg->lctx->mctx, lcfg->tag);	
+		isc_mem_free(lcfg->lctx->mctx, lcfg->tag);
 	lcfg->tag = NULL;
 	lcfg->highest_level = 0;
 	lcfg->duplicate_interval = 0;
@@ -738,7 +738,7 @@ isc_log_createchannel(isc_logconfig_t *lcfg, const char *name,
 		isc_mem_put(mctx, channel, sizeof(*channel));
 		return (ISC_R_UNEXPECTED);
 	}
-	
+
 	ISC_LIST_PREPEND(lcfg->channels, channel, link);
 
 	/*
@@ -888,7 +888,7 @@ isc_log_getduplicateinterval(isc_logconfig_t *lcfg) {
 isc_result_t
 isc_log_settag(isc_logconfig_t *lcfg, const char *tag) {
 	REQUIRE(VALID_CONFIG(lcfg));
-	
+
 	if (tag != NULL && *tag != '\0') {
 		lcfg->tag = isc_mem_strdup(lcfg->lctx->mctx, tag);
 		if (lcfg->tag == NULL)
@@ -992,7 +992,7 @@ sync_channellist(isc_logconfig_t *lcfg) {
 	unsigned int bytes;
 	isc_log_t *lctx;
 	void *lists;
-	
+
 	REQUIRE(VALID_CONFIG(lcfg));
 
 	lctx = lcfg->lctx;
@@ -1104,7 +1104,7 @@ roll_log(isc_logchannel_t *channel) {
 	 * Since the highest number is one less than FILE_VERSIONS(channel)
 	 * when not doing infinite log rolling, greatest will need to be
 	 * decremented when it is equal to -- or greater than --
-	 * FILE_VERSIONS(channel).  When greatest is less than 
+	 * FILE_VERSIONS(channel).  When greatest is less than
 	 * FILE_VERSIONS(channel), it is already suitable for use as
 	 * the maximum version number.
 	 */
@@ -1205,7 +1205,7 @@ isc_log_wouldlog(isc_log_t *lctx, int level) {
 	 * messages that the debug level is not high enough to print.
 	 *
 	 * If the level is (mathematically) less than or equal to the
-	 * highest_level, or if there is a dynamic channel and the level is 
+	 * highest_level, or if there is a dynamic channel and the level is
 	 * less than or equal to the debug level, the main loop must be
 	 * entered to see if the message should really be output.
 	 *
@@ -1218,7 +1218,7 @@ isc_log_wouldlog(isc_log_t *lctx, int level) {
 
 	if (lctx == NULL)
 		return (ISC_FALSE);
-	
+
 	return (ISC_TF(level <= lctx->logconfig->highest_level ||
 		       (lctx->logconfig->dynamic &&
 			level <= lctx->debug_level)));
@@ -1300,7 +1300,7 @@ isc_log_doit(isc_log_t *lctx, isc_logcategory_t *category,
 			 * default channel.
 			 */
 			category_channels = &default_channel;
- 
+
 		if (category_channels->module != NULL &&
 		    category_channels->module != module) {
 			category_channels = ISC_LIST_NEXT(category_channels,
@@ -1422,7 +1422,7 @@ isc_log_doit(isc_log_t *lctx, isc_logcategory_t *category,
 						 *
 						 * Setting the interval to be
 						 * to be longer will obviously
-						 * not cause the expired 
+						 * not cause the expired
 						 * message to spring back into
 						 * existence.
 						 */
diff --git a/lib/isc/md5.c b/lib/isc/md5.c
index 3dcd1a0b81..17e46579de 100644
--- a/lib/isc/md5.c
+++ b/lib/isc/md5.c
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: md5.c,v 1.7 2000/07/27 09:50:59 tale Exp $ */
+/* $Id: md5.c,v 1.8 2000/08/01 01:29:33 tale Exp $ */
 
 /*
  * This code implements the MD5 message-digest algorithm.
@@ -214,7 +214,7 @@ isc_md5_update(isc_md5_t *ctx, const unsigned char *buf, unsigned int len) {
 }
 
 /*
- * Final wrapup - pad to 64-byte boundary with the bit pattern 
+ * Final wrapup - pad to 64-byte boundary with the bit pattern
  * 1 0* (64-bit count of bits processed, MSB-first)
  */
 void
diff --git a/lib/isc/mem.c b/lib/isc/mem.c
index 50501945cb..b1df780eeb 100644
--- a/lib/isc/mem.c
+++ b/lib/isc/mem.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1997-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mem.c,v 1.57 2000/07/27 23:31:20 explorer Exp $ */
+/* $Id: mem.c,v 1.58 2000/08/01 01:29:34 tale Exp $ */
 
 #include 
 
@@ -424,7 +424,7 @@ more_frags(isc_mem_t *ctx, size_t new_size) {
 			 * hit the quota for this context.
 			 */
 			/*
-			 * XXXRTH  "At quota" notification here. 
+			 * XXXRTH  "At quota" notification here.
 			 */
 			/*
 			 * Maybe we can split one of our existing
@@ -490,7 +490,7 @@ mem_getunlocked(isc_mem_t *ctx, size_t size) {
 		goto done;
 	}
 
-	/* 
+	/*
 	 * If there are no blocks in the free list for this size, get a chunk
 	 * of memory and then break it up into "new_size"-sized blocks, adding
 	 * them to the free list.
@@ -504,7 +504,7 @@ mem_getunlocked(isc_mem_t *ctx, size_t size) {
 	ret = ctx->freelists[new_size];
 	ctx->freelists[new_size] = ctx->freelists[new_size]->next;
 
-	/* 
+	/*
 	 * The stats[] uses the _actual_ "size" requested by the
 	 * caller, with the caveat (in the code above) that "size" >= the
 	 * max. size (max_size) ends up getting recorded as a call to
@@ -558,7 +558,7 @@ mem_putunlocked(isc_mem_t *ctx, void *mem, size_t size) {
 	((element *)mem)->next = ctx->freelists[new_size];
 	ctx->freelists[new_size] = (element *)mem;
 
-	/* 
+	/*
 	 * The stats[] uses the _actual_ "size" requested by the
 	 * caller, with the caveat (in the code above) that "size" >= the
 	 * max. size (max_size) ends up getting recorded as a call to
@@ -694,7 +694,7 @@ destroy(isc_mem_t *ctx) {
 		memset(ctx->basic_table[i], 0x0,
 		       NUM_BASIC_BLOCKS * ctx->mem_target);
 #endif
-	
+
 
 	for (i = 0; i < ctx->basic_table_count; i++)
 		(ctx->memfree)(ctx->arg, ctx->basic_table[i]);
@@ -774,7 +774,7 @@ isc_mem_destroy(isc_mem_t **ctxp) {
 isc_result_t
 isc_mem_ondestroy(isc_mem_t *ctx, isc_task_t *task, isc_event_t **event) {
 	isc_result_t res;
-	
+
 	LOCK(&ctx->lock);
 	res = isc_ondestroy_register(&ctx->ondestroy, task, event);
 	UNLOCK(&ctx->lock);
@@ -787,7 +787,7 @@ isc_result_t
 isc_mem_restore(isc_mem_t *ctx) {
 	isc_result_t result;
 
-	result = isc_mutex_init(&ctx->lock); 
+	result = isc_mutex_init(&ctx->lock);
 	if (result != ISC_R_SUCCESS)
 		ctx->magic = 0;
 
@@ -852,7 +852,7 @@ isc_mem_preallocate(isc_mem_t *ctx) {
 		}
 		mem_putunlocked(ctx, ptr, i);
 	}
-		
+
 	UNLOCK(&ctx->lock);
 
 	return (result);
@@ -1015,7 +1015,7 @@ isc__mem_strdup(isc_mem_t *mctx, const char *s FLARG) {
 
 	if (ns != NULL)
 		strncpy(ns, s, len + 1);
-	
+
 	return (ns);
 }
 
@@ -1246,7 +1246,7 @@ isc_mempool_destroy(isc_mempool_t **mpctxp) {
 	 * Remove our linked list entry from the memory context.
 	 */
 	ISC_LIST_UNLINK(mctx->pools, mpctx, link);
-	
+
 	mpctx->magic = 0;
 
 	mem_putunlocked(mpctx->mctx, mpctx, sizeof(isc_mempool_t));
diff --git a/lib/isc/mutexblock.c b/lib/isc/mutexblock.c
index 7f8659393c..d57066d2bc 100644
--- a/lib/isc/mutexblock.c
+++ b/lib/isc/mutexblock.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mutexblock.c,v 1.9 2000/07/27 09:51:01 tale Exp $ */
+/* $Id: mutexblock.c,v 1.10 2000/08/01 01:29:35 tale Exp $ */
 
 #include 
 
diff --git a/lib/isc/netaddr.c b/lib/isc/netaddr.c
index f14e185345..0bf067c6e7 100644
--- a/lib/isc/netaddr.c
+++ b/lib/isc/netaddr.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: netaddr.c,v 1.11 2000/07/27 09:51:02 tale Exp $ */
+/* $Id: netaddr.c,v 1.12 2000/08/01 01:29:37 tale Exp $ */
 
 #include 
 
@@ -59,12 +59,12 @@ isc_netaddr_eqprefix(const isc_netaddr_t *a, const isc_netaddr_t *b,
 	unsigned int ipabytes; /* Length of whole IP address in bytes */
 	unsigned int nbytes;   /* Number of significant whole bytes */
 	unsigned int nbits;    /* Number of significant leftover bits */
-	
+
 	REQUIRE(a != NULL && b != NULL);
 
 	if (a->family != b->family)
 		return (ISC_FALSE);
-	
+
 	switch (a->family) {
 	case AF_INET:
 		pa = (const unsigned char *) &a->type.in;
@@ -125,7 +125,7 @@ isc_netaddr_totext(const isc_netaddr_t *netaddr, isc_buffer_t *target) {
 
 	if (alen > isc_buffer_availablelength(target))
 		return (ISC_R_NOSPACE);
-	    
+
 	isc_buffer_putmem(target, (unsigned char *)abuf, alen);
 
 	return (ISC_R_SUCCESS);
@@ -148,7 +148,7 @@ isc_netaddr_format(isc_netaddr_t *na, char *array, unsigned int size) {
 		else
 			result = ISC_R_NOSPACE;
 	}
-		
+
 	if (result != ISC_R_SUCCESS) {
 		snprintf(array, size,
 			 "",
@@ -161,7 +161,7 @@ isc_result_t
 isc_netaddr_masktoprefixlen(const isc_netaddr_t *s, unsigned int *lenp) {
 	unsigned int nbits, nbytes, ipbytes, i;
 	const unsigned char *p;
-	
+
 	switch (s->family) {
 	case AF_INET:
 		p = (const unsigned char *) &s->type.in;
diff --git a/lib/isc/nls/Makefile.in b/lib/isc/nls/Makefile.in
index 5967f9bb1f..d48bb85f01 100644
--- a/lib/isc/nls/Makefile.in
+++ b/lib/isc/nls/Makefile.in
@@ -1,9 +1,9 @@
 # Copyright (C) 1999, 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
 # 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
@@ -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.9 2000/07/27 09:52:23 tale Exp $
+# $Id: Makefile.in,v 1.10 2000/08/01 01:30:57 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/isc/nls/msgcat.c b/lib/isc/nls/msgcat.c
index 91e48bf500..f9600c6027 100644
--- a/lib/isc/nls/msgcat.c
+++ b/lib/isc/nls/msgcat.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: msgcat.c,v 1.7 2000/07/27 09:52:24 tale Exp $ */
+/* $Id: msgcat.c,v 1.8 2000/08/01 01:30:58 tale Exp $ */
 
 /*
  * Principal Author: Bob Halley
diff --git a/lib/isc/ondestroy.c b/lib/isc/ondestroy.c
index 79b762f136..ea6064a8e2 100644
--- a/lib/isc/ondestroy.c
+++ b/lib/isc/ondestroy.c
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ondestroy.c,v 1.8 2000/07/27 09:51:03 tale Exp $ */
+/* $Id: ondestroy.c,v 1.9 2000/08/01 01:29:38 tale Exp $ */
 
 #include 
 
@@ -54,7 +54,7 @@ isc_ondestroy_register(isc_ondestroy_t *ondest, isc_task_t *task,
 	isc_task_attach(task, &thetask);
 
 	theevent->ev_sender = thetask;
-	
+
 	ISC_LIST_APPEND(ondest->events, theevent, ev_link);
 
 	return (ISC_R_SUCCESS);
@@ -64,7 +64,7 @@ void
 isc_ondestroy_notify(isc_ondestroy_t *ondest, void *sender) {
 	isc_event_t *eventp;
 	isc_task_t *task;
-	
+
 	REQUIRE(VALID_ONDESTROY(ondest));
 
 	eventp = ISC_LIST_HEAD(ondest->events);
@@ -73,11 +73,11 @@ isc_ondestroy_notify(isc_ondestroy_t *ondest, void *sender) {
 
 		task = eventp->ev_sender;
 		eventp->ev_sender = sender;
-		
+
 		isc_task_sendanddetach(&task, &eventp);
 
 		eventp = ISC_LIST_HEAD(ondest->events);
 	}
 }
 
-	
+
diff --git a/lib/isc/print.c b/lib/isc/print.c
index 522efc5f71..7d7c02e5e7 100644
--- a/lib/isc/print.c
+++ b/lib/isc/print.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: print.c,v 1.12 2000/07/27 09:51:05 tale Exp $ */
+/* $Id: print.c,v 1.13 2000/08/01 01:29:39 tale Exp $ */
 
 #include 
 
@@ -83,7 +83,7 @@ isc_print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
 	long double ldbl;
 #endif
 	char fmt[32];
-	
+
 	INSIST(str != NULL);
 	INSIST(format != NULL);
 
@@ -141,7 +141,7 @@ isc_print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
 			char *e;
 			width = strtoul(format, &e, 10);
 			format = e;
-		} 
+		}
 
 		/*
 		 * Precision.
@@ -380,7 +380,7 @@ isc_print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
 					size--;
 					pad--;
 				}
-			if (precision != 0) 
+			if (precision != 0)
 				while (precision > 0 && *cp != '\0' &&
 				       size > 1) {
 					*str++ = *cp++;
@@ -406,7 +406,7 @@ isc_print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
 				if (left) {
 					*str++ = c;
 					size--;
-				} 
+				}
 				while (width-- > 0 && size > 1) {
 					*str++ = ' ';
 					size--;
@@ -497,7 +497,7 @@ isc_print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
 			 *
 			 * precisions > 324 don't make much sence.
 			 * if we cap the precision at 512 we will not
-			 * overflow buf. 
+			 * overflow buf.
 			 */
 			if (precision > 512)
 				precision = 512;
diff --git a/lib/isc/pthreads/Makefile.in b/lib/isc/pthreads/Makefile.in
index a8e1bcaec5..800998808b 100644
--- a/lib/isc/pthreads/Makefile.in
+++ b/lib/isc/pthreads/Makefile.in
@@ -1,9 +1,9 @@
 # Copyright (C) 1998-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
 # 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
@@ -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.13 2000/07/27 09:52:25 tale Exp $
+# $Id: Makefile.in,v 1.14 2000/08/01 01:30:59 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/isc/pthreads/condition.c b/lib/isc/pthreads/condition.c
index 1f71d9cf9b..a72d69772f 100644
--- a/lib/isc/pthreads/condition.c
+++ b/lib/isc/pthreads/condition.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: condition.c,v 1.23 2000/07/27 09:52:26 tale Exp $ */
+/* $Id: condition.c,v 1.24 2000/08/01 01:31:00 tale Exp $ */
 
 #include 
 
diff --git a/lib/isc/pthreads/include/Makefile.in b/lib/isc/pthreads/include/Makefile.in
index 7d64aa2c8d..57d11ac279 100644
--- a/lib/isc/pthreads/include/Makefile.in
+++ b/lib/isc/pthreads/include/Makefile.in
@@ -1,9 +1,9 @@
 # Copyright (C) 1998-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
 # 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
@@ -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.9 2000/07/27 09:52:28 tale Exp $
+# $Id: Makefile.in,v 1.10 2000/08/01 01:31:03 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/isc/pthreads/include/isc/Makefile.in b/lib/isc/pthreads/include/isc/Makefile.in
index 0ad55a306a..c174c6f63e 100644
--- a/lib/isc/pthreads/include/isc/Makefile.in
+++ b/lib/isc/pthreads/include/isc/Makefile.in
@@ -1,9 +1,9 @@
 # Copyright (C) 1998-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
 # 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
@@ -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.10 2000/07/27 09:52:30 tale Exp $
+# $Id: Makefile.in,v 1.11 2000/08/01 01:31:04 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/isc/pthreads/include/isc/condition.h b/lib/isc/pthreads/include/isc/condition.h
index b5681bc60b..4c5a6c49ba 100644
--- a/lib/isc/pthreads/include/isc/condition.h
+++ b/lib/isc/pthreads/include/isc/condition.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: condition.h,v 1.17 2000/07/27 09:52:31 tale Exp $ */
+/* $Id: condition.h,v 1.18 2000/08/01 01:31:05 tale Exp $ */
 
 #ifndef ISC_CONDITION_H
 #define ISC_CONDITION_H 1
diff --git a/lib/isc/pthreads/include/isc/mutex.h b/lib/isc/pthreads/include/isc/mutex.h
index dd129206bc..269122b6d8 100644
--- a/lib/isc/pthreads/include/isc/mutex.h
+++ b/lib/isc/pthreads/include/isc/mutex.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mutex.h,v 1.15 2000/07/27 09:52:32 tale Exp $ */
+/* $Id: mutex.h,v 1.16 2000/08/01 01:31:06 tale Exp $ */
 
 #ifndef ISC_MUTEX_H
 #define ISC_MUTEX_H 1
diff --git a/lib/isc/pthreads/include/isc/once.h b/lib/isc/pthreads/include/isc/once.h
index a9c3a8a587..e75e442486 100644
--- a/lib/isc/pthreads/include/isc/once.h
+++ b/lib/isc/pthreads/include/isc/once.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: once.h,v 1.6 2000/07/27 09:52:33 tale Exp $ */
+/* $Id: once.h,v 1.7 2000/08/01 01:31:07 tale Exp $ */
 
 #ifndef ISC_ONCE_H
 #define ISC_ONCE_H 1
diff --git a/lib/isc/pthreads/include/isc/thread.h b/lib/isc/pthreads/include/isc/thread.h
index cb7785240d..e1b7528029 100644
--- a/lib/isc/pthreads/include/isc/thread.h
+++ b/lib/isc/pthreads/include/isc/thread.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: thread.h,v 1.17 2000/07/27 09:52:34 tale Exp $ */
+/* $Id: thread.h,v 1.18 2000/08/01 01:31:08 tale Exp $ */
 
 #ifndef ISC_THREAD_H
 #define ISC_THREAD_H 1
diff --git a/lib/isc/pthreads/thread.c b/lib/isc/pthreads/thread.c
index fbee251bd0..578d3d6126 100644
--- a/lib/isc/pthreads/thread.c
+++ b/lib/isc/pthreads/thread.c
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: thread.c,v 1.6 2000/07/27 09:52:27 tale Exp $ */
+/* $Id: thread.c,v 1.7 2000/08/01 01:31:01 tale Exp $ */
 
 #include 
 
diff --git a/lib/isc/quota.c b/lib/isc/quota.c
index 75c8d5a1e4..c6dd2fab7d 100644
--- a/lib/isc/quota.c
+++ b/lib/isc/quota.c
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: quota.c,v 1.7 2000/07/27 09:51:06 tale Exp $ */
+/* $Id: quota.c,v 1.8 2000/08/01 01:29:40 tale Exp $ */
 
 #include 
 
@@ -56,7 +56,7 @@ isc_quota_release(isc_quota_t *quota) {
 	LOCK("a->lock);
 	INSIST(quota->used > 0);
 	quota->used--;
-	UNLOCK("a->lock);	
+	UNLOCK("a->lock);
 }
 
 isc_result_t
diff --git a/lib/isc/random.c b/lib/isc/random.c
index cb8a62a317..43e85795f6 100644
--- a/lib/isc/random.c
+++ b/lib/isc/random.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: random.c,v 1.8 2000/07/27 09:51:07 tale Exp $ */
+/* $Id: random.c,v 1.9 2000/08/01 01:29:41 tale Exp $ */
 
 #include 
 
@@ -100,7 +100,7 @@ isc_random_get(isc_random_t *r, isc_uint32_t *val)
 	REQUIRE(val != NULL);
 
 	UNUSED(r);
-	
+
 	initialize();
 
 #if 0
diff --git a/lib/isc/ratelimiter.c b/lib/isc/ratelimiter.c
index a4c6820273..5c3a4c3f31 100644
--- a/lib/isc/ratelimiter.c
+++ b/lib/isc/ratelimiter.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ratelimiter.c,v 1.15 2000/07/27 09:51:08 tale Exp $ */
+/* $Id: ratelimiter.c,v 1.16 2000/08/01 01:29:42 tale Exp $ */
 
 #include 
 
@@ -60,7 +60,7 @@ isc_ratelimiter_create(isc_mem_t *mctx, isc_timermgr_t *timermgr,
 	isc_result_t result;
 	isc_ratelimiter_t *rl;
 	INSIST(ratelimiterp != NULL && *ratelimiterp == NULL);
-	
+
 	rl = isc_mem_get(mctx, sizeof(*rl));
 	if (rl == NULL)
 		return ISC_R_NOMEMORY;
@@ -87,7 +87,7 @@ isc_ratelimiter_create(isc_mem_t *mctx, isc_timermgr_t *timermgr,
 	 * (soon) have events outstanding.
 	 */
 	rl->refs++;
-	
+
 	ISC_EVENT_INIT(&rl->shutdownevent,
 		       sizeof(isc_event_t),
 		       0, NULL, ISC_RATELIMITEREVENT_SHUTDOWN,
@@ -125,7 +125,7 @@ isc_ratelimiter_setpertic(isc_ratelimiter_t *rl, isc_uint32_t pertic) {
 		pertic = 1;
 	rl->pertic = pertic;
 }
-			
+
 isc_result_t
 isc_ratelimiter_enqueue(isc_ratelimiter_t *rl, isc_task_t *task,
 			isc_event_t **eventp)
@@ -224,14 +224,14 @@ isc_ratelimiter_shutdown(isc_ratelimiter_t *rl) {
 	 */
 	ev = &rl->shutdownevent;
 	isc_task_send(rl->task, &ev);
-	
+
 	UNLOCK(&rl->lock);
 }
 
 static void
 ratelimiter_shutdowncomplete(isc_task_t *task, isc_event_t *event) {
 	isc_ratelimiter_t *rl = (isc_ratelimiter_t *)event->ev_arg;
-	
+
 	UNUSED(task);
 
 	isc_ratelimiter_detach(&rl);
diff --git a/lib/isc/result.c b/lib/isc/result.c
index 8dfe61260f..a6d7c33bee 100644
--- a/lib/isc/result.c
+++ b/lib/isc/result.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: result.c,v 1.45 2000/07/27 09:51:09 tale Exp $ */
+/* $Id: result.c,v 1.46 2000/08/01 01:29:43 tale Exp $ */
 
 #include 
 
diff --git a/lib/isc/rwlock.c b/lib/isc/rwlock.c
index 0b39d4704b..02277d1f15 100644
--- a/lib/isc/rwlock.c
+++ b/lib/isc/rwlock.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rwlock.c,v 1.18 2000/07/30 17:57:48 bwelling Exp $ */
+/* $Id: rwlock.c,v 1.19 2000/08/01 01:29:44 tale Exp $ */
 
 #include 
 
diff --git a/lib/isc/serial.c b/lib/isc/serial.c
index 449870fd9e..7f5ba638f2 100644
--- a/lib/isc/serial.c
+++ b/lib/isc/serial.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: serial.c,v 1.5 2000/07/27 09:51:11 tale Exp $ */
+/* $Id: serial.c,v 1.6 2000/08/01 01:29:45 tale Exp $ */
 #include 
 
 #include 
diff --git a/lib/isc/sha1.c b/lib/isc/sha1.c
index 3f8fa9e378..91f5a7cd46 100644
--- a/lib/isc/sha1.c
+++ b/lib/isc/sha1.c
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sha1.c,v 1.8 2000/07/27 09:51:12 tale Exp $ */
+/* $Id: sha1.c,v 1.9 2000/08/01 01:29:47 tale Exp $ */
 
 /*	$NetBSD: sha1.c,v 1.5 2000/01/22 22:19:14 mycroft Exp $	*/
 /*	$OpenBSD: sha1.c,v 1.9 1997/07/23 21:12:32 kstailey Exp $	*/
diff --git a/lib/isc/sockaddr.c b/lib/isc/sockaddr.c
index e02c8c2914..70de863e06 100644
--- a/lib/isc/sockaddr.c
+++ b/lib/isc/sockaddr.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sockaddr.c,v 1.43 2000/07/27 09:51:13 tale Exp $ */
+/* $Id: sockaddr.c,v 1.44 2000/08/01 01:29:48 tale Exp $ */
 
 #include 
 
@@ -122,7 +122,7 @@ isc_sockaddr_totext(const isc_sockaddr_t *sockaddr, isc_buffer_t *target) {
 
 	/*
 	 * Do the port first, giving us the opportunity to check for
-	 * unsupported address families before calling 
+	 * unsupported address families before calling
 	 * isc_netaddr_fromsockaddr().
 	 */
 	switch (sockaddr->type.sa.sa_family) {
@@ -135,18 +135,18 @@ isc_sockaddr_totext(const isc_sockaddr_t *sockaddr, isc_buffer_t *target) {
 	default:
 		return (ISC_R_FAILURE);
 	}
-	
+
 	plen = strlen(pbuf);
 	INSIST(plen < sizeof(pbuf));
-	
+
 	isc_netaddr_fromsockaddr(&netaddr, sockaddr);
 	result = isc_netaddr_totext(&netaddr, target);
 	if (result != ISC_R_SUCCESS)
 		return (result);
-	
+
 	if (1 + plen + 1 > isc_buffer_availablelength(target))
 		return (ISC_R_NOSPACE);
-	    
+
 	isc_buffer_putmem(target, (const unsigned char *)"#", 1);
 	isc_buffer_putmem(target, (const unsigned char *)pbuf, plen);
 
@@ -181,7 +181,7 @@ isc_sockaddr_hash(const isc_sockaddr_t *sockaddr, isc_boolean_t address_only) {
 	const unsigned char *s;
 	unsigned int h = 0;
 	unsigned int g;
-	
+
 	/*
 	 * Provide a hash value for 'sockaddr'.
 	 */
@@ -336,7 +336,7 @@ isc_sockaddr_fromnetaddr(isc_sockaddr_t *sockaddr, const isc_netaddr_t *na,
 		sockaddr->type.sin.sin_port = htons(port);
 		break;
 	case AF_INET6:
-		sockaddr->length = sizeof sockaddr->type.sin6;		
+		sockaddr->length = sizeof sockaddr->type.sin6;
 #ifdef ISC_PLATFORM_HAVESALEN
 		sockaddr->type.sin6.sin6_len = sizeof sockaddr->type.sin6;
 #endif
diff --git a/lib/isc/string.c b/lib/isc/string.c
index 8a0f9cb890..2e476e7e7d 100644
--- a/lib/isc/string.c
+++ b/lib/isc/string.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: string.c,v 1.4 2000/07/27 09:51:15 tale Exp $ */
+/* $Id: string.c,v 1.5 2000/08/01 01:29:49 tale Exp $ */
 
 #include 
 
@@ -32,7 +32,7 @@ isc_string_touint64(char *source, char **end, int base) {
 	char *s = source;
 	char *o;
 	char c;
-	
+
 	if ((base < 0) || (base == 1) || (base > 36)) {
 		*end = source;
 		return (0);
@@ -58,7 +58,7 @@ isc_string_touint64(char *source, char **end, int base) {
 	overflow = ~0;
 	overflow /= base;
 	tmp = 0;
-		
+
 	while ((c = *s) != 0) {
 		c = tolower(c);
 		/* end ? */
diff --git a/lib/isc/symtab.c b/lib/isc/symtab.c
index 093620789a..66012a403e 100644
--- a/lib/isc/symtab.c
+++ b/lib/isc/symtab.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1996-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: symtab.c,v 1.19 2000/07/27 09:51:16 tale Exp $ */
+/* $Id: symtab.c,v 1.20 2000/08/01 01:29:50 tale Exp $ */
 
 #include 
 
diff --git a/lib/isc/task.c b/lib/isc/task.c
index 530cbf2446..60dac065f3 100644
--- a/lib/isc/task.c
+++ b/lib/isc/task.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: task.c,v 1.68 2000/07/27 22:24:54 bwelling Exp $ */
+/* $Id: task.c,v 1.69 2000/08/01 01:29:51 tale Exp $ */
 
 /*
  * Principal Author: Bob Halley
@@ -224,7 +224,7 @@ static inline isc_boolean_t
 task_shutdown(isc_task_t *task) {
 	isc_boolean_t was_idle = ISC_FALSE;
 	isc_event_t *event, *prev;
-	
+
 	/*
 	 * Caller must be holding the task's lock.
 	 */
@@ -331,7 +331,7 @@ static inline isc_boolean_t
 task_send(isc_task_t *task, isc_event_t **eventp) {
 	isc_boolean_t was_idle = ISC_FALSE;
 	isc_event_t *event;
-	
+
 	/*
 	 * Caller must be holding the task lock.
 	 */
@@ -355,7 +355,7 @@ task_send(isc_task_t *task, isc_event_t **eventp) {
 	*eventp = NULL;
 
 	return (was_idle);
-}	
+}
 
 void
 isc_task_send(isc_task_t *task, isc_event_t **eventp) {
@@ -710,7 +710,7 @@ run(void *uap) {
 	/*
 	 * Again we're trying to hold the lock for as short a time as possible
 	 * and to do as little locking and unlocking as possible.
-	 * 
+	 *
 	 * In both while loops, the appropriate lock must be held before the
 	 * while body starts.  Code which acquired the lock at the top of
 	 * the loop would be more readable, but would result in a lot of
@@ -738,7 +738,7 @@ run(void *uap) {
 	 * unlocks.  Also note that the lock is not held when the while
 	 * condition is tested, which may or may not be important, depending
 	 * on the expression.
-	 * 
+	 *
 	 * As written:
 	 *
 	 *	LOCK();
@@ -772,7 +772,7 @@ run(void *uap) {
 			XTHREADTRACE("awake");
 		}
 		XTHREADTRACE("working");
-		
+
 		task = HEAD(manager->ready_tasks);
 		if (task != NULL) {
 			unsigned int dispatch_count = 0;
@@ -785,7 +785,7 @@ run(void *uap) {
 
 			/*
 			 * Note we only unlock the manager lock if we actually
-			 * have a task to do.  We must reacquire the manager 
+			 * have a task to do.  We must reacquire the manager
 			 * lock before exiting the 'if (task != NULL)' block.
 			 */
 			DEQUEUE(manager->ready_tasks, task, ready_link);
@@ -816,7 +816,7 @@ run(void *uap) {
 				    EMPTY(task->events) &&
 				    !TASK_SHUTTINGDOWN(task)) {
 					isc_boolean_t was_idle;
-					
+
 					/*
 					 * There are no references and no
 					 * pending events for this task,
@@ -930,7 +930,7 @@ manager_free(isc_taskmgr_t *manager) {
 }
 
 isc_result_t
-isc_taskmgr_create(isc_mem_t *mctx, unsigned int workers, 
+isc_taskmgr_create(isc_mem_t *mctx, unsigned int workers,
 		   unsigned int default_quantum, isc_taskmgr_t **managerp)
 {
 	unsigned int i, started = 0;
@@ -987,7 +987,7 @@ isc_taskmgr_create(isc_mem_t *mctx, unsigned int workers,
 	 */
 	for (i = 0; i < workers; i++) {
 		if (isc_thread_create(run, manager,
-				      &manager->threads[manager->workers]) == 
+				      &manager->threads[manager->workers]) ==
 		    ISC_R_SUCCESS) {
 			manager->workers++;
 			started++;
@@ -998,7 +998,7 @@ isc_taskmgr_create(isc_mem_t *mctx, unsigned int workers,
 	if (started == 0) {
 		manager_free(manager);
 		return (ISC_R_NOTHREADS);
-	}		
+	}
 
 	*managerp = manager;
 
diff --git a/lib/isc/taskpool.c b/lib/isc/taskpool.c
index 87440f4cb3..3320a14888 100644
--- a/lib/isc/taskpool.c
+++ b/lib/isc/taskpool.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: taskpool.c,v 1.8 2000/07/27 09:51:18 tale Exp $ */
+/* $Id: taskpool.c,v 1.9 2000/08/01 01:29:52 tale Exp $ */
 
 #include 
 
@@ -28,7 +28,7 @@
  ***/
 
 struct isc_taskpool {
-	isc_mem_t *			mctx;		
+	isc_mem_t *			mctx;
 	unsigned int			ntasks;
 	isc_task_t **			tasks;
 };
@@ -44,7 +44,7 @@ isc_taskpool_create(isc_taskmgr_t *tmgr, isc_mem_t *mctx,
 	unsigned int i;
 	isc_taskpool_t *pool;
 	isc_result_t result;
-	
+
 	INSIST(ntasks > 0);
 	pool = isc_mem_get(mctx, sizeof *pool);
 	if (pool == NULL)
@@ -52,7 +52,7 @@ isc_taskpool_create(isc_taskmgr_t *tmgr, isc_mem_t *mctx,
 	pool->mctx = mctx;
 	pool->ntasks = ntasks;
 	pool->tasks = isc_mem_get(mctx, ntasks * sizeof(isc_task_t *));
-	for (i = 0; i < ntasks; i++) 
+	for (i = 0; i < ntasks; i++)
 		pool->tasks[i] = NULL;
 	for (i = 0; i < ntasks; i++) {
 		result = isc_task_create(tmgr, quantum, &pool->tasks[i]);
diff --git a/lib/isc/timer.c b/lib/isc/timer.c
index 8a3784e996..bc84c6a976 100644
--- a/lib/isc/timer.c
+++ b/lib/isc/timer.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: timer.c,v 1.53 2000/07/27 09:51:19 tale Exp $ */
+/* $Id: timer.c,v 1.54 2000/08/01 01:29:53 tale Exp $ */
 
 #include 
 
@@ -92,7 +92,7 @@ schedule(isc_timer_t *timer, isc_time_t *now, isc_boolean_t signal_ok) {
 	isc_time_t due;
 	int cmp;
 
-	/* 
+	/*
 	 * Note: the caller must ensure locking.
 	 */
 
@@ -115,7 +115,7 @@ schedule(isc_timer_t *timer, isc_time_t *now, isc_boolean_t signal_ok) {
 		else
 			due = timer->expires;
 	}
-	
+
 	/*
 	 * Schedule the timer.
 	 */
@@ -168,7 +168,7 @@ deschedule(isc_timer_t *timer) {
 	isc_boolean_t need_wakeup = ISC_FALSE;
 	isc_timermgr_t *manager;
 
-	/* 
+	/*
 	 * The caller must ensure locking.
 	 */
 
@@ -317,7 +317,7 @@ isc_timer_create(isc_timermgr_t *manager, isc_timertype_t type,
 		result = ISC_R_SUCCESS;
 	if (result == ISC_R_SUCCESS)
 		APPEND(manager->timers, timer, link);
-	
+
 	UNLOCK(&manager->lock);
 
 	if (result != ISC_R_SUCCESS) {
@@ -461,11 +461,11 @@ isc_timer_attach(isc_timer_t *timer, isc_timer_t **timerp) {
 	LOCK(&timer->lock);
 	timer->references++;
 	UNLOCK(&timer->lock);
-	
+
 	*timerp = timer;
 }
 
-void 
+void
 isc_timer_detach(isc_timer_t **timerp) {
 	isc_timer_t *timer;
 	isc_boolean_t free_timer = ISC_FALSE;
@@ -484,7 +484,7 @@ isc_timer_detach(isc_timer_t **timerp) {
 	if (timer->references == 0)
 		free_timer = ISC_TRUE;
 	UNLOCK(&timer->lock);
-	
+
 	if (free_timer)
 		destroy(timer);
 
@@ -550,7 +550,7 @@ dispatch(isc_timermgr_t *manager, isc_time_t *now) {
 					UNEXPECTED_ERROR(__FILE__, __LINE__,
 						 "couldn't allocate event");
 			}
-					
+
 			timer->index = 0;
 			isc_heap_delete(manager->heap, 1);
 			manager->nscheduled--;
@@ -566,7 +566,7 @@ dispatch(isc_timermgr_t *manager, isc_time_t *now) {
 			manager->due = timer->due;
 			done = ISC_TRUE;
 		}
-	} 
+	}
 }
 
 static isc_threadresult_t
@@ -641,7 +641,7 @@ isc_timermgr_create(isc_mem_t *mctx, isc_timermgr_t **managerp) {
 	manager = isc_mem_get(mctx, sizeof *manager);
 	if (manager == NULL)
 		return (ISC_R_NOMEMORY);
-	
+
 	manager->magic = TIMER_MANAGER_MAGIC;
 	manager->mctx = NULL;
 	manager->done = ISC_FALSE;
diff --git a/lib/isc/unix/Makefile.in b/lib/isc/unix/Makefile.in
index 44e2b33913..f8b196602a 100644
--- a/lib/isc/unix/Makefile.in
+++ b/lib/isc/unix/Makefile.in
@@ -1,9 +1,9 @@
 # Copyright (C) 1998-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
 # 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
@@ -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.30 2000/07/27 09:52:35 tale Exp $
+# $Id: Makefile.in,v 1.31 2000/08/01 01:31:10 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/isc/unix/app.c b/lib/isc/unix/app.c
index a976108649..53f373736c 100644
--- a/lib/isc/unix/app.c
+++ b/lib/isc/unix/app.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: app.c,v 1.22 2000/07/27 09:52:36 tale Exp $ */
+/* $Id: app.c,v 1.23 2000/08/01 01:31:11 tale Exp $ */
 
 #include 
 
@@ -91,7 +91,7 @@ handle_signal(int sig, void (*handler)(int)) {
 				 strerror(errno));
 		return (ISC_R_UNEXPECTED);
 	}
-	
+
 	return (ISC_R_SUCCESS);
 }
 
@@ -112,7 +112,7 @@ isc_app_start(void) {
 	presult = pthread_init();
 	if (presult != 0) {
 		UNEXPECTED_ERROR(__FILE__, __LINE__,
-				 "isc_app_start() pthread_init: %s", 
+				 "isc_app_start() pthread_init: %s",
 				 strerror(presult));
 		return (ISC_R_UNEXPECTED);
 	}
@@ -185,14 +185,14 @@ isc_app_start(void) {
 	    sigaddset(&sset, SIGINT) != 0 ||
 	    sigaddset(&sset, SIGTERM) != 0) {
 		UNEXPECTED_ERROR(__FILE__, __LINE__,
-				 "isc_app_start() sigsetops: %s", 
+				 "isc_app_start() sigsetops: %s",
 				 strerror(errno));
 		return (ISC_R_UNEXPECTED);
 	}
 	presult = pthread_sigmask(SIG_BLOCK, &sset, NULL);
 	if (presult != 0) {
 		UNEXPECTED_ERROR(__FILE__, __LINE__,
-				 "isc_app_start() pthread_sigmask: %s", 
+				 "isc_app_start() pthread_sigmask: %s",
 				 strerror(presult));
 		return (ISC_R_UNEXPECTED);
 	}
@@ -232,7 +232,7 @@ isc_app_onrun(isc_mem_t *mctx, isc_task_t *task, isc_taskaction_t action,
 		result = ISC_R_NOMEMORY;
 		goto unlock;
 	}
-	
+
 	ISC_LIST_APPEND(on_run, event, ev_link);
 
 	result = ISC_R_SUCCESS;
@@ -280,7 +280,7 @@ isc_app_run(void) {
 		}
 
 	}
-	
+
 	UNLOCK(&lock);
 
 #ifndef HAVE_SIGWAIT
@@ -311,7 +311,7 @@ isc_app_run(void) {
 		    sigaddset(&sset, SIGINT) != 0 ||
 		    sigaddset(&sset, SIGTERM) != 0) {
 			UNEXPECTED_ERROR(__FILE__, __LINE__,
-					 "isc_app_run() sigsetops: %s", 
+					 "isc_app_run() sigsetops: %s",
 					 strerror(errno));
 			return (ISC_R_UNEXPECTED);
 		}
@@ -343,7 +343,7 @@ isc_app_run(void) {
 		 */
 		if (sigemptyset(&sset) != 0) {
 			UNEXPECTED_ERROR(__FILE__, __LINE__,
-					 "isc_app_run() sigsetops: %s", 
+					 "isc_app_run() sigsetops: %s",
 					 strerror(errno));
 			return (ISC_R_UNEXPECTED);
 		}
@@ -368,7 +368,7 @@ isc_app_shutdown(void) {
 	 */
 
 	LOCK(&lock);
-	
+
 	REQUIRE(running);
 
 	if (shutdown_requested)
@@ -381,7 +381,7 @@ isc_app_shutdown(void) {
 	if (want_kill) {
 #ifdef HAVE_LINUXTHREADS
 		int result;
-		
+
 		result = pthread_kill(main_thread, SIGTERM);
 		if (result != 0) {
 			UNEXPECTED_ERROR(__FILE__, __LINE__,
@@ -411,7 +411,7 @@ isc_app_reload(void) {
 	 */
 
 	LOCK(&lock);
-	
+
 	REQUIRE(running);
 
 	/*
@@ -425,7 +425,7 @@ isc_app_reload(void) {
 	if (want_kill) {
 #ifdef HAVE_LINUXTHREADS
 		int result;
-		
+
 		result = pthread_kill(main_thread, SIGHUP);
 		if (result != 0) {
 			UNEXPECTED_ERROR(__FILE__, __LINE__,
diff --git a/lib/isc/unix/dir.c b/lib/isc/unix/dir.c
index 36997fe959..bf7ba43380 100644
--- a/lib/isc/unix/dir.c
+++ b/lib/isc/unix/dir.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dir.c,v 1.12 2000/07/27 09:52:38 tale Exp $ */
+/* $Id: dir.c,v 1.13 2000/08/01 01:31:12 tale Exp $ */
 
 /* Principal Authors: DCL */
 
@@ -51,7 +51,7 @@ isc_dir_init(isc_dir_t *dir) {
 }
 
 /*
- * Allocate workspace and open directory stream. If either one fails, 
+ * Allocate workspace and open directory stream. If either one fails,
  * NULL will be returned.
  */
 isc_result_t
@@ -92,7 +92,7 @@ isc_dir_read(isc_dir_t *dir) {
 		return (ISC_R_NOMORE);
 
 	/*
-	 * Make sure that the space for the name is long enough. 
+	 * Make sure that the space for the name is long enough.
 	 */
 	if (sizeof(dir->entry.name) <= strlen(entry->d_name))
 	    return (ISC_R_UNEXPECTED);
diff --git a/lib/isc/unix/entropy.c b/lib/isc/unix/entropy.c
index 4b9e259808..d4d3c2206b 100644
--- a/lib/isc/unix/entropy.c
+++ b/lib/isc/unix/entropy.c
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: entropy.c,v 1.46 2000/07/27 09:52:39 tale Exp $ */
+/* $Id: entropy.c,v 1.47 2000/08/01 01:31:13 tale Exp $ */
 
 #include 
 
@@ -708,7 +708,7 @@ isc_entropy_getdata(isc_entropy_t *ent, void *data, unsigned int length,
 		isc_sha1_update(&hash, (void *)(ent->pool.pool),
 				RND_POOLWORDS * 4);
 		isc_sha1_final(&hash, digest);
-    
+
 		/*
 		 * Stir the extracted data (all of it) back into the pool.
 		 */
diff --git a/lib/isc/unix/errno2result.c b/lib/isc/unix/errno2result.c
index 86f2d3e9bb..4c626b81eb 100644
--- a/lib/isc/unix/errno2result.c
+++ b/lib/isc/unix/errno2result.c
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: errno2result.c,v 1.3 2000/07/27 09:52:40 tale Exp $ */
+/* $Id: errno2result.c,v 1.4 2000/08/01 01:31:14 tale Exp $ */
 
 #include 
 
diff --git a/lib/isc/unix/errno2result.h b/lib/isc/unix/errno2result.h
index 34cf2f2f94..af7ff31c0e 100644
--- a/lib/isc/unix/errno2result.h
+++ b/lib/isc/unix/errno2result.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: errno2result.h,v 1.4 2000/07/27 09:52:41 tale Exp $ */
+/* $Id: errno2result.h,v 1.5 2000/08/01 01:31:15 tale Exp $ */
 
 #ifndef UNIX_ERRNO2RESULT_H
 #define UNIX_ERRNO2RESULT_H 1
diff --git a/lib/isc/unix/file.c b/lib/isc/unix/file.c
index 1151476142..48beaea7a9 100644
--- a/lib/isc/unix/file.c
+++ b/lib/isc/unix/file.c
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: file.c,v 1.19 2000/07/27 09:52:42 tale Exp $ */
+/* $Id: file.c,v 1.20 2000/08/01 01:31:16 tale Exp $ */
 
 #include 
 
@@ -45,10 +45,10 @@
 static isc_result_t
 file_stats(const char *file, struct stat *stats) {
 	isc_result_t result = ISC_R_SUCCESS;
-	
+
 	if (stat(file, stats) != 0)
 		result = isc__errno2result(errno);
-		
+
 	return (result);
 }
 
@@ -126,20 +126,20 @@ isc_file_mktemplate(const char *path, char *buf, size_t buflen) {
 	if (s != NULL) {
 		if ((s - path + 1 + sizeof(TEMPLATE)) > buflen)
 			return (ISC_R_NOSPACE);
-		
+
 		strncpy(buf, path, s - path + 1);
 		buf[s - path + 1] = '\0';
 		strcat(buf, TEMPLATE);
 	} else {
 		if (sizeof(TEMPLATE) > buflen)
 			return (ISC_R_NOSPACE);
-		
+
 		strcpy(buf, TEMPLATE);
 	}
-	
+
 	return (ISC_R_SUCCESS);
 }
- 
+
 isc_result_t
 isc_file_openunique(char *templet, FILE **fp) {
 	int fd;
@@ -173,7 +173,7 @@ isc_file_openunique(char *templet, FILE **fp) {
 isc_result_t
 isc_file_remove(const char *filename) {
 	int r;
-	
+
 	r = unlink(filename);
 	if (r == 0)
 		return (ISC_R_SUCCESS);
diff --git a/lib/isc/unix/fsaccess.c b/lib/isc/unix/fsaccess.c
index 8132b7c226..b820795fda 100644
--- a/lib/isc/unix/fsaccess.c
+++ b/lib/isc/unix/fsaccess.c
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: fsaccess.c,v 1.4 2000/07/27 09:52:43 tale Exp $ */
+/* $Id: fsaccess.c,v 1.5 2000/08/01 01:31:18 tale Exp $ */
 
 #include 
 #include 
diff --git a/lib/isc/unix/ifiter_ioctl.c b/lib/isc/unix/ifiter_ioctl.c
index 3dd03b0bd1..526e1700e7 100644
--- a/lib/isc/unix/ifiter_ioctl.c
+++ b/lib/isc/unix/ifiter_ioctl.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,12 +15,12 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ifiter_ioctl.c,v 1.12 2000/07/27 09:52:44 tale Exp $ */
+/* $Id: ifiter_ioctl.c,v 1.13 2000/08/01 01:31:19 tale Exp $ */
 
 /*
  * Obtain the list of network interfaces using the SIOCGLIFCONF ioctl.
  * See netintro(4).
- */ 
+ */
 #ifndef SIOCGLIFCONF
 #define SIOCGLIFCONF SIOCGIFCONF
 #define lifc_len ifc_len
@@ -45,7 +45,7 @@
 #endif
 
 
-#define IFITER_MAGIC		0x49464954U	/* IFIT. */	
+#define IFITER_MAGIC		0x49464954U	/* IFIT. */
 #define VALID_IFITER(t)		((t) != NULL && (t)->magic == IFITER_MAGIC)
 
 struct isc_interfaceiter {
@@ -77,7 +77,7 @@ isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) {
 	REQUIRE(mctx != NULL);
 	REQUIRE(iterp != NULL);
 	REQUIRE(*iterp == NULL);
-	
+
 	iter = isc_mem_get(mctx, sizeof(*iter));
 	if (iter == NULL)
 		return (ISC_R_NOMEMORY);
@@ -95,7 +95,7 @@ isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) {
 		result = ISC_R_UNEXPECTED;
 		goto socket_failure;
 	}
-	
+
 	/*
 	 * Get the interface configuration, allocating more memory if
 	 * necessary.
@@ -108,7 +108,7 @@ isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) {
 			result = ISC_R_NOMEMORY;
 			goto alloc_failure;
 		}
-		
+
 		memset(&iter->ifc.lifc_len, 0, sizeof(iter->ifc.lifc_len));
 #ifdef ISC_HAVE_LIFC_FAMILY
 		iter->ifc.lifc_family = AF_UNSPEC;
@@ -146,18 +146,18 @@ isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) {
 			 * retry.
 			 */
 			if (iter->ifc.lifc_len + 2 * sizeof(struct lifreq)
-			    < iter->bufsize) 
+			    < iter->bufsize)
 				break;
 		}
 		if (iter->bufsize >= IFCONF_BUFSIZE_MAX) {
-			UNEXPECTED_ERROR(__FILE__, __LINE__, 
+			UNEXPECTED_ERROR(__FILE__, __LINE__,
 					 "get interface configuration: "
 					 "maximum buffer size exceeded");
 			result = ISC_R_UNEXPECTED;
 			goto ioctl_failure;
 		}
 		isc_mem_put(mctx, iter->buf, iter->bufsize);
-		
+
 		iter->bufsize *= 2;
 	}
 
@@ -167,7 +167,7 @@ isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) {
 	 */
 	iter->pos = (unsigned int) -1;
 	iter->result = ISC_R_FAILURE;
-	
+
 	iter->magic = IFITER_MAGIC;
 	*iterp = iter;
 	return (ISC_R_SUCCESS);
@@ -177,7 +177,7 @@ isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) {
 
  alloc_failure:
 	(void) close(iter->socket);
-	
+
  socket_failure:
 	isc_mem_put(mctx, iter, sizeof *iter);
 	return (result);
@@ -196,25 +196,25 @@ internal_current(isc_interfaceiter_t *iter) {
 	struct lifreq *ifrp;
 	struct lifreq lifreq;
 	int family;
-	
+
 	REQUIRE(VALID_IFITER(iter));
 	REQUIRE (iter->pos < (unsigned int) iter->ifc.lifc_len);
-	
+
 	ifrp = (struct lifreq *)((char *) iter->ifc.lifc_req + iter->pos);
-	
+
 	memset(&lifreq, 0, sizeof lifreq);
 	memcpy(&lifreq, ifrp, sizeof lifreq);
 
 	family = lifreq.lifr_addr.ss_family;
 	if (family != AF_INET)
-		return (ISC_R_IGNORE); 
-	
+		return (ISC_R_IGNORE);
+
 	memset(&iter->current, 0, sizeof(iter->current));
 	iter->current.af = family;
-	
+
 	INSIST(sizeof(lifreq.lifr_name) <= sizeof(iter->current.name));
 	memcpy(iter->current.name, lifreq.lifr_name, sizeof(lifreq.lifr_name));
-	
+
 	get_addr(family, &iter->current.address,
 		 (struct sockaddr *)&lifreq.lifr_addr);
 
@@ -223,20 +223,20 @@ internal_current(isc_interfaceiter_t *iter) {
 	 */
 
 	iter->current.flags = 0;
-	
+
 	/*
 	 * Ignore the HP/UX warning about "interger overflow during
 	 * conversion.  It comes from its own macro definition,
 	 * and is really hard to shut up.
 	 */
 	if (ioctl(iter->socket, SIOCGLIFFLAGS, (char *) &lifreq) < 0) {
-		UNEXPECTED_ERROR(__FILE__, __LINE__, 
+		UNEXPECTED_ERROR(__FILE__, __LINE__,
 				 "%s: getting interface flags: %s",
 				 lifreq.lifr_name,
 				 strerror(errno));
 		return (ISC_R_IGNORE);
 	}
-	
+
 	if ((lifreq.lifr_flags & IFF_UP) != 0)
 		iter->current.flags |= INTERFACE_F_UP;
 
@@ -257,7 +257,7 @@ internal_current(isc_interfaceiter_t *iter) {
 		 */
 		if (ioctl(iter->socket, SIOCGLIFDSTADDR, (char *)&lifreq)
 		    < 0) {
-			UNEXPECTED_ERROR(__FILE__, __LINE__, 
+			UNEXPECTED_ERROR(__FILE__, __LINE__,
 					 "%s: getting destination address: %s",
 					 lifreq.lifr_name,
 					 strerror(errno));
@@ -269,7 +269,7 @@ internal_current(isc_interfaceiter_t *iter) {
 
 	/*
 	 * Get the network mask.
-	 */ 
+	 */
 	memset(&lifreq, 0, sizeof lifreq);
 	memcpy(&lifreq, ifrp, sizeof lifreq);
 	switch (family) {
@@ -288,7 +288,7 @@ internal_current(isc_interfaceiter_t *iter) {
 			return (ISC_R_IGNORE);
 		}
 		get_addr(family, &iter->current.netmask,
-			 (struct sockaddr *)&lifreq.lifr_addr);		
+			 (struct sockaddr *)&lifreq.lifr_addr);
 		break;
 	case AF_INET6: {
 #ifdef lifr_addrlen
@@ -308,12 +308,12 @@ internal_current(isc_interfaceiter_t *iter) {
 		break;
 	}
 	}
-	
+
 	return (ISC_R_SUCCESS);
 }
 
 /*
- * Step the iterator to the next interface.  Unlike 
+ * Step the iterator to the next interface.  Unlike
  * isc_interfaceiter_next(), this may leave the iterator
  * positioned on an interface that will ultimately
  * be ignored.  Return ISC_R_NOMORE if there are no more
@@ -324,9 +324,9 @@ internal_next(isc_interfaceiter_t *iter) {
 	struct lifreq *ifrp;
 
 	REQUIRE (iter->pos < (unsigned int) iter->ifc.lifc_len);
-	
+
 	ifrp = (struct lifreq *)((char *) iter->ifc.lifc_req + iter->pos);
-		
+
 #ifdef ISC_PLATFORM_HAVESALEN
 	if (ifrp->lifr_addr.sa_len > sizeof(struct sockaddr))
 		iter->pos += sizeof(ifrp->lifr_name) + ifrp->lifr_addr.sa_len;
@@ -336,7 +336,7 @@ internal_next(isc_interfaceiter_t *iter) {
 
 	if (iter->pos >= (unsigned int) iter->ifc.lifc_len)
 		return (ISC_R_NOMORE);
-	
+
 	return (ISC_R_SUCCESS);
 }
 
diff --git a/lib/isc/unix/ifiter_sysctl.c b/lib/isc/unix/ifiter_sysctl.c
index 7b903c77df..7740188ca2 100644
--- a/lib/isc/unix/ifiter_sysctl.c
+++ b/lib/isc/unix/ifiter_sysctl.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,13 +15,13 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ifiter_sysctl.c,v 1.9 2000/07/27 09:52:45 tale Exp $ */
+/* $Id: ifiter_sysctl.c,v 1.10 2000/08/01 01:31:20 tale Exp $ */
 
 /*
  * Obtain the list of network interfaces using sysctl.
  * See TCP/IP Illustrated Volume 2, sections 19.8, 19.14,
  * and 19.16.
- */ 
+ */
 
 #include 
 #include 
@@ -39,7 +39,7 @@
                     : sizeof(long))
 #endif
 
-#define IFITER_MAGIC		0x49464953U	/* IFIS. */	
+#define IFITER_MAGIC		0x49464953U	/* IFIS. */
 #define VALID_IFITER(t)		((t) != NULL && (t)->magic == IFITER_MAGIC)
 
 struct isc_interfaceiter {
@@ -56,23 +56,23 @@ struct isc_interfaceiter {
 
 static int mib[6] = {
 	CTL_NET,
-	PF_ROUTE, 
-        0, 
+	PF_ROUTE,
+        0,
 	0, 			/* Any address family. */
-        NET_RT_IFLIST, 
+        NET_RT_IFLIST,
 	0 			/* Flags. */
 };
-	
+
 isc_result_t
 isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) {
 	isc_interfaceiter_t *iter;
 	isc_result_t result;
 	size_t bufsize;
-	size_t bufused;	
+	size_t bufused;
 	REQUIRE(mctx != NULL);
 	REQUIRE(iterp != NULL);
 	REQUIRE(*iterp == NULL);
-	
+
 	iter = isc_mem_get(mctx, sizeof(*iter));
 	if (iter == NULL)
 		return (ISC_R_NOMEMORY);
@@ -85,7 +85,7 @@ isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) {
 	 */
 	bufsize = 0;
 	if (sysctl(mib, 6, NULL, &bufsize, NULL, (size_t) 0) < 0) {
-		UNEXPECTED_ERROR(__FILE__, __LINE__, 
+		UNEXPECTED_ERROR(__FILE__, __LINE__,
 				 "getting interface list size: sysctl: %s",
 				 strerror(errno));
 		result = ISC_R_UNEXPECTED;
@@ -101,7 +101,7 @@ isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) {
 
 	bufused = bufsize;
 	if (sysctl(mib, 6, iter->buf, &bufused, NULL, (size_t) 0) < 0) {
-		UNEXPECTED_ERROR(__FILE__, __LINE__, 
+		UNEXPECTED_ERROR(__FILE__, __LINE__,
 				 "getting interface list: sysctl: %s",
 				 strerror(errno));
 		result = ISC_R_UNEXPECTED;
@@ -116,7 +116,7 @@ isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) {
 	 */
 	iter->pos = (unsigned int) -1;
 	iter->result = ISC_R_FAILURE;
-	
+
 	iter->magic = IFITER_MAGIC;
 	*iterp = iter;
 	return (ISC_R_SUCCESS);
@@ -139,34 +139,34 @@ isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) {
 static isc_result_t
 internal_current(isc_interfaceiter_t *iter) {
 	struct ifa_msghdr *ifam, *ifam_end;
-	
+
 	REQUIRE(VALID_IFITER(iter));
 	REQUIRE (iter->pos < (unsigned int) iter->bufused);
 
 	ifam = (struct ifa_msghdr *) ((char *) iter->buf + iter->pos);
 	ifam_end = (struct ifa_msghdr *) ((char *) iter->buf + iter->bufused);
-	
+
 	if (ifam->ifam_type == RTM_IFINFO) {
 		struct if_msghdr *ifm = (struct if_msghdr *) ifam;
 		struct sockaddr_dl *sdl = (struct sockaddr_dl *) (ifm + 1);
 		unsigned int namelen;
 
 		memset(&iter->current, 0, sizeof(iter->current));
-		
+
 		namelen = sdl->sdl_nlen;
 		if (namelen > sizeof(iter->current.name) - 1)
 			namelen = sizeof(iter->current.name) - 1;
-		    
+
 		memcpy(iter->current.name, sdl->sdl_data, namelen);
 
 		iter->current.flags = 0;
 
 		if ((ifam->ifam_flags & IFF_UP) != 0)
 			iter->current.flags |= INTERFACE_F_UP;
-		
+
 		if ((ifam->ifam_flags & IFF_POINTOPOINT) != 0)
 			iter->current.flags |= INTERFACE_F_POINTTOPOINT;
-		
+
 		if ((ifam->ifam_flags & IFF_LOOPBACK) != 0)
 			iter->current.flags |= INTERFACE_F_LOOPBACK;
 
@@ -191,7 +191,7 @@ internal_current(isc_interfaceiter_t *iter) {
 				continue;
 
 			INSIST(sa < (struct sockaddr *) ifam_end);
-			
+
 			switch (i) {
 			case RTAX_NETMASK: /* Netmask */
 				mask_sa = sa;
@@ -223,18 +223,18 @@ internal_current(isc_interfaceiter_t *iter) {
 
 		if (addr_sa == NULL)
 			return (ISC_R_IGNORE);
-		
+
 		family = addr_sa->sa_family;
 		if (family != AF_INET) /* XXX IP6 */
 			return (ISC_R_IGNORE);
 
 		iter->current.af = family;
-		
+
 		get_addr(family, &iter->current.address, addr_sa);
 
 		if (mask_sa != NULL)
 			get_addr(family, &iter->current.netmask, mask_sa);
-		
+
 		if (dst_sa != NULL &&
 		    (iter->current.flags & IFF_POINTOPOINT) != 0)
 			get_addr(family, &iter->current.dstaddress, dst_sa);
@@ -247,7 +247,7 @@ internal_current(isc_interfaceiter_t *iter) {
 }
 
 /*
- * Step the iterator to the next interface.  Unlike 
+ * Step the iterator to the next interface.  Unlike
  * isc_interfaceiter_next(), this may leave the iterator
  * positioned on an interface that will ultimately
  * be ignored.  Return ISC_R_NOMORE if there are no more
@@ -257,14 +257,14 @@ static isc_result_t
 internal_next(isc_interfaceiter_t *iter) {
 	struct ifa_msghdr *ifam;
 	REQUIRE (iter->pos < (unsigned int) iter->bufused);
-	
+
 	ifam = (struct ifa_msghdr *) ((char *) iter->buf + iter->pos);
 
 	iter->pos += ifam->ifam_msglen;
 
 	if (iter->pos >= iter->bufused)
 		return (ISC_R_NOMORE);
-	
+
 	return (ISC_R_SUCCESS);
 }
 
diff --git a/lib/isc/unix/include/Makefile.in b/lib/isc/unix/include/Makefile.in
index 58b0addf0a..dd3b10fad0 100644
--- a/lib/isc/unix/include/Makefile.in
+++ b/lib/isc/unix/include/Makefile.in
@@ -1,9 +1,9 @@
 # Copyright (C) 1998-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
 # 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
@@ -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.9 2000/07/27 09:52:57 tale Exp $
+# $Id: Makefile.in,v 1.10 2000/08/01 01:31:31 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/isc/unix/include/isc/Makefile.in b/lib/isc/unix/include/isc/Makefile.in
index 1467ed3a6a..6da25ed16a 100644
--- a/lib/isc/unix/include/isc/Makefile.in
+++ b/lib/isc/unix/include/isc/Makefile.in
@@ -1,9 +1,9 @@
 # Copyright (C) 1998-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
 # 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
@@ -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.22 2000/07/27 09:52:58 tale Exp $
+# $Id: Makefile.in,v 1.23 2000/08/01 01:31:32 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/isc/unix/include/isc/app.h b/lib/isc/unix/include/isc/app.h
index 76c03fef33..2e2955291a 100644
--- a/lib/isc/unix/include/isc/app.h
+++ b/lib/isc/unix/include/isc/app.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: app.h,v 1.7 2000/07/27 09:52:59 tale Exp $ */
+/* $Id: app.h,v 1.8 2000/08/01 01:31:34 tale Exp $ */
 
 #ifndef ISC_APP_H
 #define ISC_APP_H 1
diff --git a/lib/isc/unix/include/isc/dir.h b/lib/isc/unix/include/isc/dir.h
index 33584cba69..44d73a10f6 100644
--- a/lib/isc/unix/include/isc/dir.h
+++ b/lib/isc/unix/include/isc/dir.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dir.h,v 1.10 2000/07/27 09:53:00 tale Exp $ */
+/* $Id: dir.h,v 1.11 2000/08/01 01:31:35 tale Exp $ */
 
 /* Principal Authors: DCL */
 
diff --git a/lib/isc/unix/include/isc/int.h b/lib/isc/unix/include/isc/int.h
index 2c1569d151..d1a640ef20 100644
--- a/lib/isc/unix/include/isc/int.h
+++ b/lib/isc/unix/include/isc/int.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: int.h,v 1.7 2000/07/27 09:53:01 tale Exp $ */
+/* $Id: int.h,v 1.8 2000/08/01 01:31:36 tale Exp $ */
 
 #ifndef ISC_INT_H
 #define ISC_INT_H 1
diff --git a/lib/isc/unix/include/isc/keyboard.h b/lib/isc/unix/include/isc/keyboard.h
index 7bd9e89f6e..26b2c86776 100644
--- a/lib/isc/unix/include/isc/keyboard.h
+++ b/lib/isc/unix/include/isc/keyboard.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keyboard.h,v 1.4 2000/07/31 20:36:08 bwelling Exp $ */
+/* $Id: keyboard.h,v 1.5 2000/08/01 01:31:37 tale Exp $ */
 
 #ifndef ISC_KEYBOARD_H
 #define ISC_KEYBOARD_H 1
diff --git a/lib/isc/unix/include/isc/net.h b/lib/isc/unix/include/isc/net.h
index 2cbb12d72f..4cd94e6388 100644
--- a/lib/isc/unix/include/isc/net.h
+++ b/lib/isc/unix/include/isc/net.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: net.h,v 1.22 2000/07/27 09:53:04 tale Exp $ */
+/* $Id: net.h,v 1.23 2000/08/01 01:31:38 tale Exp $ */
 
 #ifndef ISC_NET_H
 #define ISC_NET_H 1
diff --git a/lib/isc/unix/include/isc/netdb.h b/lib/isc/unix/include/isc/netdb.h
index aa390f1fc3..dcca04000a 100644
--- a/lib/isc/unix/include/isc/netdb.h
+++ b/lib/isc/unix/include/isc/netdb.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: netdb.h,v 1.4 2000/07/27 09:53:05 tale Exp $ */
+/* $Id: netdb.h,v 1.5 2000/08/01 01:31:39 tale Exp $ */
 
 #ifndef ISC_NETDB_H
 #define ISC_NETDB_H 1
diff --git a/lib/isc/unix/include/isc/offset.h b/lib/isc/unix/include/isc/offset.h
index a7e356024d..a63ab443c6 100644
--- a/lib/isc/unix/include/isc/offset.h
+++ b/lib/isc/unix/include/isc/offset.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: offset.h,v 1.8 2000/07/27 09:53:06 tale Exp $ */
+/* $Id: offset.h,v 1.9 2000/08/01 01:31:40 tale Exp $ */
 
 #ifndef ISC_OFFSET_H
 #define ISC_OFFSET_H 1
diff --git a/lib/isc/unix/include/isc/stdtime.h b/lib/isc/unix/include/isc/stdtime.h
index 6062716f29..5dfa31ea6e 100644
--- a/lib/isc/unix/include/isc/stdtime.h
+++ b/lib/isc/unix/include/isc/stdtime.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: stdtime.h,v 1.6 2000/07/27 09:53:07 tale Exp $ */
+/* $Id: stdtime.h,v 1.7 2000/08/01 01:31:41 tale Exp $ */
 
 #ifndef ISC_STDTIME_H
 #define ISC_STDTIME_H 1
diff --git a/lib/isc/unix/include/isc/time.h b/lib/isc/unix/include/isc/time.h
index 1b114a74bf..366d367092 100644
--- a/lib/isc/unix/include/isc/time.h
+++ b/lib/isc/unix/include/isc/time.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: time.h,v 1.23 2000/07/27 09:53:08 tale Exp $ */
+/* $Id: time.h,v 1.24 2000/08/01 01:31:42 tale Exp $ */
 
 #ifndef ISC_TIME_H
 #define ISC_TIME_H 1
diff --git a/lib/isc/unix/interfaceiter.c b/lib/isc/unix/interfaceiter.c
index c0ad61c879..f8ddb803a2 100644
--- a/lib/isc/unix/interfaceiter.c
+++ b/lib/isc/unix/interfaceiter.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: interfaceiter.c,v 1.18 2000/07/27 09:52:46 tale Exp $ */
+/* $Id: interfaceiter.c,v 1.19 2000/08/01 01:31:21 tale Exp $ */
 
 #include 
 
@@ -44,14 +44,14 @@
 
 /*
  * Extract the network address part from a "struct sockaddr".
- * 
+ *
  * The address family is given explicity
  * instead of using src->sa_family, because the latter does not work
  * for copying a network mask obtained by SIOCGIFNETMASK (it does
  * not have a valid address family).
  */
 
-static void 
+static void
 get_addr(unsigned int family, isc_netaddr_t *dst, struct sockaddr *src) {
 	dst->family = family;
 	switch (family) {
@@ -98,12 +98,12 @@ isc_result_t
 isc_interfaceiter_first(isc_interfaceiter_t *iter) {
 	isc_result_t result;
 
-	REQUIRE(VALID_IFITER(iter));	
+	REQUIRE(VALID_IFITER(iter));
 
 	iter->pos = 0;
 	for (;;) {
 		result = internal_current(iter);
-		if (result != ISC_R_IGNORE) 
+		if (result != ISC_R_IGNORE)
 			break;
 		result = internal_next(iter);
 		if (result != ISC_R_SUCCESS)
@@ -116,7 +116,7 @@ isc_interfaceiter_first(isc_interfaceiter_t *iter) {
 isc_result_t
 isc_interfaceiter_next(isc_interfaceiter_t *iter) {
 	isc_result_t result;
-		
+
 	REQUIRE(VALID_IFITER(iter));
 	REQUIRE(iter->result == ISC_R_SUCCESS);
 
diff --git a/lib/isc/unix/ipv6.c b/lib/isc/unix/ipv6.c
index f765dc6606..3a96dd8e23 100644
--- a/lib/isc/unix/ipv6.c
+++ b/lib/isc/unix/ipv6.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ipv6.c,v 1.5 2000/07/27 09:52:47 tale Exp $ */
+/* $Id: ipv6.c,v 1.6 2000/08/01 01:31:22 tale Exp $ */
 
 #include 
 
diff --git a/lib/isc/unix/keyboard.c b/lib/isc/unix/keyboard.c
index beb5b4d30b..fbcaa48b84 100644
--- a/lib/isc/unix/keyboard.c
+++ b/lib/isc/unix/keyboard.c
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keyboard.c,v 1.6 2000/07/31 20:36:07 bwelling Exp $ */
+/* $Id: keyboard.c,v 1.7 2000/08/01 01:31:23 tale Exp $ */
 
 #include 
 
diff --git a/lib/isc/unix/net.c b/lib/isc/unix/net.c
index e589032a28..2e2afdcd90 100644
--- a/lib/isc/unix/net.c
+++ b/lib/isc/unix/net.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: net.c,v 1.11 2000/07/27 09:52:50 tale Exp $ */
+/* $Id: net.c,v 1.12 2000/08/01 01:31:24 tale Exp $ */
 
 #include 
 
diff --git a/lib/isc/unix/os.c b/lib/isc/unix/os.c
index ce48cbf634..a8c11e9772 100644
--- a/lib/isc/unix/os.c
+++ b/lib/isc/unix/os.c
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: os.c,v 1.4 2000/07/27 09:52:51 tale Exp $ */
+/* $Id: os.c,v 1.5 2000/08/01 01:31:25 tale Exp $ */
 
 #include 
 
diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index b6d2398208..52b36069f3 100644
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.152 2000/07/27 09:52:52 tale Exp $ */
+/* $Id: socket.c,v 1.153 2000/08/01 01:31:27 tale Exp $ */
 
 #include 
 
@@ -1256,7 +1256,7 @@ isc_socket_attach(isc_socket_t *sock, isc_socket_t **socketp) {
 	LOCK(&sock->lock);
 	sock->references++;
 	UNLOCK(&sock->lock);
-	
+
 	*socketp = sock;
 }
 
@@ -1264,7 +1264,7 @@ isc_socket_attach(isc_socket_t *sock, isc_socket_t **socketp) {
  * Dereference a socket.  If this is the last reference to it, clean things
  * up by destroying the socket.
  */
-void 
+void
 isc_socket_detach(isc_socket_t **socketp) {
 	isc_socket_t *sock;
 	isc_boolean_t kill_socket = ISC_FALSE;
@@ -1279,7 +1279,7 @@ isc_socket_detach(isc_socket_t **socketp) {
 	if (sock->references == 0)
 		kill_socket = ISC_TRUE;
 	UNLOCK(&sock->lock);
-	
+
 	if (kill_socket)
 		destroy(&sock);
 
@@ -1810,7 +1810,7 @@ watcher(void *uap) {
 				}
 			}
 #endif
-					
+
 			UNLOCK(&manager->lock);
 
 			cc = select(maxfd, &readfds, &writefds, NULL, NULL);
@@ -1931,9 +1931,9 @@ watcher(void *uap) {
 				manager->fdstate[i] = CLOSED;
 				FD_CLR(i, &manager->read_fds);
 				FD_CLR(i, &manager->write_fds);
-				
+
 				close(i);
-				
+
 				continue;
 			}
 
@@ -1995,7 +1995,7 @@ isc_socketmgr_create(isc_mem_t *mctx, isc_socketmgr_t **managerp) {
 	manager = isc_mem_get(mctx, sizeof *manager);
 	if (manager == NULL)
 		return (ISC_R_NOMEMORY);
-	
+
 	manager->magic = SOCKET_MANAGER_MAGIC;
 	manager->mctx = NULL;
 	memset(manager->fds, 0, sizeof(manager->fds));
diff --git a/lib/isc/unix/stdio.c b/lib/isc/unix/stdio.c
index 0e2f5bb0e5..67e42b65b4 100644
--- a/lib/isc/unix/stdio.c
+++ b/lib/isc/unix/stdio.c
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: stdio.c,v 1.3 2000/07/27 09:52:53 tale Exp $ */
+/* $Id: stdio.c,v 1.4 2000/08/01 01:31:28 tale Exp $ */
 
 #include 
 
@@ -29,7 +29,7 @@
 isc_result_t
 isc_stdio_open(const char *filename, const char *mode, FILE **fp) {
 	FILE *f;
-	
+
 	f = fopen(filename, mode);
 	if (f == NULL)
 		return (isc__errno2result(errno));
@@ -63,7 +63,7 @@ isc_result_t
 isc_stdio_read(void *ptr, size_t size, size_t nmemb, FILE *f, size_t *nret) {
 	isc_result_t result = ISC_R_SUCCESS;
 	size_t r;
-	
+
 	clearerr(f);
 	r = fread(ptr, size, nmemb, f);
 	if (r != nmemb) {
@@ -83,7 +83,7 @@ isc_stdio_write(const void *ptr, size_t size, size_t nmemb, FILE *f,
 {
 	isc_result_t result = ISC_R_SUCCESS;
 	size_t r;
-	
+
 	clearerr(f);
 	r = fwrite(ptr, size, nmemb, f);
 	if (r != nmemb)
@@ -96,7 +96,7 @@ isc_stdio_write(const void *ptr, size_t size, size_t nmemb, FILE *f,
 isc_result_t
 isc_stdio_flush(FILE *f) {
 	int r;
-	
+
 	r = fflush(f);
 	if (r == 0)
 		return (ISC_R_SUCCESS);
@@ -107,7 +107,7 @@ isc_stdio_flush(FILE *f) {
 isc_result_t
 isc_stdio_sync(FILE *f) {
 	int r;
-	
+
 	r = fsync(fileno(f));
 	if (r == 0)
 		return (ISC_R_SUCCESS);
diff --git a/lib/isc/unix/stdtime.c b/lib/isc/unix/stdtime.c
index d6fa1f5dc4..9db52e17fe 100644
--- a/lib/isc/unix/stdtime.c
+++ b/lib/isc/unix/stdtime.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: stdtime.c,v 1.8 2000/07/27 09:52:55 tale Exp $ */
+/* $Id: stdtime.c,v 1.9 2000/08/01 01:31:29 tale Exp $ */
 
 #include 
 
@@ -32,9 +32,9 @@ isc_stdtime_get(isc_stdtime_t *t) {
 	 * Set 't' to the number of seconds since 00:00:00 UTC, January 1,
 	 * 1970.
 	 */
-	
+
 	REQUIRE(t != NULL);
-	
+
 	RUNTIME_CHECK(gettimeofday(&tv, NULL) != -1);
 
 	INSIST(tv.tv_usec >= 0 && tv.tv_usec < 1000000);
diff --git a/lib/isc/unix/time.c b/lib/isc/unix/time.c
index 0893bbc804..f6dc61e0bb 100644
--- a/lib/isc/unix/time.c
+++ b/lib/isc/unix/time.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: time.c,v 1.27 2000/07/27 09:52:56 tale Exp $ */
+/* $Id: time.c,v 1.28 2000/08/01 01:31:30 tale Exp $ */
 
 #include 
 
@@ -34,7 +34,7 @@
 #define US_PER_S	1000000		/* Microseconds per second. */
 
 /*
- * All of the INSIST()s checks of nanoseconds < NS_PER_S are for 
+ * All of the INSIST()s checks of nanoseconds < NS_PER_S are for
  * consistency checking of the type. In lieu of magic numbers, it
  * is the best we've got.  The check is only performed on functions which
  * need an initialized type.
@@ -137,9 +137,9 @@ isc_time_now(isc_time_t *t) {
 	/*
 	 * Set *t to the current absolute time.
 	 */
-	
+
 	REQUIRE(t != NULL);
-	
+
 	if (gettimeofday(&tv, NULL) == -1) {
 		UNEXPECTED_ERROR(__FILE__, __LINE__, strerror(errno));
 		return (ISC_R_UNEXPECTED);
@@ -156,7 +156,7 @@ isc_time_now(isc_time_t *t) {
 		return (ISC_R_UNEXPECTED);
 
 	/*
-	 * Ensure the tv_sec value fits in t->seconds. 
+	 * Ensure the tv_sec value fits in t->seconds.
 	 */
 	if (sizeof(tv.tv_sec) > sizeof(t->seconds) &&
 	    ((tv.tv_sec | (unsigned int)-1) ^ (unsigned int)-1) != 0)
@@ -175,7 +175,7 @@ isc_time_nowplusinterval(isc_time_t *t, isc_interval_t *i) {
 	/*
 	 * Set *t to the current absolute time + i.
 	 */
-	
+
 	REQUIRE(t != NULL);
 	REQUIRE(i != NULL);
 	INSIST(i->nanoseconds < NS_PER_S);
@@ -342,7 +342,7 @@ isc_time_secondsastimet(isc_time_t *t, time_t *secondsp) {
 	 * about "signed versus unsigned" while trying to determine if the
 	 * the unsigned int t->seconds is out range for tv_sec, which is
 	 * pretty much only true if time_t is a signed integer of the same
-	 * size as the return value of isc_time_seconds. 
+	 * size as the return value of isc_time_seconds.
 	 *
 	 * The use of the 64 bit integer ``i'' takes advantage of C's
 	 * conversion rules to either zero fill or sign extend the widened
diff --git a/lib/isc/version.c b/lib/isc/version.c
index 6d1f3eed42..a1aa355bfa 100644
--- a/lib/isc/version.c
+++ b/lib/isc/version.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.c,v 1.7 2000/07/27 09:51:20 tale Exp $ */
+/* $Id: version.c,v 1.8 2000/08/01 01:29:54 tale Exp $ */
 
 char isc_version[] = VERSION;
 
diff --git a/lib/isc/win32/Makefile.in b/lib/isc/win32/Makefile.in
index 10670cc17d..75d9efadd9 100644
--- a/lib/isc/win32/Makefile.in
+++ b/lib/isc/win32/Makefile.in
@@ -1,9 +1,9 @@
 # Copyright (C) 1999, 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
 # 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
@@ -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.6 2000/07/27 09:53:09 tale Exp $
+# $Id: Makefile.in,v 1.7 2000/08/01 01:31:44 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/isc/win32/condition.c b/lib/isc/win32/condition.c
index 7f8eb2459c..f9b04f49ae 100644
--- a/lib/isc/win32/condition.c
+++ b/lib/isc/win32/condition.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: condition.c,v 1.13 2000/07/27 09:53:10 tale Exp $ */
+/* $Id: condition.c,v 1.14 2000/08/01 01:31:45 tale Exp $ */
 
 #include 
 
@@ -28,7 +28,7 @@
 isc_result_t
 isc_condition_init(isc_condition_t *cond) {
 	HANDLE h;
-	
+
 	REQUIRE(cond != NULL);
 
 	cond->waiters = 0;
@@ -51,7 +51,7 @@ isc_condition_init(isc_condition_t *cond) {
 
 isc_result_t
 isc_condition_signal(isc_condition_t *cond) {
-	
+
 	/*
 	 * Unlike pthreads, the caller MUST hold the lock associated with
 	 * the condition variable when calling us.
@@ -69,7 +69,7 @@ isc_condition_signal(isc_condition_t *cond) {
 
 isc_result_t
 isc_condition_broadcast(isc_condition_t *cond) {
-		
+
 	/*
 	 * Unlike pthreads, the caller MUST hold the lock associated with
 	 * the condition variable when calling us.
@@ -87,7 +87,7 @@ isc_condition_broadcast(isc_condition_t *cond) {
 
 isc_result_t
 isc_condition_destroy(isc_condition_t *cond) {
-		
+
 	REQUIRE(cond != NULL);
 
 	(void)CloseHandle(cond->events[SIGNAL]);
diff --git a/lib/isc/win32/dir.c b/lib/isc/win32/dir.c
index b687b6edb4..00a579df66 100644
--- a/lib/isc/win32/dir.c
+++ b/lib/isc/win32/dir.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dir.c,v 1.5 2000/07/27 09:53:12 tale Exp $ */
+/* $Id: dir.c,v 1.6 2000/08/01 01:31:46 tale Exp $ */
 
 /* Principal Authors: DCL */
 
@@ -48,7 +48,7 @@ isc_dir_init(isc_dir_t *dir) {
 }
 
 /*
- * Allocate workspace and open directory stream. If either one fails, 
+ * Allocate workspace and open directory stream. If either one fails,
  * NULL will be returned.
  */
 isc_result_t
@@ -118,7 +118,7 @@ isc_dir_read(isc_dir_t *dir) {
 	}
 
 	/*
-	 * Make sure that the space for the name is long enough. 
+	 * Make sure that the space for the name is long enough.
 	 */
 	strcpy(dir->entry.name, dir->entry.find_data.cFileName);
 	dir->entry.length = strlen(dir->entry.name);
@@ -169,7 +169,7 @@ isc_dir_reset(isc_dir_t *dir) {
  */
 static isc_result_t
 start_directory(isc_dir_t *dir)
-{ 
+{
 	REQUIRE(VALID_DIR(dir));
 	REQUIRE(dir->search_handle == INVALID_HANDLE_VALUE);
 
@@ -195,7 +195,7 @@ start_directory(isc_dir_t *dir)
 	}
 
 	/*
-	 * Make sure that the space for the name is long enough. 
+	 * Make sure that the space for the name is long enough.
 	 */
 	INSIST(sizeof(dir->entry.name) >
 	       strlen(dir->entry.find_data.cFileName));
diff --git a/lib/isc/win32/file.c b/lib/isc/win32/file.c
index 0b3b016c03..44f32e3f62 100644
--- a/lib/isc/win32/file.c
+++ b/lib/isc/win32/file.c
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: file.c,v 1.4 2000/07/27 09:53:13 tale Exp $ */
+/* $Id: file.c,v 1.5 2000/08/01 01:31:47 tale Exp $ */
 
 #include 
 
diff --git a/lib/isc/win32/fsaccess.c b/lib/isc/win32/fsaccess.c
index 9594ed3429..5fbe72ce80 100644
--- a/lib/isc/win32/fsaccess.c
+++ b/lib/isc/win32/fsaccess.c
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: fsaccess.c,v 1.4 2000/07/27 09:53:14 tale Exp $ */
+/* $Id: fsaccess.c,v 1.5 2000/08/01 01:31:48 tale Exp $ */
 
 #include 
 #include 
@@ -56,7 +56,7 @@ isc_fsaccess_set(const char *path, isc_fsaccess_t access) {
 	result = check_bad_bits(access, is_dir);
 	if (result != ISC_R_SUCCESS)
 		return (result);
-	
+
 	winerror = GetNamedSecurityInfo(path, SE_FILE_OBJECT,
 					OWNER_SECURITY_INFORMATION |
 					GROUP_SECURITY_INFORMATION,
@@ -123,7 +123,7 @@ isc_fsaccess_set(const char *path, isc_fsaccess_t access) {
 			/*
 			 * Setting world.
 			 */
-			SID_IDENTIFIER_AUTHORITY authworld = 
+			SID_IDENTIFIER_AUTHORITY authworld =
 				SECURITY_WORLD_SID_AUTHORITY;
 
 			if (AllocateAndInitializeSid(&authworld, 1,
diff --git a/lib/isc/win32/include/Makefile.in b/lib/isc/win32/include/Makefile.in
index 433ae70404..c8d66a37ad 100644
--- a/lib/isc/win32/include/Makefile.in
+++ b/lib/isc/win32/include/Makefile.in
@@ -1,9 +1,9 @@
 # Copyright (C) 1999, 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
 # 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
@@ -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.4 2000/07/27 09:53:19 tale Exp $
+# $Id: Makefile.in,v 1.5 2000/08/01 01:31:54 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/isc/win32/include/isc/Makefile.in b/lib/isc/win32/include/isc/Makefile.in
index 4a374713a5..84262304a1 100644
--- a/lib/isc/win32/include/isc/Makefile.in
+++ b/lib/isc/win32/include/isc/Makefile.in
@@ -1,9 +1,9 @@
 # Copyright (C) 1999, 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
 # 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
@@ -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.5 2000/07/27 09:53:21 tale Exp $
+# $Id: Makefile.in,v 1.6 2000/08/01 01:31:55 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/isc/win32/include/isc/condition.h b/lib/isc/win32/include/isc/condition.h
index 2d05f8b2b6..3f27d27400 100644
--- a/lib/isc/win32/include/isc/condition.h
+++ b/lib/isc/win32/include/isc/condition.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: condition.h,v 1.11 2000/07/27 09:53:22 tale Exp $ */
+/* $Id: condition.h,v 1.12 2000/08/01 01:31:56 tale Exp $ */
 
 #ifndef ISC_CONDITION_H
 #define ISC_CONDITION_H 1
@@ -27,7 +27,7 @@
 #include 
 
 typedef struct isc_condition {
-	HANDLE 		events[2];	
+	HANDLE 		events[2];
 	unsigned int	waiters;
 } isc_condition_t;
 
diff --git a/lib/isc/win32/include/isc/dir.h b/lib/isc/win32/include/isc/dir.h
index 348301d9c1..e3a55c5a4f 100644
--- a/lib/isc/win32/include/isc/dir.h
+++ b/lib/isc/win32/include/isc/dir.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dir.h,v 1.6 2000/07/27 09:53:23 tale Exp $ */
+/* $Id: dir.h,v 1.7 2000/08/01 01:31:57 tale Exp $ */
 
 /* Principal Authors: DCL */
 
diff --git a/lib/isc/win32/include/isc/int.h b/lib/isc/win32/include/isc/int.h
index ec825f8dd8..585e12e160 100644
--- a/lib/isc/win32/include/isc/int.h
+++ b/lib/isc/win32/include/isc/int.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: int.h,v 1.5 2000/07/27 09:53:24 tale Exp $ */
+/* $Id: int.h,v 1.6 2000/08/01 01:31:58 tale Exp $ */
 
 #ifndef ISC_INT_H
 #define ISC_INT_H 1
diff --git a/lib/isc/win32/include/isc/mutex.h b/lib/isc/win32/include/isc/mutex.h
index 36aeeb5f94..ed797d5812 100644
--- a/lib/isc/win32/include/isc/mutex.h
+++ b/lib/isc/win32/include/isc/mutex.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mutex.h,v 1.11 2000/07/27 09:53:25 tale Exp $ */
+/* $Id: mutex.h,v 1.12 2000/08/01 01:31:59 tale Exp $ */
 
 #ifndef ISC_MUTEX_H
 #define ISC_MUTEX_H 1
diff --git a/lib/isc/win32/include/isc/net.h b/lib/isc/win32/include/isc/net.h
index 72e5855113..aa82a98ce7 100644
--- a/lib/isc/win32/include/isc/net.h
+++ b/lib/isc/win32/include/isc/net.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: net.h,v 1.10 2000/07/27 09:53:26 tale Exp $ */
+/* $Id: net.h,v 1.11 2000/08/01 01:32:01 tale Exp $ */
 
 #ifndef ISC_NET_H
 #define ISC_NET_H 1
diff --git a/lib/isc/win32/include/isc/netdb.h b/lib/isc/win32/include/isc/netdb.h
index 5e5e89b12b..fe5eb5d87e 100644
--- a/lib/isc/win32/include/isc/netdb.h
+++ b/lib/isc/win32/include/isc/netdb.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: netdb.h,v 1.4 2000/07/27 09:53:27 tale Exp $ */
+/* $Id: netdb.h,v 1.5 2000/08/01 01:32:02 tale Exp $ */
 
 #ifndef ISC_NETDB_H
 #define ISC_NETDB_H 1
diff --git a/lib/isc/win32/include/isc/once.h b/lib/isc/win32/include/isc/once.h
index 0bb6657045..dc1ebeba32 100644
--- a/lib/isc/win32/include/isc/once.h
+++ b/lib/isc/win32/include/isc/once.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: once.h,v 1.4 2000/07/27 09:53:28 tale Exp $ */
+/* $Id: once.h,v 1.5 2000/08/01 01:32:03 tale Exp $ */
 
 #ifndef ISC_ONCE_H
 #define ISC_ONCE_H 1
diff --git a/lib/isc/win32/include/isc/stdtime.h b/lib/isc/win32/include/isc/stdtime.h
index cc7e655962..54159fbea8 100644
--- a/lib/isc/win32/include/isc/stdtime.h
+++ b/lib/isc/win32/include/isc/stdtime.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: stdtime.h,v 1.5 2000/07/27 09:53:29 tale Exp $ */
+/* $Id: stdtime.h,v 1.6 2000/08/01 01:32:04 tale Exp $ */
 
 #ifndef ISC_STDTIME_H
 #define ISC_STDTIME_H 1
diff --git a/lib/isc/win32/include/isc/thread.h b/lib/isc/win32/include/isc/thread.h
index 37ee0d1aeb..df4a6f4c29 100644
--- a/lib/isc/win32/include/isc/thread.h
+++ b/lib/isc/win32/include/isc/thread.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: thread.h,v 1.11 2000/07/27 09:53:31 tale Exp $ */
+/* $Id: thread.h,v 1.12 2000/08/01 01:32:05 tale Exp $ */
 
 #ifndef ISC_THREAD_H
 #define ISC_THREAD_H 1
diff --git a/lib/isc/win32/include/isc/time.h b/lib/isc/win32/include/isc/time.h
index 6415c34b53..fee01475aa 100644
--- a/lib/isc/win32/include/isc/time.h
+++ b/lib/isc/win32/include/isc/time.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: time.h,v 1.17 2000/07/27 09:53:32 tale Exp $ */
+/* $Id: time.h,v 1.18 2000/08/01 01:32:06 tale Exp $ */
 
 #ifndef ISC_TIME_H
 #define ISC_TIME_H 1
diff --git a/lib/isc/win32/once.c b/lib/isc/win32/once.c
index 34b76b6012..4dc7b97f70 100644
--- a/lib/isc/win32/once.c
+++ b/lib/isc/win32/once.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: once.c,v 1.4 2000/07/27 09:53:15 tale Exp $ */
+/* $Id: once.c,v 1.5 2000/08/01 01:31:49 tale Exp $ */
 
 /* Principal Authors: DCL */
 
@@ -30,8 +30,8 @@ isc_once_do(isc_once_t *controller, void(*function)(void))
 {
 	REQUIRE(controller != NULL && function != NULL);
 
-	if (controller->status == ISC_ONCE_INIT_NEEDED) {	
-	
+	if (controller->status == ISC_ONCE_INIT_NEEDED) {
+
 		if (InterlockedDecrement(&controller->counter) == 0) {
 			if (controller->status == ISC_ONCE_INIT_NEEDED) {
 				function();
diff --git a/lib/isc/win32/stdtime.c b/lib/isc/win32/stdtime.c
index 796a1803df..57a8415492 100644
--- a/lib/isc/win32/stdtime.c
+++ b/lib/isc/win32/stdtime.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: stdtime.c,v 1.5 2000/07/27 09:53:16 tale Exp $ */
+/* $Id: stdtime.c,v 1.6 2000/08/01 01:31:50 tale Exp $ */
 
 #include 
 
diff --git a/lib/isc/win32/thread.c b/lib/isc/win32/thread.c
index 7000a80ff9..b7fa686f3f 100644
--- a/lib/isc/win32/thread.c
+++ b/lib/isc/win32/thread.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: thread.c,v 1.12 2000/07/27 09:53:17 tale Exp $ */
+/* $Id: thread.c,v 1.13 2000/08/01 01:31:51 tale Exp $ */
 
 #include 
 
@@ -24,7 +24,7 @@
 #include 
 
 isc_result_t
-isc_thread_create(isc_threadfunc_t start, isc_threadarg_t arg, 
+isc_thread_create(isc_threadfunc_t start, isc_threadarg_t arg,
 		  isc_thread_t *threadp)
 {
 	isc_thread_t thread;
diff --git a/lib/isc/win32/time.c b/lib/isc/win32/time.c
index 5a45f3e806..17b05ea56b 100644
--- a/lib/isc/win32/time.c
+++ b/lib/isc/win32/time.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1998-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: time.c,v 1.18 2000/07/27 09:53:18 tale Exp $ */
+/* $Id: time.c,v 1.19 2000/08/01 01:31:52 tale Exp $ */
 
 #include 
 
@@ -139,7 +139,7 @@ isc_time_now(isc_time_t *t) {
 	/*
 	 * Set *t to the current absolute time.
 	 */
-	
+
 	REQUIRE(t != NULL);
 
 	GetSystemTimeAsFileTime(&t->absolute);
@@ -154,10 +154,10 @@ isc_time_nowplusinterval(isc_time_t *t, isc_interval_t *i) {
 	/*
 	 * Set *t to the current absolute time + i.
 	 */
-	
+
 	REQUIRE(t != NULL);
 	REQUIRE(i != NULL);
-	
+
 	GetSystemTimeAsFileTime(&t->absolute);
 
 	i1.LowPart = t->absolute.dwLowDateTime;
diff --git a/lib/lwres/Makefile.in b/lib/lwres/Makefile.in
index b9adea0336..44a5cf1514 100644
--- a/lib/lwres/Makefile.in
+++ b/lib/lwres/Makefile.in
@@ -1,9 +1,9 @@
 # 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
 # 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
@@ -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 2000/07/27 09:53:33 tale Exp $
+# $Id: Makefile.in,v 1.20 2000/08/01 01:32:07 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/lwres/assert_p.h b/lib/lwres/assert_p.h
index 2d6aaa3d66..cf965c0ddc 100644
--- a/lib/lwres/assert_p.h
+++ b/lib/lwres/assert_p.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: assert_p.h,v 1.7 2000/07/27 09:53:34 tale Exp $ */
+/* $Id: assert_p.h,v 1.8 2000/08/01 01:32:08 tale Exp $ */
 
 #ifndef LWRES_ASSERT_P_H
 #define LWRES_ASSERT_P_H 1
diff --git a/lib/lwres/context.c b/lib/lwres/context.c
index 7582b39acf..b680aee74c 100644
--- a/lib/lwres/context.c
+++ b/lib/lwres/context.c
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: context.c,v 1.27 2000/07/27 09:53:35 tale Exp $ */
+/* $Id: context.c,v 1.28 2000/08/01 01:32:10 tale Exp $ */
 
 #include 
 
diff --git a/lib/lwres/context_p.h b/lib/lwres/context_p.h
index 694bee9578..ff88b24bd1 100644
--- a/lib/lwres/context_p.h
+++ b/lib/lwres/context_p.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: context_p.h,v 1.9 2000/07/27 09:53:36 tale Exp $ */
+/* $Id: context_p.h,v 1.10 2000/08/01 01:32:11 tale Exp $ */
 
 #ifndef LWRES_CONTEXT_P_H
 #define LWRES_CONTEXT_P_H 1
diff --git a/lib/lwres/gai_strerror.c b/lib/lwres/gai_strerror.c
index af4741e456..f912d6de94 100644
--- a/lib/lwres/gai_strerror.c
+++ b/lib/lwres/gai_strerror.c
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: gai_strerror.c,v 1.11 2000/07/27 09:53:38 tale Exp $ */
+/* $Id: gai_strerror.c,v 1.12 2000/08/01 01:32:12 tale Exp $ */
 
 #include 
 
@@ -40,7 +40,7 @@ lwres_gai_strerror(int ecode) {
 		const char *const_ptr;
 		char *deconst_ptr;
 	} ptr;
-		       
+
 	if ((ecode < 0) || (ecode > EAI_MAX))
 		ptr.const_ptr = "invalid error code";
 	else
diff --git a/lib/lwres/getaddrinfo.c b/lib/lwres/getaddrinfo.c
index e3f306c7b9..257c111659 100644
--- a/lib/lwres/getaddrinfo.c
+++ b/lib/lwres/getaddrinfo.c
@@ -1,13 +1,13 @@
 /*
  * Copyright (C) 1999, 2000  Internet Software Consortium.
- * 
+ *
  * This code is derived from software contributed to Internet Software
  * Consortium by Berkeley Software Design, Inc.
- * 
+ *
  * 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 AND
  * BERKELEY SOFTWARE DESIGN, INC DISCLAIM ALL WARRANTIES WITH REGARD TO
  * THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
@@ -19,8 +19,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: getaddrinfo.c,v 1.29 2000/07/07 19:43:08 bwelling Exp $ */
-  
+/* $Id: getaddrinfo.c,v 1.30 2000/08/01 01:32:13 tale Exp $ */
+
 #include 
 
 #include 
diff --git a/lib/lwres/gethost.c b/lib/lwres/gethost.c
index 2559df1a92..1a7e65b11d 100644
--- a/lib/lwres/gethost.c
+++ b/lib/lwres/gethost.c
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: gethost.c,v 1.22 2000/07/27 09:53:39 tale Exp $ */
+/* $Id: gethost.c,v 1.23 2000/08/01 01:32:14 tale Exp $ */
 
 #include 
 
@@ -64,7 +64,7 @@ struct hostent *
 lwres_gethostbyaddr(const char *addr, int len, int type) {
 	int error;
 
-	if (he != NULL) 
+	if (he != NULL)
 		lwres_freehostent(he);
 
 	he = lwres_getipnodebyaddr(addr, len, type, &error);
@@ -180,7 +180,7 @@ copytobuf(struct hostent *he, struct hostent *hptr, char *buf, int buflen) {
         }
         len += strlen(he->h_name) + 1;
         len += nptr * sizeof(char*);
-        
+
         if (len > buflen) {
                 return (-1);
         }
diff --git a/lib/lwres/getipnode.c b/lib/lwres/getipnode.c
index e3d30d8473..53f0866185 100644
--- a/lib/lwres/getipnode.c
+++ b/lib/lwres/getipnode.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: getipnode.c,v 1.24 2000/07/27 09:53:40 tale Exp $ */
+/* $Id: getipnode.c,v 1.25 2000/08/01 01:32:15 tale Exp $ */
 
 #include 
 
@@ -169,7 +169,7 @@ lwres_getipnodebyname(const char *name, int af, int flags, int *error_num) {
 	(void) lwres_conf_parse(lwrctx, "/etc/resolv.conf");
 	tmp_err = NO_RECOVERY;
 	if (have_v6 && af == AF_INET6) {
-		
+
 		n = lwres_getaddrsbyname(lwrctx, name, LWRES_ADDRTYPE_V6, &by);
 		if (n == 0) {
 			he1 = hostfromname(by, AF_INET6);
@@ -201,7 +201,7 @@ lwres_getipnodebyname(const char *name, int af, int flags, int *error_num) {
 			else
 				*error_num = NO_RECOVERY;
 			goto cleanup;
-		} 
+		}
 	} else
 		*error_num = tmp_err;
 
@@ -237,7 +237,7 @@ lwres_getipnodebyaddr(const void *src, size_t len, int af, int *error_num) {
 		*error_num = NO_RECOVERY;
 		return (NULL);
 	}
-		
+
 	switch (af) {
 	case AF_INET:
 		if (len != INADDRSZ) {
@@ -428,7 +428,7 @@ scan_interfaces(int *have_v4, int *have_v6) {
 			/*
 			 * Some OS's just return what will fit rather
 			 * than set EINVAL if the buffer is too small
-			 * to fit all the interfaces in.  If 
+			 * to fit all the interfaces in.  If
 			 * ifc.ifc_len is too near to the end of the
 			 * buffer we will grow it just in case and
 			 * retry.
@@ -491,7 +491,7 @@ scan_interfaces(int *have_v4, int *have_v6) {
 				if ((ifreq.ifr_flags & IFF_UP) == 0)
 					break;
 				*have_v4 = 1;
-			} 
+			}
 			break;
 		case AF_INET6:
 			if (*have_v6 == 0) {
diff --git a/lib/lwres/getnameinfo.c b/lib/lwres/getnameinfo.c
index a3b471d267..ff0e0f570d 100644
--- a/lib/lwres/getnameinfo.c
+++ b/lib/lwres/getnameinfo.c
@@ -1,10 +1,10 @@
 /*
  * Portions Copyright (C) 1999, 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
  * 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
@@ -15,12 +15,12 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: getnameinfo.c,v 1.24 2000/07/27 09:53:41 tale Exp $ */
+/* $Id: getnameinfo.c,v 1.25 2000/08/01 01:32:16 tale Exp $ */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -36,7 +36,7 @@
  * 4. Neither the name of the project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -140,7 +140,7 @@ lwres_getnameinfo(const struct sockaddr *sa, size_t salen, char *host,
 	if (len != salen)
 		ERR(ENI_SALEN);
 #endif
-	
+
 	family = sa->sa_family;
 	for (i = 0; afdl[i].a_af; i++)
 		if (afdl[i].a_af == family) {
@@ -148,11 +148,11 @@ lwres_getnameinfo(const struct sockaddr *sa, size_t salen, char *host,
 			goto found;
 		}
 	ERR(ENI_FAMILY);
-	
+
  found:
 	if (salen != afd->a_socklen)
 		ERR(ENI_SALEN);
-	
+
 	switch (family) {
 	case AF_INET:
 		port = ((const struct sockaddr_in *)sa)->sin_port;
@@ -195,7 +195,7 @@ lwres_getnameinfo(const struct sockaddr *sa, size_t salen, char *host,
 			flags |= NI_NUMERICHOST;
 		v4a >>= IN_CLASSA_NSHIFT;
 		if (v4a == 0 || v4a == IN_LOOPBACKNET)
-			flags |= NI_NUMERICHOST;			
+			flags |= NI_NUMERICHOST;
 		break;
 
 	case AF_INET6:
diff --git a/lib/lwres/herror.c b/lib/lwres/herror.c
index 46c2c77a37..27802a15ac 100644
--- a/lib/lwres/herror.c
+++ b/lib/lwres/herror.c
@@ -1,10 +1,10 @@
 /*
  * Portions 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
  * 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
@@ -18,7 +18,7 @@
 /*
  * Copyright (c) 1987, 1993
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,7 +34,7 @@
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -51,7 +51,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)herror.c	8.1 (Berkeley) 6/4/93";
 static const char rcsid[] =
-	"$Id: herror.c,v 1.6 2000/07/27 09:53:42 tale Exp $";
+	"$Id: herror.c,v 1.7 2000/08/01 01:32:17 tale Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include 
diff --git a/lib/lwres/include/Makefile.in b/lib/lwres/include/Makefile.in
index 24aa2d88bd..3829841fc2 100644
--- a/lib/lwres/include/Makefile.in
+++ b/lib/lwres/include/Makefile.in
@@ -1,9 +1,9 @@
 # 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
 # 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
@@ -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.3 2000/07/27 09:53:56 tale Exp $
+# $Id: Makefile.in,v 1.4 2000/08/01 01:32:31 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/lwres/include/lwres/Makefile.in b/lib/lwres/include/lwres/Makefile.in
index 89682f0e26..74acccdbab 100644
--- a/lib/lwres/include/lwres/Makefile.in
+++ b/lib/lwres/include/lwres/Makefile.in
@@ -1,9 +1,9 @@
 # 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
 # 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
@@ -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.11 2000/07/27 09:53:57 tale Exp $
+# $Id: Makefile.in,v 1.12 2000/08/01 01:32:32 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/lwres/include/lwres/context.h b/lib/lwres/include/lwres/context.h
index fbb13a27d2..dae9919b4b 100644
--- a/lib/lwres/include/lwres/context.h
+++ b/lib/lwres/include/lwres/context.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: context.h,v 1.10 2000/07/27 09:53:58 tale Exp $ */
+/* $Id: context.h,v 1.11 2000/08/01 01:32:33 tale Exp $ */
 
 #ifndef LWRES_CONTEXT_H
 #define LWRES_CONTEXT_H 1
diff --git a/lib/lwres/include/lwres/int.h b/lib/lwres/include/lwres/int.h
index 12c0163efd..97a08fa3de 100644
--- a/lib/lwres/include/lwres/int.h
+++ b/lib/lwres/include/lwres/int.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: int.h,v 1.5 2000/07/27 09:53:59 tale Exp $ */
+/* $Id: int.h,v 1.6 2000/08/01 01:32:34 tale Exp $ */
 
 #ifndef LWRES_INT_H
 #define LWRES_INT_H 1
diff --git a/lib/lwres/include/lwres/ipv6.h b/lib/lwres/include/lwres/ipv6.h
index 3cf685e410..0da3b0abc9 100644
--- a/lib/lwres/include/lwres/ipv6.h
+++ b/lib/lwres/include/lwres/ipv6.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ipv6.h,v 1.6 2000/07/27 09:54:00 tale Exp $ */
+/* $Id: ipv6.h,v 1.7 2000/08/01 01:32:36 tale Exp $ */
 
 #ifndef LWRES_IPV6_H
 #define LWRES_IPV6_H 1
diff --git a/lib/lwres/include/lwres/lang.h b/lib/lwres/include/lwres/lang.h
index 12a1fd9f2a..3a27c62a21 100644
--- a/lib/lwres/include/lwres/lang.h
+++ b/lib/lwres/include/lwres/lang.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lang.h,v 1.4 2000/07/27 09:54:01 tale Exp $ */
+/* $Id: lang.h,v 1.5 2000/08/01 01:32:37 tale Exp $ */
 
 #ifndef LWRES_LANG_H
 #define LWRES_LANG_H 1
diff --git a/lib/lwres/include/lwres/list.h b/lib/lwres/include/lwres/list.h
index 0dda2eca13..45243e3229 100644
--- a/lib/lwres/include/lwres/list.h
+++ b/lib/lwres/include/lwres/list.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1997-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: list.h,v 1.5 2000/07/27 09:54:02 tale Exp $ */
+/* $Id: list.h,v 1.6 2000/08/01 01:32:38 tale Exp $ */
 
 #ifndef LWRES_LIST_H
 #define LWRES_LIST_H 1
diff --git a/lib/lwres/include/lwres/lwbuffer.h b/lib/lwres/include/lwres/lwbuffer.h
index 358796cf2e..3eb5957b8f 100644
--- a/lib/lwres/include/lwres/lwbuffer.h
+++ b/lib/lwres/include/lwres/lwbuffer.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwbuffer.h,v 1.13 2000/07/27 09:54:03 tale Exp $ */
+/* $Id: lwbuffer.h,v 1.14 2000/08/01 01:32:39 tale Exp $ */
 
 #ifndef LWRES_LWBUFFER_H
 #define LWRES_LWBUFFER_H 1
@@ -181,7 +181,7 @@ lwres_buffer_invalidate(lwres_buffer_t *b);
  *	If assertion checking is enabled, future attempts to use 'b' without
  *	calling lwres_buffer_init() on it will cause an assertion failure.
  */
-		
+
 void
 lwres_buffer_add(lwres_buffer_t *b, unsigned int n);
 /*
diff --git a/lib/lwres/include/lwres/lwpacket.h b/lib/lwres/include/lwres/lwpacket.h
index 59b9d94125..d7f9c6b136 100644
--- a/lib/lwres/include/lwres/lwpacket.h
+++ b/lib/lwres/include/lwres/lwpacket.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwpacket.h,v 1.15 2000/07/27 09:54:04 tale Exp $ */
+/* $Id: lwpacket.h,v 1.16 2000/08/01 01:32:40 tale Exp $ */
 
 #ifndef LWRES_LWPACKET_H
 #define LWRES_LWPACKET_H 1
@@ -57,7 +57,7 @@ struct lwres_lwpacket {
  * is a request or a response.
  *
  * "serial" is set by the requestor and is returned in all replies.  If two
- * packets from the same source have the same serial number and are from 
+ * packets from the same source have the same serial number and are from
  * the same source, they are assumed to be duplicates and the latter ones
  * may be dropped.  (The library does not do this by default on replies, but
  * does so on requests.)
diff --git a/lib/lwres/include/lwres/lwres.h b/lib/lwres/include/lwres/lwres.h
index 77f26d2e28..9e05d30885 100644
--- a/lib/lwres/include/lwres/lwres.h
+++ b/lib/lwres/include/lwres/lwres.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwres.h,v 1.42 2000/07/27 09:54:06 tale Exp $ */
+/* $Id: lwres.h,v 1.43 2000/08/01 01:32:41 tale Exp $ */
 
 #ifndef LWRES_LWRES_H
 #define LWRES_LWRES_H 1
@@ -210,7 +210,7 @@ typedef struct {
 	struct {
 		lwres_addr_t addr;
 		/* mask has a non-zero 'family' and 'length' if set */
-		lwres_addr_t mask;	
+		lwres_addr_t mask;
 	} sortlist[LWRES_CONFMAXSORTLIST];
 	lwres_uint8_t	sortlistnxt;
 
@@ -218,7 +218,7 @@ typedef struct {
 	lwres_uint8_t	ndots;	       /* set to n in 'options ndots:n' */
 	lwres_uint8_t	no_tld_query;  /* non-zero if 'options no_tld_query' */
 } lwres_conf_t;
-	
+
 #define LWRES_ADDRTYPE_V4		0x00000001U	/* ipv4 */
 #define LWRES_ADDRTYPE_V6		0x00000002U	/* ipv6 */
 
@@ -449,7 +449,7 @@ lwres_conf_init(lwres_context_t *ctx);
 void
 lwres_conf_clear(lwres_context_t *ctx);
 /*
- * frees all internally allocated memory in confdata. Uses the memory 
+ * frees all internally allocated memory in confdata. Uses the memory
  * routines supplied by ctx.
  *
  * Requires:
diff --git a/lib/lwres/include/lwres/net.h b/lib/lwres/include/lwres/net.h
index 89fed73142..aff090ca52 100644
--- a/lib/lwres/include/lwres/net.h
+++ b/lib/lwres/include/lwres/net.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: net.h,v 1.7 2000/07/27 09:54:07 tale Exp $ */
+/* $Id: net.h,v 1.8 2000/08/01 01:32:42 tale Exp $ */
 
 #ifndef LWRES_NET_H
 #define LWRES_NET_H 1
diff --git a/lib/lwres/include/lwres/netdb.h.in b/lib/lwres/include/lwres/netdb.h.in
index 8c43896300..ab0545fe19 100644
--- a/lib/lwres/include/lwres/netdb.h.in
+++ b/lib/lwres/include/lwres/netdb.h.in
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: netdb.h.in,v 1.26 2000/07/27 09:54:08 tale Exp $ */
+/* $Id: netdb.h.in,v 1.27 2000/08/01 01:32:43 tale Exp $ */
 
 #ifndef LWRES_NETDB_H
 #define LWRES_NETDB_H 1
diff --git a/lib/lwres/include/lwres/platform.h.in b/lib/lwres/include/lwres/platform.h.in
index 5f931d6535..5a404835d2 100644
--- a/lib/lwres/include/lwres/platform.h.in
+++ b/lib/lwres/include/lwres/platform.h.in
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: platform.h.in,v 1.7 2000/07/27 09:54:09 tale Exp $ */
+/* $Id: platform.h.in,v 1.8 2000/08/01 01:32:44 tale Exp $ */
 
 #ifndef LWRES_PLATFORM_H
 #define LWRES_PLATFORM_H 1
diff --git a/lib/lwres/include/lwres/result.h b/lib/lwres/include/lwres/result.h
index 23d38b133a..0e908394e2 100644
--- a/lib/lwres/include/lwres/result.h
+++ b/lib/lwres/include/lwres/result.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: result.h,v 1.9 2000/07/27 09:54:10 tale Exp $ */
+/* $Id: result.h,v 1.10 2000/08/01 01:32:45 tale Exp $ */
 
 #ifndef LWRES_RESULT_H
 #define LWRES_RESULT_H 1
diff --git a/lib/lwres/lwbuffer.c b/lib/lwres/lwbuffer.c
index 7665e7fda1..83947670fb 100644
--- a/lib/lwres/lwbuffer.c
+++ b/lib/lwres/lwbuffer.c
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwbuffer.c,v 1.8 2000/07/27 09:53:43 tale Exp $ */
+/* $Id: lwbuffer.c,v 1.9 2000/08/01 01:32:18 tale Exp $ */
 
 #include 
 
@@ -50,7 +50,7 @@ lwres_buffer_invalidate(lwres_buffer_t *b)
 	 */
 
 	REQUIRE(LWRES_BUFFER_VALID(b));
-	
+
 	b->magic = 0;
 	b->base = NULL;
 	b->length = 0;
@@ -268,7 +268,7 @@ lwres_buffer_putmem(lwres_buffer_t *b, const unsigned char *base,
 	cp = (unsigned char *)b->base + b->used;
 	memcpy(cp, base, length);
 	b->used += length;
-}	
+}
 
 void
 lwres_buffer_getmem(lwres_buffer_t *b, unsigned char *base,
@@ -284,4 +284,4 @@ lwres_buffer_getmem(lwres_buffer_t *b, unsigned char *base,
 	b->current += length;
 
 	memcpy(base, cp, length);
-}	
+}
diff --git a/lib/lwres/lwconfig.c b/lib/lwres/lwconfig.c
index 35d0aa08ba..29ceaf1865 100644
--- a/lib/lwres/lwconfig.c
+++ b/lib/lwres/lwconfig.c
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwconfig.c,v 1.23 2000/07/27 09:53:44 tale Exp $ */
+/* $Id: lwconfig.c,v 1.24 2000/08/01 01:32:20 tale Exp $ */
 
 /***
  *** Module for parsing resolv.conf files.
@@ -94,14 +94,14 @@ lwres_resetaddr(lwres_addr_t *addr);
 static lwres_result_t
 lwres_create_addr(const char *buff, lwres_addr_t *addr);
 
-static int lwresaddr2af(int lwresaddrtype); 
+static int lwresaddr2af(int lwresaddrtype);
 
 
 static int
 lwresaddr2af(int lwresaddrtype)
 {
 	int af = 0;
-	
+
 	switch (lwresaddrtype) {
 	case LWRES_ADDRTYPE_V4:
 		af = AF_INET;
@@ -171,7 +171,7 @@ getword(FILE *fp, char *buffer, size_t size) {
 
 	if (ch == EOF)
 		return (EOF);
-	
+
 	do {
 		*p = '\0';
 
@@ -293,8 +293,8 @@ lwres_conf_parsenameserver(lwres_context_t *ctx,  FILE *fp) {
 		return (LWRES_R_FAILURE); /* Nothing on line. */
 	else if (res == ' ' || res == '\t')
 		res = eatwhite(fp);
-	
-	if (res != EOF && res != '\n') 
+
+	if (res != EOF && res != '\n')
 		return (LWRES_R_FAILURE); /* Extra junk on line. */
 
 	res = lwres_create_addr(word,
@@ -318,7 +318,7 @@ lwres_conf_parsedomain(lwres_context_t *ctx,  FILE *fp) {
 		return (LWRES_R_FAILURE); /* Nothing else on line. */
 	else if (res == ' ' || res == '\t')
 		res = eatwhite(fp);
-		
+
 	if (res != EOF && res != '\n')
 		return (LWRES_R_FAILURE); /* Extra junk on line. */
 
@@ -622,7 +622,7 @@ lwres_conf_print(lwres_context_t *ctx, FILE *fp) {
 
 			tmpaddr = confdata->sortlist[i].mask;
 			memset(&tmpaddr.address, 0xff, tmpaddr.length);
-			
+
 			if (memcmp(&tmpaddr.address,
 				   confdata->sortlist[i].mask.address,
 				   confdata->sortlist[i].mask.length) != 0) {
diff --git a/lib/lwres/lwinetaton.c b/lib/lwres/lwinetaton.c
index 342eea55d2..fdadc9669b 100644
--- a/lib/lwres/lwinetaton.c
+++ b/lib/lwres/lwinetaton.c
@@ -1,10 +1,10 @@
 /*
  * Portions Copyright (C) 1996-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
  * 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
@@ -18,7 +18,7 @@
 /*
  * Copyright (c) 1983, 1990, 1993
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,7 +34,7 @@
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -50,14 +50,14 @@
 
 /*
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
+ *
  * 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, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -70,7 +70,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)inet_addr.c	8.1 (Berkeley) 6/17/93";
-static char rcsid[] = "$Id: lwinetaton.c,v 1.8 2000/07/27 09:53:45 tale Exp $";
+static char rcsid[] = "$Id: lwinetaton.c,v 1.9 2000/08/01 01:32:21 tale Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include 
@@ -84,7 +84,7 @@ static char rcsid[] = "$Id: lwinetaton.c,v 1.8 2000/07/27 09:53:45 tale Exp $";
 
 #include "assert_p.h"
 
-/* 
+/*
  * Check whether "cp" is a valid ascii representation
  * of an Internet address and convert to a binary address.
  * Returns 1 if the address is valid, 0 if not.
diff --git a/lib/lwres/lwinetntop.c b/lib/lwres/lwinetntop.c
index f8f6f59c14..18edd0fbc6 100644
--- a/lib/lwres/lwinetntop.c
+++ b/lib/lwres/lwinetntop.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1996-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
  * 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
@@ -17,7 +17,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char rcsid[] =
-	"$Id: lwinetntop.c,v 1.4 2000/07/27 09:53:46 tale Exp $";
+	"$Id: lwinetntop.c,v 1.5 2000/08/01 01:32:22 tale Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include 
@@ -38,7 +38,7 @@ static char rcsid[] =
 
 static const char *inet_ntop4(const unsigned char *src, char *dst,
 			      size_t size);
-				  
+
 #ifdef AF_INET6
 static const char *inet_ntop6(const unsigned char *src, char *dst,
 			      size_t size);
@@ -172,7 +172,7 @@ inet_ntop6(const unsigned char *src, char *dst, size_t size) {
 		tp += sprintf(tp, "%x", words[i]);
 	}
 	/* Was it a trailing run of 0x00's? */
-	if (best.base != -1 && (best.base + best.len) == 
+	if (best.base != -1 && (best.base + best.len) ==
 	    (NS_IN6ADDRSZ / NS_INT16SZ))
 		*tp++ = ':';
 	*tp++ = '\0';
diff --git a/lib/lwres/lwinetpton.c b/lib/lwres/lwinetpton.c
index a7b48578b3..865c56b185 100644
--- a/lib/lwres/lwinetpton.c
+++ b/lib/lwres/lwinetpton.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1996-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
  * 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
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Id: lwinetpton.c,v 1.4 2000/07/27 09:53:47 tale Exp $";
+static char rcsid[] = "$Id: lwinetpton.c,v 1.5 2000/08/01 01:32:23 tale Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include 
diff --git a/lib/lwres/lwpacket.c b/lib/lwres/lwpacket.c
index 856af69855..a7d13c5ab3 100644
--- a/lib/lwres/lwpacket.c
+++ b/lib/lwres/lwpacket.c
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwpacket.c,v 1.11 2000/07/27 09:53:49 tale Exp $ */
+/* $Id: lwpacket.c,v 1.12 2000/08/01 01:32:24 tale Exp $ */
 
 #include 
 
diff --git a/lib/lwres/lwres_gabn.c b/lib/lwres/lwres_gabn.c
index 33de3ada39..13bf93945a 100644
--- a/lib/lwres/lwres_gabn.c
+++ b/lib/lwres/lwres_gabn.c
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwres_gabn.c,v 1.23 2000/07/27 09:53:50 tale Exp $ */
+/* $Id: lwres_gabn.c,v 1.24 2000/08/01 01:32:25 tale Exp $ */
 
 #include 
 
diff --git a/lib/lwres/lwres_gnba.c b/lib/lwres/lwres_gnba.c
index ec3253b6f4..073529fcc2 100644
--- a/lib/lwres/lwres_gnba.c
+++ b/lib/lwres/lwres_gnba.c
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwres_gnba.c,v 1.18 2000/07/27 09:53:51 tale Exp $ */
+/* $Id: lwres_gnba.c,v 1.19 2000/08/01 01:32:26 tale Exp $ */
 
 #include 
 
@@ -80,7 +80,7 @@ lwres_gnbarequest_render(lwres_context_t *ctx, lwres_gnbarequest_t *req,
 	lwres_buffer_putuint32(b, req->flags);
 	lwres_buffer_putuint32(b, req->addr.family);
 	lwres_buffer_putuint16(b, req->addr.length);
-	lwres_buffer_putmem(b, (unsigned char *)req->addr.address, 
+	lwres_buffer_putmem(b, (unsigned char *)req->addr.address,
 			    req->addr.length);
 
 	INSIST(LWRES_BUFFER_AVAILABLECOUNT(b) == 0);
diff --git a/lib/lwres/lwres_noop.c b/lib/lwres/lwres_noop.c
index 73f06f1864..b81ea1a41d 100644
--- a/lib/lwres/lwres_noop.c
+++ b/lib/lwres/lwres_noop.c
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwres_noop.c,v 1.12 2000/07/27 09:53:52 tale Exp $ */
+/* $Id: lwres_noop.c,v 1.13 2000/08/01 01:32:27 tale Exp $ */
 
 #include 
 
diff --git a/lib/lwres/lwresutil.c b/lib/lwres/lwresutil.c
index feec7a6431..beaa6b3d5a 100644
--- a/lib/lwres/lwresutil.c
+++ b/lib/lwres/lwresutil.c
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwresutil.c,v 1.22 2000/07/27 09:53:53 tale Exp $ */
+/* $Id: lwresutil.c,v 1.23 2000/08/01 01:32:29 tale Exp $ */
 
 #include 
 
@@ -162,7 +162,7 @@ lwres_getaddrsbyname(lwres_context_t *ctx, const char *name,
 		exact_first = 1;
 	else
 		exact_first = 0;
-	
+
 	current_suffix = 0;
 	tried_exact = 0;
 	tried_search = 0;
diff --git a/lib/lwres/man/lwres.3 b/lib/lwres/man/lwres.3
index 9f22585a4f..31577c3d2d 100644
--- a/lib/lwres/man/lwres.3
+++ b/lib/lwres/man/lwres.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: lwres.3,v 1.2 2000/07/27 09:44:02 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres.3,v 1.3 2000/08/01 01:20:24 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt LWRES 3
 .Os BIND9 9
@@ -42,9 +42,9 @@ Clients use the functions provided by the lightweight resolver library
 to encode requests and decode responses.
 The server for the lightweight resolver is
 .Nm lwresd .
-In reality this is implemented by the name server, 
+In reality this is implemented by the name server,
 .Nm named ,
-though when operating as the lightweight resolver server, 
+though when operating as the lightweight resolver server,
 .Nm lwresd
 is functionally and logically distinct from the actual name server.
 The protocol consists of a number of opcodes, each of which has a
@@ -97,7 +97,7 @@ character.
 This simplifies structure handling and parsing for both the server
 receiving a request and the client receiving a reply.
 It also eliminates data copying by enabling a mapping structure to
-directly point at data in the actual receive buffer. 
+directly point at data in the actual receive buffer.
 .Sh OPCODES
 .Pp
 Every lightweight resolver operation uses a unique opcode.
@@ -105,12 +105,12 @@ Each opcode is assigned a number.
 Opcodes in the range 0x00000000 and 0x03ffffff are reserved for use by
 the lightweight resolver library.
 Opcodes between 0x04000000 and 0xffffffff have been set aside for use by
-applications. 
+applications.
 .Pp
 Three opcodes are currently defined:
 .Bl -tag -width LWRES_OPCODE_GETADDRSBYNAME
 .It Li LWRES_OPCODE_NOOP
-The no-op opcode is essentially an echo operation, comparable to 
+The no-op opcode is essentially an echo operation, comparable to
 .Xr ping 1 .
 The server simply returns the entire data region that had been sent by
 the client.
@@ -165,24 +165,24 @@ function translates from the canonical form to the op-code specific
 structure.
 Memory allocated to the opcode's request or reply structures is
 discarded using the
-.Ar free 
+.Ar free
 function.
 Clients will typically use the op-code specific
 .Ar xxx_request_render ,
-.Ar xxx_response_parse 
+.Ar xxx_response_parse
 and
 .Ar xxx_response_free
 functions.
 The name server will use the
 .Ar xxx_request_parse ,
 .Ar xxx_response_render
-and 
+and
 .Ar xxx_request_free
 functions.
 .Pp
 For example, the no-op opcode -
 .Dv LWRES_OPCODE_NOOP
-- uses 
+- uses
 .Dv lwres_nooprequest_t
 and
 .Dv lwres_noopresponse_t
@@ -214,7 +214,7 @@ releases the memory allocated to the
 and
 .Dv lwres_noopresponse_t
 structures respectively.
-.\" 
+.\"
 .\"	XXXJR
 .\"	NOT YET.
 .\"	This is just a placeholder to indicate where the section on the
@@ -251,9 +251,9 @@ primitives on that context structure or else create a context for each
 thread.
 See
 .Xr lwres_context 3 .
-Once the context has been created, 
+Once the context has been created,
 .Fn lwres_conf_init
-is called to read 
+is called to read
 .Pa /etc/resolv.conf
 so that various options such as sort lists, search lists and so on can
 be applied.
@@ -285,6 +285,6 @@ described above.
 .Xr lwres_context 3 ,
 .Xr lwres_config 3 ,
 .Xr resolver 5 ,
-.Xr lwres_getipnode 3 
+.Xr lwres_getipnode 3
 .Xr lwresd 8 ,
 .Xr named 8 .
diff --git a/lib/lwres/man/lwres_addr_parse.3 b/lib/lwres/man/lwres_addr_parse.3
index 6bab942584..11345fbe25 100644
--- a/lib/lwres/man/lwres_addr_parse.3
+++ b/lib/lwres/man/lwres_addr_parse.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_addr_parse.3,v 1.2 2000/07/27 09:44:03 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_addr_parse.3,v 1.3 2000/08/01 01:20:25 tale Exp $
+.\"
 .so lwres_resutil.3
diff --git a/lib/lwres/man/lwres_buffer.3 b/lib/lwres/man/lwres_buffer.3
index 401aebe76f..ec69ae6c87 100644
--- a/lib/lwres/man/lwres_buffer.3
+++ b/lib/lwres/man/lwres_buffer.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: lwres_buffer.3,v 1.2 2000/07/27 09:44:04 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_buffer.3,v 1.3 2000/08/01 01:20:26 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt LWRES_BUFFER 3
 .Os BIND9 9
@@ -39,7 +39,7 @@
 .Nd lightweight resolver buffer management
 .Sh SYNOPSIS
 .Fd #include 
-.Fd 
+.Fd
 .Ft void
 .Fo lwres_buffer_init
 .Fa "lwres_buffer_t *b"
@@ -132,7 +132,7 @@ struct lwres_buffer {
 	unsigned int 		active;
 };
 .Ed
-The main reason for making the buffer structure public is so that 
+The main reason for making the buffer structure public is so that
 buffer operations can be implemented using macros.
 Applications should not manipulate this structure directly.
 They should use the functions listed below.
@@ -166,7 +166,7 @@ It extends from the current offset to an offset in the
 remaining region.
 Initially, the active region is empty.
 If the current offset advances beyond the chosen offset,
-the active region will also be empty.   
+the active region will also be empty.
 .Pp
 Except for
 .Fn lwres_buffer_init ,
@@ -193,7 +193,7 @@ The
 .Fa *b
 is invalidated by
 .Fn lwres_buffer_invalidate .
-.Fa *b 
+.Fa *b
 must be a valid lightweight resolver buffer.
 .Pp
 The functions
@@ -206,7 +206,7 @@ buffer
 by
 .Fa n
 bytes.
-.Fa *b 
+.Fa *b
 .Fn lwres_buffer_add
 checks for buffer overflow and
 .Fn lwres_buffer_subtract
@@ -219,9 +219,9 @@ A lightweight resolver buffer is re-initialised by
 .Fn lwres_buffer_clear .
 The function sets
 .Li b->used ,
-.Li b->current 
+.Li b->current
 and
-.Li b->active 
+.Li b->active
 to zero.
 .Pp
 .Fn lwres_buffer_first
@@ -289,11 +289,11 @@ respectively.
 .Fn lwres_buffer_putmem
 copies
 .Fa length
-bytes of memory at 
+bytes of memory at
 .Fa base
 to
 .Fa b.
-Conversely, 
+Conversely,
 .Fn lwres_buffer_getmem
 copies
 .Fa length
diff --git a/lib/lwres/man/lwres_buffer_add.3 b/lib/lwres/man/lwres_buffer_add.3
index 00bd2561f1..3694e497ca 100644
--- a/lib/lwres/man/lwres_buffer_add.3
+++ b/lib/lwres/man/lwres_buffer_add.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_buffer_add.3,v 1.2 2000/07/27 09:44:05 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_buffer_add.3,v 1.3 2000/08/01 01:20:27 tale Exp $
+.\"
 .so lwres_buffer.3
diff --git a/lib/lwres/man/lwres_buffer_back.3 b/lib/lwres/man/lwres_buffer_back.3
index 811657e69a..552b635cfe 100644
--- a/lib/lwres/man/lwres_buffer_back.3
+++ b/lib/lwres/man/lwres_buffer_back.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_buffer_back.3,v 1.2 2000/07/27 09:44:06 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_buffer_back.3,v 1.3 2000/08/01 01:20:28 tale Exp $
+.\"
 .so lwres_buffer.3
diff --git a/lib/lwres/man/lwres_buffer_clear.3 b/lib/lwres/man/lwres_buffer_clear.3
index 2737e2475c..6b78222349 100644
--- a/lib/lwres/man/lwres_buffer_clear.3
+++ b/lib/lwres/man/lwres_buffer_clear.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_buffer_clear.3,v 1.2 2000/07/27 09:44:07 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_buffer_clear.3,v 1.3 2000/08/01 01:20:29 tale Exp $
+.\"
 .so lwres_buffer.3
diff --git a/lib/lwres/man/lwres_buffer_first.3 b/lib/lwres/man/lwres_buffer_first.3
index 99f3a466f7..57373d02b4 100644
--- a/lib/lwres/man/lwres_buffer_first.3
+++ b/lib/lwres/man/lwres_buffer_first.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_buffer_first.3,v 1.2 2000/07/27 09:44:08 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_buffer_first.3,v 1.3 2000/08/01 01:20:30 tale Exp $
+.\"
 .so lwres_buffer.3
diff --git a/lib/lwres/man/lwres_buffer_forward.3 b/lib/lwres/man/lwres_buffer_forward.3
index fcebbeb7c8..04bcfe3b98 100644
--- a/lib/lwres/man/lwres_buffer_forward.3
+++ b/lib/lwres/man/lwres_buffer_forward.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_buffer_forward.3,v 1.2 2000/07/27 09:44:09 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_buffer_forward.3,v 1.3 2000/08/01 01:20:31 tale Exp $
+.\"
 .so lwres_buffer.3
diff --git a/lib/lwres/man/lwres_buffer_getmem.3 b/lib/lwres/man/lwres_buffer_getmem.3
index 09e50498c8..c057924444 100644
--- a/lib/lwres/man/lwres_buffer_getmem.3
+++ b/lib/lwres/man/lwres_buffer_getmem.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_buffer_getmem.3,v 1.2 2000/07/27 09:44:10 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_buffer_getmem.3,v 1.3 2000/08/01 01:20:33 tale Exp $
+.\"
 .so lwres_buffer.3
diff --git a/lib/lwres/man/lwres_buffer_getuint16.3 b/lib/lwres/man/lwres_buffer_getuint16.3
index c3a5873a21..b7142d6eb3 100644
--- a/lib/lwres/man/lwres_buffer_getuint16.3
+++ b/lib/lwres/man/lwres_buffer_getuint16.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_buffer_getuint16.3,v 1.2 2000/07/27 09:44:12 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_buffer_getuint16.3,v 1.3 2000/08/01 01:20:34 tale Exp $
+.\"
 .so lwres_buffer.3
diff --git a/lib/lwres/man/lwres_buffer_getuint32.3 b/lib/lwres/man/lwres_buffer_getuint32.3
index eeed1336b3..1cc7564e99 100644
--- a/lib/lwres/man/lwres_buffer_getuint32.3
+++ b/lib/lwres/man/lwres_buffer_getuint32.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_buffer_getuint32.3,v 1.2 2000/07/27 09:44:13 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_buffer_getuint32.3,v 1.3 2000/08/01 01:20:35 tale Exp $
+.\"
 .so lwres_buffer.3
diff --git a/lib/lwres/man/lwres_buffer_getuint8.3 b/lib/lwres/man/lwres_buffer_getuint8.3
index e7633793ad..63f50650ae 100644
--- a/lib/lwres/man/lwres_buffer_getuint8.3
+++ b/lib/lwres/man/lwres_buffer_getuint8.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_buffer_getuint8.3,v 1.2 2000/07/27 09:44:14 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_buffer_getuint8.3,v 1.3 2000/08/01 01:20:36 tale Exp $
+.\"
 .so lwres_buffer.3
diff --git a/lib/lwres/man/lwres_buffer_init.3 b/lib/lwres/man/lwres_buffer_init.3
index ffc200e917..35601e65c7 100644
--- a/lib/lwres/man/lwres_buffer_init.3
+++ b/lib/lwres/man/lwres_buffer_init.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_buffer_init.3,v 1.2 2000/07/27 09:44:15 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_buffer_init.3,v 1.3 2000/08/01 01:20:37 tale Exp $
+.\"
 .so lwres_buffer.3
diff --git a/lib/lwres/man/lwres_buffer_invalidate.3 b/lib/lwres/man/lwres_buffer_invalidate.3
index f281800361..d149f42c58 100644
--- a/lib/lwres/man/lwres_buffer_invalidate.3
+++ b/lib/lwres/man/lwres_buffer_invalidate.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_buffer_invalidate.3,v 1.2 2000/07/27 09:44:16 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_buffer_invalidate.3,v 1.3 2000/08/01 01:20:38 tale Exp $
+.\"
 .so lwres_buffer.3
diff --git a/lib/lwres/man/lwres_buffer_putmem.3 b/lib/lwres/man/lwres_buffer_putmem.3
index c092c0e998..7fabb0f1e5 100644
--- a/lib/lwres/man/lwres_buffer_putmem.3
+++ b/lib/lwres/man/lwres_buffer_putmem.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_buffer_putmem.3,v 1.2 2000/07/27 09:44:17 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_buffer_putmem.3,v 1.3 2000/08/01 01:20:39 tale Exp $
+.\"
 .so lwres_buffer.3
diff --git a/lib/lwres/man/lwres_buffer_putuint16.3 b/lib/lwres/man/lwres_buffer_putuint16.3
index 435a12f82d..c54379c6a4 100644
--- a/lib/lwres/man/lwres_buffer_putuint16.3
+++ b/lib/lwres/man/lwres_buffer_putuint16.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_buffer_putuint16.3,v 1.2 2000/07/27 09:44:18 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_buffer_putuint16.3,v 1.3 2000/08/01 01:20:40 tale Exp $
+.\"
 .so lwres_buffer.3
diff --git a/lib/lwres/man/lwres_buffer_putuint32.3 b/lib/lwres/man/lwres_buffer_putuint32.3
index 5fb450a0d3..01312598e0 100644
--- a/lib/lwres/man/lwres_buffer_putuint32.3
+++ b/lib/lwres/man/lwres_buffer_putuint32.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_buffer_putuint32.3,v 1.2 2000/07/27 09:44:19 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_buffer_putuint32.3,v 1.3 2000/08/01 01:20:41 tale Exp $
+.\"
 .so lwres_buffer.3
diff --git a/lib/lwres/man/lwres_buffer_putuint8.3 b/lib/lwres/man/lwres_buffer_putuint8.3
index 25afe81a25..f6e8c07920 100644
--- a/lib/lwres/man/lwres_buffer_putuint8.3
+++ b/lib/lwres/man/lwres_buffer_putuint8.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_buffer_putuint8.3,v 1.2 2000/07/27 09:44:20 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_buffer_putuint8.3,v 1.3 2000/08/01 01:20:42 tale Exp $
+.\"
 .so lwres_buffer.3
diff --git a/lib/lwres/man/lwres_buffer_subtract.3 b/lib/lwres/man/lwres_buffer_subtract.3
index f0e2c6df9e..dc4f74d1e8 100644
--- a/lib/lwres/man/lwres_buffer_subtract.3
+++ b/lib/lwres/man/lwres_buffer_subtract.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_buffer_subtract.3,v 1.2 2000/07/27 09:44:21 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_buffer_subtract.3,v 1.3 2000/08/01 01:20:43 tale Exp $
+.\"
 .so lwres_buffer.3
diff --git a/lib/lwres/man/lwres_conf_clear.3 b/lib/lwres/man/lwres_conf_clear.3
index debb6f0a58..98cb907f3f 100644
--- a/lib/lwres/man/lwres_conf_clear.3
+++ b/lib/lwres/man/lwres_conf_clear.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_conf_clear.3,v 1.2 2000/07/27 09:44:22 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_conf_clear.3,v 1.3 2000/08/01 01:20:45 tale Exp $
+.\"
 .so lwres_config.3
diff --git a/lib/lwres/man/lwres_conf_get.3 b/lib/lwres/man/lwres_conf_get.3
index eec9ddcf47..92b1431bb0 100644
--- a/lib/lwres/man/lwres_conf_get.3
+++ b/lib/lwres/man/lwres_conf_get.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_conf_get.3,v 1.2 2000/07/27 09:44:23 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_conf_get.3,v 1.3 2000/08/01 01:20:46 tale Exp $
+.\"
 .so lwres_config.3
diff --git a/lib/lwres/man/lwres_conf_init.3 b/lib/lwres/man/lwres_conf_init.3
index 61c3864e7b..06eba65af2 100644
--- a/lib/lwres/man/lwres_conf_init.3
+++ b/lib/lwres/man/lwres_conf_init.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_conf_init.3,v 1.2 2000/07/27 09:44:25 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_conf_init.3,v 1.3 2000/08/01 01:20:47 tale Exp $
+.\"
 .so lwres_config.3
diff --git a/lib/lwres/man/lwres_conf_parse.3 b/lib/lwres/man/lwres_conf_parse.3
index 432efb5de4..c5d3195907 100644
--- a/lib/lwres/man/lwres_conf_parse.3
+++ b/lib/lwres/man/lwres_conf_parse.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_conf_parse.3,v 1.2 2000/07/27 09:44:26 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_conf_parse.3,v 1.3 2000/08/01 01:20:48 tale Exp $
+.\"
 .so lwres_config.3
diff --git a/lib/lwres/man/lwres_conf_print.3 b/lib/lwres/man/lwres_conf_print.3
index eddce35786..06a3249329 100644
--- a/lib/lwres/man/lwres_conf_print.3
+++ b/lib/lwres/man/lwres_conf_print.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_conf_print.3,v 1.2 2000/07/27 09:44:27 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_conf_print.3,v 1.3 2000/08/01 01:20:50 tale Exp $
+.\"
 .so lwres_config.3
diff --git a/lib/lwres/man/lwres_config.3 b/lib/lwres/man/lwres_config.3
index be18178f3f..dfd89fe705 100644
--- a/lib/lwres/man/lwres_config.3
+++ b/lib/lwres/man/lwres_config.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: lwres_config.3,v 1.2 2000/07/27 09:44:28 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_config.3,v 1.3 2000/08/01 01:20:51 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt LWRES_CONFIG 3
 .Os BIND9 9
@@ -59,7 +59,7 @@ structure for lightweight resolver context
 .Fa ctx .
 .Pp
 .Fn lwres_conf_clear
-frees up all the internal memory used by 
+frees up all the internal memory used by
 that
 .Dv lwres_conf_t
 structure in resolver context
@@ -83,7 +83,7 @@ to the
 .Fa fp.
 .Sh RETURN VALUES
 .Fn lwres_conf_parse
-returns 
+returns
 .Er LWRES_R_SUCCESS
 if it successfully read and parsed
 .Fa filename .
@@ -91,7 +91,7 @@ It returns
 .Er LWRES_R_FAILURE
 if
 .Fa filename
-could not be opened or contained incorrect 
+could not be opened or contained incorrect
 resolver statements.
 .Pp
 .Fn lwres_conf_print
diff --git a/lib/lwres/man/lwres_context.3 b/lib/lwres/man/lwres_context.3
index e2437a6662..2ae8205992 100644
--- a/lib/lwres/man/lwres_context.3
+++ b/lib/lwres/man/lwres_context.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: lwres_context.3,v 1.2 2000/07/27 09:44:29 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_context.3,v 1.3 2000/08/01 01:20:52 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt LWRES_CONTEXT 3
 .Os BIND9 9
@@ -30,14 +30,14 @@
 .Nd lightweight resolver memory allocation routines
 .Sh SYNOPSIS
 .Fd #include 
-.Fd 
+.Fd
 .Ft lwres_result_t
 .Fo lwres_context_create
 .Fa "lwres_context_t **contextp"
 .Fa "void *arg"
 .Fa "lwres_malloc_t malloc_function"
 .Fa "lwres_free_t free_function"
-.Fc 
+.Fc
 .Ft lwres_result_t
 .Fo lwres_context_destroy
 .Fa "lwres_context_t **contextp"
@@ -155,7 +155,7 @@ is not NULL.
 .Fn lwres_context_initserial
 sets the serial number for context
 .Fa *ctx
-to 
+to
 .Fa serial .
 .Fn lwres_context_nextserial
 returns the current serial number for the context and increments
@@ -219,7 +219,7 @@ returned in
 .Fa *recvd_len .
 .Sh RETURN VALUES
 .Fn lwres_context_create
-returns 
+returns
 .Er LWRES_R_NOMEMORY
 if memory for the
 .Dv "struct lwres_context"
@@ -240,7 +240,7 @@ completes successfully.
 is returned if an I/O error occurs and
 .Er LWRES_R_TIMEOUT
 is returned if the
-.Xr recvfrom 2 
+.Xr recvfrom 2
 call times out.
 .Sh SEE ALSO
 .Xr lwres_conf_init 3 ,
diff --git a/lib/lwres/man/lwres_context_allocmem.3 b/lib/lwres/man/lwres_context_allocmem.3
index f139cbaadb..6d4aa2bdfd 100644
--- a/lib/lwres/man/lwres_context_allocmem.3
+++ b/lib/lwres/man/lwres_context_allocmem.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_context_allocmem.3,v 1.2 2000/07/27 09:44:30 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_context_allocmem.3,v 1.3 2000/08/01 01:20:53 tale Exp $
+.\"
 .so lwres_context.3
diff --git a/lib/lwres/man/lwres_context_create.3 b/lib/lwres/man/lwres_context_create.3
index 3d19c22703..617ff64f37 100644
--- a/lib/lwres/man/lwres_context_create.3
+++ b/lib/lwres/man/lwres_context_create.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_context_create.3,v 1.2 2000/07/27 09:44:31 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_context_create.3,v 1.3 2000/08/01 01:20:54 tale Exp $
+.\"
 .so lwres_context.3
diff --git a/lib/lwres/man/lwres_context_destroy.3 b/lib/lwres/man/lwres_context_destroy.3
index 42f53ef23e..f47ccbcd4b 100644
--- a/lib/lwres/man/lwres_context_destroy.3
+++ b/lib/lwres/man/lwres_context_destroy.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_context_destroy.3,v 1.2 2000/07/27 09:44:32 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_context_destroy.3,v 1.3 2000/08/01 01:20:55 tale Exp $
+.\"
 .so lwres_context.3
diff --git a/lib/lwres/man/lwres_context_freemem.3 b/lib/lwres/man/lwres_context_freemem.3
index 52e3e99d9f..1cd987a4e9 100644
--- a/lib/lwres/man/lwres_context_freemem.3
+++ b/lib/lwres/man/lwres_context_freemem.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_context_freemem.3,v 1.2 2000/07/27 09:44:33 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_context_freemem.3,v 1.3 2000/08/01 01:20:56 tale Exp $
+.\"
 .so lwres_context.3
diff --git a/lib/lwres/man/lwres_context_initserial.3 b/lib/lwres/man/lwres_context_initserial.3
index ae30577aec..9de6c3edb0 100644
--- a/lib/lwres/man/lwres_context_initserial.3
+++ b/lib/lwres/man/lwres_context_initserial.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_context_initserial.3,v 1.2 2000/07/27 09:44:34 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_context_initserial.3,v 1.3 2000/08/01 01:20:57 tale Exp $
+.\"
 .so lwres_context.3
diff --git a/lib/lwres/man/lwres_context_nextserial.3 b/lib/lwres/man/lwres_context_nextserial.3
index 78f751cb4a..82867c3dbc 100644
--- a/lib/lwres/man/lwres_context_nextserial.3
+++ b/lib/lwres/man/lwres_context_nextserial.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_context_nextserial.3,v 1.2 2000/07/27 09:44:35 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_context_nextserial.3,v 1.3 2000/08/01 01:20:58 tale Exp $
+.\"
 .so lwres_context.3
diff --git a/lib/lwres/man/lwres_context_sendrecv.3 b/lib/lwres/man/lwres_context_sendrecv.3
index 8d2cfb7066..7b94ab584c 100644
--- a/lib/lwres/man/lwres_context_sendrecv.3
+++ b/lib/lwres/man/lwres_context_sendrecv.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_context_sendrecv.3,v 1.2 2000/07/27 09:44:36 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_context_sendrecv.3,v 1.3 2000/08/01 01:20:59 tale Exp $
+.\"
 .so lwres_context.3
diff --git a/lib/lwres/man/lwres_endhostent.3 b/lib/lwres/man/lwres_endhostent.3
index 231ab21487..62f7a61def 100644
--- a/lib/lwres/man/lwres_endhostent.3
+++ b/lib/lwres/man/lwres_endhostent.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_endhostent.3,v 1.2 2000/07/27 09:44:38 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_endhostent.3,v 1.3 2000/08/01 01:21:00 tale Exp $
+.\"
 .so lwres_gethostent.3
diff --git a/lib/lwres/man/lwres_endhostent_r.3 b/lib/lwres/man/lwres_endhostent_r.3
index 4c5a898e49..a5f651ea21 100644
--- a/lib/lwres/man/lwres_endhostent_r.3
+++ b/lib/lwres/man/lwres_endhostent_r.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_endhostent_r.3,v 1.2 2000/07/27 09:44:39 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_endhostent_r.3,v 1.3 2000/08/01 01:21:01 tale Exp $
+.\"
 .so lwres_gethostent.3
diff --git a/lib/lwres/man/lwres_freeaddrinfo.3 b/lib/lwres/man/lwres_freeaddrinfo.3
index 4fd640c5db..5583a99cc3 100644
--- a/lib/lwres/man/lwres_freeaddrinfo.3
+++ b/lib/lwres/man/lwres_freeaddrinfo.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_freeaddrinfo.3,v 1.2 2000/07/27 09:44:40 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_freeaddrinfo.3,v 1.3 2000/08/01 01:21:02 tale Exp $
+.\"
 .so lwres_getaddrinfo.3
diff --git a/lib/lwres/man/lwres_freehostent.3 b/lib/lwres/man/lwres_freehostent.3
index 2bfd986665..3b3d8511d2 100644
--- a/lib/lwres/man/lwres_freehostent.3
+++ b/lib/lwres/man/lwres_freehostent.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_freehostent.3,v 1.2 2000/07/27 09:44:41 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_freehostent.3,v 1.3 2000/08/01 01:21:04 tale Exp $
+.\"
 .so lwres_getipnode.3
diff --git a/lib/lwres/man/lwres_gabn.3 b/lib/lwres/man/lwres_gabn.3
index 57ddc1f158..4e0b353854 100644
--- a/lib/lwres/man/lwres_gabn.3
+++ b/lib/lwres/man/lwres_gabn.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: lwres_gabn.3,v 1.2 2000/07/27 09:44:42 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gabn.3,v 1.3 2000/08/01 01:21:05 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt LWRES_GABN 3
 .Os BIND9 9
@@ -29,7 +29,7 @@
 .Nd lightweight resolver getaddrbyname functions
 .Sh SYNOPSIS
 .Fd #include 
-.Fd 
+.Fd
 .Ft lwres_result_t
 .Fo lwres_gabnrequest_render
 .Fa "lwres_context_t *ctx"
@@ -91,9 +91,9 @@ These structures are defined in
 They are shown below.
 .Bd -literal -offset indent
 #define LWRES_OPCODE_GETADDRSBYNAME	0x00010001U
- 
+
 typedef struct lwres_addr lwres_addr_t;
-typedef LWRES_LIST(lwres_addr_t) lwres_addrlist_t; 
+typedef LWRES_LIST(lwres_addr_t) lwres_addrlist_t;
 
 typedef struct {
 	lwres_uint32_t	flags;
@@ -140,7 +140,7 @@ uses context
 .Fa ctx
 to convert the contents of packet
 .Fa pkt
-to a 
+to a
 .Dv lwres_gabnrequest_t
 structure.
 Buffer
@@ -187,7 +187,7 @@ if memory allocation fails.
 is returned if the available space in the buffer
 .Fa b
 is too small to accommodate the packet header or the
-.Dv lwres_gabnrequest_t 
+.Dv lwres_gabnrequest_t
 and
 .Dv lwres_gabnresponse_t
 structures.
@@ -205,4 +205,4 @@ in the packet header structure
 .Dv lwres_lwpacket_t
 indicate that the packet is not a response to an earlier query.
 .Sh SEE ALSO
-.Xr lwres_packet 3 
+.Xr lwres_packet 3
diff --git a/lib/lwres/man/lwres_gabnrequest_free.3 b/lib/lwres/man/lwres_gabnrequest_free.3
index 4767669a77..749c5ab1d2 100644
--- a/lib/lwres/man/lwres_gabnrequest_free.3
+++ b/lib/lwres/man/lwres_gabnrequest_free.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gabnrequest_free.3,v 1.2 2000/07/27 09:44:43 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gabnrequest_free.3,v 1.3 2000/08/01 01:21:06 tale Exp $
+.\"
 .so lwres_gabn.3
diff --git a/lib/lwres/man/lwres_gabnrequest_parse.3 b/lib/lwres/man/lwres_gabnrequest_parse.3
index bac556421f..537c99b70c 100644
--- a/lib/lwres/man/lwres_gabnrequest_parse.3
+++ b/lib/lwres/man/lwres_gabnrequest_parse.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gabnrequest_parse.3,v 1.2 2000/07/27 09:44:44 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gabnrequest_parse.3,v 1.3 2000/08/01 01:21:07 tale Exp $
+.\"
 .so lwres_gabn.3
diff --git a/lib/lwres/man/lwres_gabnrequest_render.3 b/lib/lwres/man/lwres_gabnrequest_render.3
index bdbbd58668..15eee1fa06 100644
--- a/lib/lwres/man/lwres_gabnrequest_render.3
+++ b/lib/lwres/man/lwres_gabnrequest_render.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gabnrequest_render.3,v 1.2 2000/07/27 09:44:45 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gabnrequest_render.3,v 1.3 2000/08/01 01:21:08 tale Exp $
+.\"
 .so lwres_gabn.3
diff --git a/lib/lwres/man/lwres_gabnresponse_free.3 b/lib/lwres/man/lwres_gabnresponse_free.3
index ce1e7a56b2..59039418d7 100644
--- a/lib/lwres/man/lwres_gabnresponse_free.3
+++ b/lib/lwres/man/lwres_gabnresponse_free.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gabnresponse_free.3,v 1.2 2000/07/27 09:44:46 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gabnresponse_free.3,v 1.3 2000/08/01 01:21:09 tale Exp $
+.\"
 .so lwres_gabn.3
diff --git a/lib/lwres/man/lwres_gabnresponse_parse.3 b/lib/lwres/man/lwres_gabnresponse_parse.3
index cc935353ff..001bdb7724 100644
--- a/lib/lwres/man/lwres_gabnresponse_parse.3
+++ b/lib/lwres/man/lwres_gabnresponse_parse.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gabnresponse_parse.3,v 1.2 2000/07/27 09:44:47 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gabnresponse_parse.3,v 1.3 2000/08/01 01:21:10 tale Exp $
+.\"
 .so lwres_gabn.3
diff --git a/lib/lwres/man/lwres_gabnresponse_render.3 b/lib/lwres/man/lwres_gabnresponse_render.3
index ecb88418cf..45e34be225 100644
--- a/lib/lwres/man/lwres_gabnresponse_render.3
+++ b/lib/lwres/man/lwres_gabnresponse_render.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gabnresponse_render.3,v 1.2 2000/07/27 09:44:48 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gabnresponse_render.3,v 1.3 2000/08/01 01:21:11 tale Exp $
+.\"
 .so lwres_gabn.3
diff --git a/lib/lwres/man/lwres_gai_strerror.3 b/lib/lwres/man/lwres_gai_strerror.3
index 8db5b5528d..d36140f3c0 100644
--- a/lib/lwres/man/lwres_gai_strerror.3
+++ b/lib/lwres/man/lwres_gai_strerror.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: lwres_gai_strerror.3,v 1.2 2000/07/27 09:44:49 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gai_strerror.3,v 1.3 2000/08/01 01:21:12 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt LWRES_GAI_STRERROR 3
 .Os BIND9 9
@@ -24,7 +24,7 @@
 .Nd print suitable error string
 .Sh SYNOPSIS
 .Fd #include 
-.Fd 
+.Fd
 .Ft char *
 .Fo gai_strerror
 .Fa "int ecode"
diff --git a/lib/lwres/man/lwres_getaddrinfo.3 b/lib/lwres/man/lwres_getaddrinfo.3
index 090b7ef6f2..6039a1ff07 100644
--- a/lib/lwres/man/lwres_getaddrinfo.3
+++ b/lib/lwres/man/lwres_getaddrinfo.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: lwres_getaddrinfo.3,v 1.2 2000/07/27 09:44:50 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_getaddrinfo.3,v 1.3 2000/08/01 01:21:13 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt LWRES_GETADDRINFO 3
 .Os BIND9 9
@@ -25,7 +25,7 @@
 .Nd socket address structure to host and service name
 .Sh SYNOPSIS
 .Fd #include 
-.Fd 
+.Fd
 .Ft int
 .Fo lwres_getaddrinfo
 .Fa "const char *hostname"
@@ -88,14 +88,14 @@ The caller can supply the following structure elements in
 the protocol family that should be used.
 When
 .Li ai_family
-is set to 
+is set to
 .Dv PF_UNSPEC ,
 it means the caller will accept any protocol family supported by the
 operating system.
 .It Dv ai_socktype
 denotes the type of socket -
 .Dv SOCK_STREAM ,
-.Dv SOCK_DGRAM 
+.Dv SOCK_DGRAM
 or
 .Dv SOCK_RAW
 - that is wanted.
@@ -139,9 +139,9 @@ does not set the
 .Dv AI_PASSIVE
 bit, the returned socket address structure will be ready
 for use in a call to
-.Xr connect 2 
+.Xr connect 2
 for a connection-oriented protocol or
-.Xr connect 2 , 
+.Xr connect 2 ,
 .Xr sendto 2 ,
 or
 .Xr sendmsg 2
@@ -153,7 +153,7 @@ is a
 .Dv NULL
 pointer and
 .Dv AI_PASSIVE
-is not set in 
+is not set in
 .Li ai_flags .
 .Pp
 If
@@ -161,7 +161,7 @@ If
 is set to
 .Dv AI_NUMERICHOST
 it indicates that
-the 
+the
 .Dv non-NuLL
 .Fa hostname
 should be treated as a numeric string defining an IPv4 or IPv6 address.
@@ -177,7 +177,7 @@ passed via
 .Fa arg
 must be zero.
 .Pp
-If 
+If
 .Fa arg
 is not supplied, a
 .Dv NULL
@@ -200,7 +200,7 @@ the
 .Li ai_next
 pointer, until a
 .Dv NULL
-pointer is encountered. 
+pointer is encountered.
 The three members
 .Li ai_family ,
 ai_socktype,
@@ -237,7 +237,7 @@ is a pointer to a
 returns zero on success or one of the error codes listed in
 .Xr gai_strerror 3
 if an error occurs.
-If both 
+If both
 .Fa hostname
 and
 .Fa servname
@@ -253,8 +253,8 @@ returns
 .Xr RFC2133 ,
 .Xr getservbyname 3 ,
 .Xr bind 2
-.Xr connect 2 
-.Xr connect 2 , 
+.Xr connect 2
+.Xr connect 2 ,
 .Xr sendto 2 ,
 .Xr sendmsg 2 ,
 .Xr socket 2 .
diff --git a/lib/lwres/man/lwres_getaddrsbyname.3 b/lib/lwres/man/lwres_getaddrsbyname.3
index d248687954..6e6a88f83d 100644
--- a/lib/lwres/man/lwres_getaddrsbyname.3
+++ b/lib/lwres/man/lwres_getaddrsbyname.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_getaddrsbyname.3,v 1.2 2000/07/27 09:44:52 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_getaddrsbyname.3,v 1.3 2000/08/01 01:21:15 tale Exp $
+.\"
 .so lwres_resutil.3
diff --git a/lib/lwres/man/lwres_gethostbyaddr.3 b/lib/lwres/man/lwres_gethostbyaddr.3
index f5c9ae936c..721d18e157 100644
--- a/lib/lwres/man/lwres_gethostbyaddr.3
+++ b/lib/lwres/man/lwres_gethostbyaddr.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gethostbyaddr.3,v 1.2 2000/07/27 09:44:53 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gethostbyaddr.3,v 1.3 2000/08/01 01:21:16 tale Exp $
+.\"
 .so lwres_gethostent.3
diff --git a/lib/lwres/man/lwres_gethostbyaddr_r.3 b/lib/lwres/man/lwres_gethostbyaddr_r.3
index 93a93f7504..1d36c82e8b 100644
--- a/lib/lwres/man/lwres_gethostbyaddr_r.3
+++ b/lib/lwres/man/lwres_gethostbyaddr_r.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gethostbyaddr_r.3,v 1.2 2000/07/27 09:44:54 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gethostbyaddr_r.3,v 1.3 2000/08/01 01:21:17 tale Exp $
+.\"
 .so lwres_gethostent.3
diff --git a/lib/lwres/man/lwres_gethostbyname.3 b/lib/lwres/man/lwres_gethostbyname.3
index 8b457e3fd0..f8e60eddae 100644
--- a/lib/lwres/man/lwres_gethostbyname.3
+++ b/lib/lwres/man/lwres_gethostbyname.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gethostbyname.3,v 1.2 2000/07/27 09:44:55 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gethostbyname.3,v 1.3 2000/08/01 01:21:18 tale Exp $
+.\"
 .so lwres_gethostent.3
diff --git a/lib/lwres/man/lwres_gethostbyname2.3 b/lib/lwres/man/lwres_gethostbyname2.3
index c198c01f95..9c8c7b5be8 100644
--- a/lib/lwres/man/lwres_gethostbyname2.3
+++ b/lib/lwres/man/lwres_gethostbyname2.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gethostbyname2.3,v 1.2 2000/07/27 09:44:56 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gethostbyname2.3,v 1.3 2000/08/01 01:21:19 tale Exp $
+.\"
 .so lwres_gethostent.3
diff --git a/lib/lwres/man/lwres_gethostbyname_r.3 b/lib/lwres/man/lwres_gethostbyname_r.3
index beeb795a94..6433a236e0 100644
--- a/lib/lwres/man/lwres_gethostbyname_r.3
+++ b/lib/lwres/man/lwres_gethostbyname_r.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gethostbyname_r.3,v 1.2 2000/07/27 09:44:57 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gethostbyname_r.3,v 1.3 2000/08/01 01:21:20 tale Exp $
+.\"
 .so lwres_gethostent.3
diff --git a/lib/lwres/man/lwres_gethostent.3 b/lib/lwres/man/lwres_gethostent.3
index 288296bf96..c997d6f2e6 100644
--- a/lib/lwres/man/lwres_gethostent.3
+++ b/lib/lwres/man/lwres_gethostent.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: lwres_gethostent.3,v 1.2 2000/07/27 09:44:58 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gethostent.3,v 1.3 2000/08/01 01:21:21 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt LWRES_GETHOSTENT 3
 .Os BIND9 9
@@ -34,7 +34,7 @@
 .Nd lightweight resolver get network host entry
 .Sh SYNOPSIS
 .Fd #include 
-.Fd 
+.Fd
 .Ft struct hostent *
 .Fo lwres_gethostbyname
 .Fa "const char *name"
@@ -100,7 +100,7 @@ These functions define the interface to the lightweight resolver
 daemon \fPNOT IF IT IS GOING AWAY\fP
 for looking up hostnames and addresses. They are similar to the
 standard
-.Xr gethostent 3 
+.Xr gethostent 3
 functions provided by as part of the standard system software.
 They use a
 .Dv "struct hostent"
@@ -125,7 +125,7 @@ The official (canonical) name of the host.
 A NULL-terminated array of alternate names (nicknames) for the host.
 .It Li h_addrtype
 The type of address being returned -
-.Dv PF_INET 
+.Dv PF_INET
 or
 .Dv PF_INET6 .
 .It Li h_length
@@ -137,7 +137,7 @@ terminated array of network addresses for the host.
 Host addresses are returned in network byte order.
 .El
 .Pp
-For backward compatibility with very old software, 
+For backward compatibility with very old software,
 .Li h_addr
 is the first address in
 .Li h_addr_list.
@@ -168,10 +168,10 @@ always looks for an IPv4 address while
 .Fn lwres_gethostbyname2
 looks for an address of protocol family
 .Fa af :
-either 
+either
 .Dv PF_INET
 or
-.Dv PF_INET6 
+.Dv PF_INET6
 - IPv4 or IPV6 addresses respectively.
 Both functions call
 .Fn lwres_getipnodebyname
@@ -206,15 +206,15 @@ It also calls
 .Fn lwres_getipnodebyname
 to lookup the hostname
 .Fa name .
-If 
+If
 .Fn lwres_getipnodebyname
 encounters an error, the error code is returned in
-.Fa *error . 
+.Fa *error .
 .Fa resbuf
 is a pointer to a
 .Dv "struct hostent"
 which is initialised by a successful call to
-.Fn lwres_gethostbyname_r . 
+.Fn lwres_gethostbyname_r .
 .Fa buf
 is a buffer of length
 .Fa len
@@ -259,7 +259,7 @@ The other function parameters are identical to those in
 is a pointer to a
 .Dv "struct hostent"
 which is initialised by a successful call to
-.Fn lwres_gethostbyaddr_r . 
+.Fn lwres_gethostbyaddr_r .
 .Fa buf
 is a buffer of length
 .Fa len
@@ -281,11 +281,11 @@ which is a pointer to the
 it created.
 .Sh RETURN VALUES
 .Pp
-The functions 
+The functions
 .Fn lwres_gethostbyname ,
 .Fn lwres_gethostbyname2 ,
 .Fn lwres_gethostbyaddr ,
-and 
+and
 .Fn lwres_gethostent
 are not thread-safe because they free any memory that had been allocated
 in a previous call to those functions before they perform a lookup.
@@ -348,7 +348,7 @@ and
 .Li h_addr_list
 elements of the
 .Dv "struct hostent" .
-If 
+If
 .Fa buf
 was too small, both
 .Fn lwres_gethostbyname_r
@@ -366,7 +366,7 @@ to
 Although
 .Fn lwres_gethostbyname ,
 .Fn lwres_gethostbyname2 ,
-.Fn lwres_gethostbyaddr 
+.Fn lwres_gethostbyaddr
 and
 .Fn lwres_endhostent
 call thread-safe functions to perform lookups, these 3 functions
@@ -386,7 +386,7 @@ calls to those routines.
 Thread-safe versions for name and address lookup are provided by
 .Fn lwres_gethostbyname_r ,
 and
-.Fn lwres_gethostbyaddr_r 
+.Fn lwres_gethostbyaddr_r
 respectively.
 .Pp
 Although the above functions can be considered as drop-in replacements
@@ -400,6 +400,6 @@ or in
 .Dv NIS/YP
 or
 .Dv NIS+
-maps which could be supported by the operating system's 
+maps which could be supported by the operating system's
 .Xr gethostent 3
 functions.
diff --git a/lib/lwres/man/lwres_gethostent_r.3 b/lib/lwres/man/lwres_gethostent_r.3
index f9f4719dab..76a45bbc57 100644
--- a/lib/lwres/man/lwres_gethostent_r.3
+++ b/lib/lwres/man/lwres_gethostent_r.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gethostent_r.3,v 1.2 2000/07/27 09:44:59 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gethostent_r.3,v 1.3 2000/08/01 01:21:23 tale Exp $
+.\"
 .so lwres_gethostent.3
diff --git a/lib/lwres/man/lwres_getipnode.3 b/lib/lwres/man/lwres_getipnode.3
index be7b2fdf46..ff4b80c902 100644
--- a/lib/lwres/man/lwres_getipnode.3
+++ b/lib/lwres/man/lwres_getipnode.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: lwres_getipnode.3,v 1.2 2000/07/27 09:45:00 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_getipnode.3,v 1.3 2000/08/01 01:21:24 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt LWRES_GETIPNODE 3
 .Os BIND9 9
@@ -26,7 +26,7 @@
 .Nd lookup functions for the lightweight resolver
 .Sh SYNOPSIS
 .Fd #include 
-.Fd 
+.Fd
 .Ft struct hostent *
 .Fo lwres_getipnodebyname
 .Fa "const char *name"
@@ -69,7 +69,7 @@ The official (canonical) name of the host.
 A NULL-terminated array of alternate names (nicknames) for the host.
 .It Li h_addrtype
 The type of address being returned -
-.Dv PF_INET 
+.Dv PF_INET
 or
 .Dv PF_INET6 .
 .It Li h_length
@@ -81,7 +81,7 @@ terminated array of network addresses for the host.
 Host addresses are returned in network byte order.
 .El
 .Pp
-For backward compatibility with very old software, 
+For backward compatibility with very old software,
 .Li h_addr
 is the first address in
 .Li h_addr_list.
@@ -170,7 +170,7 @@ gets discarded.
 .Pp
 .Fn lwres_freehostent
 releases all the memory associated with
-the 
+the
 .Dv "struct hostent"
 pointer
 .Fa he .
diff --git a/lib/lwres/man/lwres_getipnodebyaddr.3 b/lib/lwres/man/lwres_getipnodebyaddr.3
index 9edc2ca4b1..9dd965c37d 100644
--- a/lib/lwres/man/lwres_getipnodebyaddr.3
+++ b/lib/lwres/man/lwres_getipnodebyaddr.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_getipnodebyaddr.3,v 1.2 2000/07/27 09:45:02 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_getipnodebyaddr.3,v 1.3 2000/08/01 01:21:25 tale Exp $
+.\"
 .so lwres_getipnode.3
diff --git a/lib/lwres/man/lwres_getipnodebyname.3 b/lib/lwres/man/lwres_getipnodebyname.3
index c044391730..52a9749e65 100644
--- a/lib/lwres/man/lwres_getipnodebyname.3
+++ b/lib/lwres/man/lwres_getipnodebyname.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_getipnodebyname.3,v 1.2 2000/07/27 09:45:03 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_getipnodebyname.3,v 1.3 2000/08/01 01:21:26 tale Exp $
+.\"
 .so lwres_getipnode.3
diff --git a/lib/lwres/man/lwres_getnamebyaddr.3 b/lib/lwres/man/lwres_getnamebyaddr.3
index 53ba12ece6..efea2d0042 100644
--- a/lib/lwres/man/lwres_getnamebyaddr.3
+++ b/lib/lwres/man/lwres_getnamebyaddr.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_getnamebyaddr.3,v 1.2 2000/07/27 09:45:04 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_getnamebyaddr.3,v 1.3 2000/08/01 01:21:27 tale Exp $
+.\"
 .so lwres_resutil.3
diff --git a/lib/lwres/man/lwres_getnameinfo.3 b/lib/lwres/man/lwres_getnameinfo.3
index 4d8dde7bf7..c7e8986735 100644
--- a/lib/lwres/man/lwres_getnameinfo.3
+++ b/lib/lwres/man/lwres_getnameinfo.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: lwres_getnameinfo.3,v 1.3 2000/07/27 09:45:05 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_getnameinfo.3,v 1.4 2000/08/01 01:21:28 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt LWRES_GETNAMEINFO 3
 .Os BIND9 9
@@ -24,7 +24,7 @@
 .Nd lightweight resolver socket address structure to hostname and service name
 .Sh SYNOPSIS
 .Fd #include 
-.Fd 
+.Fd
 .Ft int
 .Fo lwres_getnameinfo
 .Fa "const struct sockaddr *sa"
@@ -109,7 +109,7 @@ is called immediately before
 .Fn lwres_getnameinfo
 returns so that the created resolver context gets discarded.
 .Sh RETURN VALUES
-.Fn lwres_getnameinfo 
+.Fn lwres_getnameinfo
 returns 0 on success or a non-zero error code if an error occurs.
 .\"
 .\"	The error codes below were invented by the ISC/Nominum. They
diff --git a/lib/lwres/man/lwres_gnba.3 b/lib/lwres/man/lwres_gnba.3
index dc92cf5d56..d25661261b 100644
--- a/lib/lwres/man/lwres_gnba.3
+++ b/lib/lwres/man/lwres_gnba.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: lwres_gnba.3,v 1.2 2000/07/27 09:45:06 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gnba.3,v 1.3 2000/08/01 01:21:29 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt LWRES_GNBA 3
 .Os BIND9 9
@@ -29,7 +29,7 @@
 .Nd lightweight resolver getnamebyaddress functions
 .Sh SYNOPSIS
 .Fd #include 
-.Fd 
+.Fd
 .Ft lwres_result_t
 .Fo lwres_gnbarequest_render
 .Fa "lwres_context_t *ctx"
@@ -133,7 +133,7 @@ uses context
 .Fa ctx
 to convert the contents of packet
 .Fa pkt
-to a 
+to a
 .Dv lwres_gnbarequest_t
 structure.
 Buffer
@@ -180,7 +180,7 @@ if memory allocation fails.
 is returned if the available space in the buffer
 .Fa b
 is too small to accommodate the packet header or the
-.Dv lwres_gnbarequest_t 
+.Dv lwres_gnbarequest_t
 and
 .Dv lwres_gnbaresponse_t
 structures.
@@ -198,4 +198,4 @@ in the packet header structure
 .Dv lwres_lwpacket_t
 indicate that the packet is not a response to an earlier query.
 .Sh SEE ALSO
-.Xr lwres_packet 3 
+.Xr lwres_packet 3
diff --git a/lib/lwres/man/lwres_gnbarequest_free.3 b/lib/lwres/man/lwres_gnbarequest_free.3
index 5212f560d4..6557e2e039 100644
--- a/lib/lwres/man/lwres_gnbarequest_free.3
+++ b/lib/lwres/man/lwres_gnbarequest_free.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gnbarequest_free.3,v 1.2 2000/07/27 09:45:08 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gnbarequest_free.3,v 1.3 2000/08/01 01:21:30 tale Exp $
+.\"
 .so lwres_gnba.3
diff --git a/lib/lwres/man/lwres_gnbarequest_parse.3 b/lib/lwres/man/lwres_gnbarequest_parse.3
index 1c3bf275f0..288581aa70 100644
--- a/lib/lwres/man/lwres_gnbarequest_parse.3
+++ b/lib/lwres/man/lwres_gnbarequest_parse.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gnbarequest_parse.3,v 1.2 2000/07/27 09:45:09 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gnbarequest_parse.3,v 1.3 2000/08/01 01:21:31 tale Exp $
+.\"
 .so lwres_gnba.3
diff --git a/lib/lwres/man/lwres_gnbarequest_render.3 b/lib/lwres/man/lwres_gnbarequest_render.3
index 980a8dea1a..fbfed7f156 100644
--- a/lib/lwres/man/lwres_gnbarequest_render.3
+++ b/lib/lwres/man/lwres_gnbarequest_render.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gnbarequest_render.3,v 1.2 2000/07/27 09:45:10 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gnbarequest_render.3,v 1.3 2000/08/01 01:21:33 tale Exp $
+.\"
 .so lwres_gnba.3
diff --git a/lib/lwres/man/lwres_gnbaresponse_free.3 b/lib/lwres/man/lwres_gnbaresponse_free.3
index e5d76319b2..682aa01c71 100644
--- a/lib/lwres/man/lwres_gnbaresponse_free.3
+++ b/lib/lwres/man/lwres_gnbaresponse_free.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gnbaresponse_free.3,v 1.2 2000/07/27 09:45:11 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gnbaresponse_free.3,v 1.3 2000/08/01 01:21:34 tale Exp $
+.\"
 .so lwres_gnba.3
diff --git a/lib/lwres/man/lwres_gnbaresponse_parse.3 b/lib/lwres/man/lwres_gnbaresponse_parse.3
index bd18d82a90..f713f0d4dd 100644
--- a/lib/lwres/man/lwres_gnbaresponse_parse.3
+++ b/lib/lwres/man/lwres_gnbaresponse_parse.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gnbaresponse_parse.3,v 1.2 2000/07/27 09:45:13 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gnbaresponse_parse.3,v 1.3 2000/08/01 01:21:35 tale Exp $
+.\"
 .so lwres_gnba.3
diff --git a/lib/lwres/man/lwres_gnbaresponse_render.3 b/lib/lwres/man/lwres_gnbaresponse_render.3
index 0befce742f..133808779e 100644
--- a/lib/lwres/man/lwres_gnbaresponse_render.3
+++ b/lib/lwres/man/lwres_gnbaresponse_render.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_gnbaresponse_render.3,v 1.2 2000/07/27 09:45:14 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_gnbaresponse_render.3,v 1.3 2000/08/01 01:21:36 tale Exp $
+.\"
 .so lwres_gnba.3
diff --git a/lib/lwres/man/lwres_herror.3 b/lib/lwres/man/lwres_herror.3
index 2c6ff76502..644c5e6f4b 100644
--- a/lib/lwres/man/lwres_herror.3
+++ b/lib/lwres/man/lwres_herror.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_herror.3,v 1.2 2000/07/27 09:45:15 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_herror.3,v 1.3 2000/08/01 01:21:37 tale Exp $
+.\"
 .so lwres_hstrerror.3
diff --git a/lib/lwres/man/lwres_hstrerror.3 b/lib/lwres/man/lwres_hstrerror.3
index 9833b8caee..8e922c8442 100644
--- a/lib/lwres/man/lwres_hstrerror.3
+++ b/lib/lwres/man/lwres_hstrerror.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: lwres_hstrerror.3,v 1.2 2000/07/27 09:45:16 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_hstrerror.3,v 1.3 2000/08/01 01:21:38 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt LWRES_ERROR 3
 .Os BIND9 9
@@ -25,7 +25,7 @@
 .Nd lightweight resolver error message generation
 .Sh SYNOPSIS
 .Fd #include 
-.Fd 
+.Fd
 .Ft void
 .Fo lwres_herror
 .Fa "const char *s"
@@ -63,7 +63,7 @@ The values of the error codes and messages are as follows:
 .Sh RETURN VALUES
 The string \*qUnknown resolver error\*q is returned by
 .Fn lwres_hstrerror
-when the value of 
+when the value of
 .Li lwres_h_errno
 is not a valid error code.
 .Sh SEE ALSO
diff --git a/lib/lwres/man/lwres_inetntop.3 b/lib/lwres/man/lwres_inetntop.3
index b245ce50be..c69fdfc75d 100644
--- a/lib/lwres/man/lwres_inetntop.3
+++ b/lib/lwres/man/lwres_inetntop.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: lwres_inetntop.3,v 1.2 2000/07/27 09:45:19 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_inetntop.3,v 1.3 2000/08/01 01:21:41 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt LWRES_INETNTOP 3
 .Os BIND9 9
@@ -24,7 +24,7 @@
 .Nd lightweight resolver IP address presentation
 .Sh SYNOPSIS
 .Fd #include 
-.Fd 
+.Fd
 .Ft const char *
 .Fo lwres_net_ntop
 .Fa "int af"
@@ -35,7 +35,7 @@
 .Sh DESCRIPTION
 .Fn lwres_net_ntop
 converts an IP address of protocol family
-.Fa af 
+.Fa af
 - IPv4 or IPv6 - at location
 .Fa src
 from network format to its conventional representation as a string.
diff --git a/lib/lwres/man/lwres_lwpacket_parseheader.3 b/lib/lwres/man/lwres_lwpacket_parseheader.3
index 45daafec99..ebaada062e 100644
--- a/lib/lwres/man/lwres_lwpacket_parseheader.3
+++ b/lib/lwres/man/lwres_lwpacket_parseheader.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_lwpacket_parseheader.3,v 1.2 2000/07/27 09:45:22 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_lwpacket_parseheader.3,v 1.3 2000/08/01 01:21:43 tale Exp $
+.\"
 .so lwres_packet.3
diff --git a/lib/lwres/man/lwres_lwpacket_renderheader.3 b/lib/lwres/man/lwres_lwpacket_renderheader.3
index 735268ac8b..b439d1f6c2 100644
--- a/lib/lwres/man/lwres_lwpacket_renderheader.3
+++ b/lib/lwres/man/lwres_lwpacket_renderheader.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_lwpacket_renderheader.3,v 1.2 2000/07/27 09:45:23 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_lwpacket_renderheader.3,v 1.3 2000/08/01 01:21:44 tale Exp $
+.\"
 .so lwres_packet.3
diff --git a/lib/lwres/man/lwres_net_ntop.3 b/lib/lwres/man/lwres_net_ntop.3
index ee38d8378f..8e14b35a25 100644
--- a/lib/lwres/man/lwres_net_ntop.3
+++ b/lib/lwres/man/lwres_net_ntop.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_net_ntop.3,v 1.2 2000/07/27 09:45:25 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_net_ntop.3,v 1.3 2000/08/01 01:21:46 tale Exp $
+.\"
 .so lwres_inetntop.3
diff --git a/lib/lwres/man/lwres_noop.3 b/lib/lwres/man/lwres_noop.3
index 4272c9fb79..3846f41bd1 100644
--- a/lib/lwres/man/lwres_noop.3
+++ b/lib/lwres/man/lwres_noop.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: lwres_noop.3,v 1.2 2000/07/27 09:45:28 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_noop.3,v 1.3 2000/08/01 01:21:48 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt LWRES_NOOP 3
 .Os BIND9 9
@@ -29,7 +29,7 @@
 .Nd lightweight resolver no-op functions
 .Sh SYNOPSIS
 .Fd #include 
-.Fd 
+.Fd
 .Ft lwres_result_t
 .Fo lwres_nooprequest_render
 .Fa "lwres_context_t *ctx"
@@ -132,7 +132,7 @@ uses context
 .Fa ctx
 to convert the contents of packet
 .Fa pkt
-to a 
+to a
 .Dv lwres_nooprequest_t
 structure.
 Buffer
@@ -177,7 +177,7 @@ if memory allocation fails.
 is returned if the available space in the buffer
 .Fa b
 is too small to accommodate the packet header or the
-.Dv lwres_nooprequest_t 
+.Dv lwres_nooprequest_t
 and
 .Dv lwres_noopresponse_t
 structures.
@@ -195,4 +195,4 @@ in the packet header structure
 .Dv lwres_lwpacket_t
 indicate that the packet is not a response to an earlier query.
 .Sh SEE ALSO
-.Xr lwres_packet 3 
+.Xr lwres_packet 3
diff --git a/lib/lwres/man/lwres_nooprequest_free.3 b/lib/lwres/man/lwres_nooprequest_free.3
index e7e8ab38fc..5750ec73d1 100644
--- a/lib/lwres/man/lwres_nooprequest_free.3
+++ b/lib/lwres/man/lwres_nooprequest_free.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_nooprequest_free.3,v 1.2 2000/07/27 09:45:29 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_nooprequest_free.3,v 1.3 2000/08/01 01:21:50 tale Exp $
+.\"
 .so lwres_noop.3
diff --git a/lib/lwres/man/lwres_nooprequest_parse.3 b/lib/lwres/man/lwres_nooprequest_parse.3
index 2759d8afe7..2cd32707c9 100644
--- a/lib/lwres/man/lwres_nooprequest_parse.3
+++ b/lib/lwres/man/lwres_nooprequest_parse.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_nooprequest_parse.3,v 1.2 2000/07/27 09:45:31 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_nooprequest_parse.3,v 1.3 2000/08/01 01:21:51 tale Exp $
+.\"
 .so lwres_noop.3
diff --git a/lib/lwres/man/lwres_nooprequest_render.3 b/lib/lwres/man/lwres_nooprequest_render.3
index 3c4dc593b3..57ea067f09 100644
--- a/lib/lwres/man/lwres_nooprequest_render.3
+++ b/lib/lwres/man/lwres_nooprequest_render.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_nooprequest_render.3,v 1.2 2000/07/27 09:45:32 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_nooprequest_render.3,v 1.3 2000/08/01 01:21:52 tale Exp $
+.\"
 .so lwres_noop.3
diff --git a/lib/lwres/man/lwres_noopresponse_free.3 b/lib/lwres/man/lwres_noopresponse_free.3
index 7cb18fb200..201c9702af 100644
--- a/lib/lwres/man/lwres_noopresponse_free.3
+++ b/lib/lwres/man/lwres_noopresponse_free.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_noopresponse_free.3,v 1.2 2000/07/27 09:45:33 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_noopresponse_free.3,v 1.3 2000/08/01 01:21:53 tale Exp $
+.\"
 .so lwres_noop.3
diff --git a/lib/lwres/man/lwres_noopresponse_parse.3 b/lib/lwres/man/lwres_noopresponse_parse.3
index 12fc979723..5f6c437150 100644
--- a/lib/lwres/man/lwres_noopresponse_parse.3
+++ b/lib/lwres/man/lwres_noopresponse_parse.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_noopresponse_parse.3,v 1.2 2000/07/27 09:45:34 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_noopresponse_parse.3,v 1.3 2000/08/01 01:21:54 tale Exp $
+.\"
 .so lwres_noop.3
diff --git a/lib/lwres/man/lwres_noopresponse_render.3 b/lib/lwres/man/lwres_noopresponse_render.3
index 4b7545eb9f..b5e25864a0 100644
--- a/lib/lwres/man/lwres_noopresponse_render.3
+++ b/lib/lwres/man/lwres_noopresponse_render.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_noopresponse_render.3,v 1.2 2000/07/27 09:45:35 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_noopresponse_render.3,v 1.3 2000/08/01 01:21:55 tale Exp $
+.\"
 .so lwres_noop.3
diff --git a/lib/lwres/man/lwres_packet.3 b/lib/lwres/man/lwres_packet.3
index 18c3a3dda2..ddab3c6590 100644
--- a/lib/lwres/man/lwres_packet.3
+++ b/lib/lwres/man/lwres_packet.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: lwres_packet.3,v 1.2 2000/07/27 09:45:38 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_packet.3,v 1.3 2000/08/01 01:21:56 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt LWRES_PACKET 3
 .Os BIND9 9
@@ -27,7 +27,7 @@
 .Fd #include 
 .Fd #include 
 .Fd #include 
-.Fd 
+.Fd
 .Ft lwres_result_t
 .Fo lwres_lwpacket_renderheader
 .Fa "lwres_buffer_t *b"
@@ -72,7 +72,7 @@ is a request or a reply. Flag values can be set, but not defined by
 the caller.
 .It Li serial
 is set by the requestor and is returned in all replies. If two or more
-packets from the same source have the same serial number and are from 
+packets from the same source have the same serial number and are from
 the same source, they are assumed to be duplicates and the latter ones
 may be dropped.
 .It Li opcode
@@ -82,7 +82,7 @@ reserved for use by the lightweight resolver library. Opcodes between
 0x04000000 and 0xffffffff are application defined.
 .It Li result
 is only valid for replies.
-Results between 0x04000000 and 0xffffffff are application defined. 
+Results between 0x04000000 and 0xffffffff are application defined.
 Results between 0x00000000 and 0x03ffffff are reserved for library use.
 .It Li recvlength
 is the maximum buffer size that the receiver can handle on requests
@@ -140,6 +140,6 @@ return
 If there is insufficient space to copy data between the buffer
 .Fa *b
 and lightweight resolver packet
-.Fa *pkt 
+.Fa *pkt
 both functions return
 .Er LWRES_R_UNEXPECTEDEND .
diff --git a/lib/lwres/man/lwres_resutil.3 b/lib/lwres/man/lwres_resutil.3
index 3fb330dfb9..94f1262fbd 100644
--- a/lib/lwres/man/lwres_resutil.3
+++ b/lib/lwres/man/lwres_resutil.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,9 +12,9 @@
 .\" 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: lwres_resutil.3,v 1.2 2000/07/27 09:45:39 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_resutil.3,v 1.3 2000/08/01 01:21:57 tale Exp $
+.\"
 .Dd Jun 30, 2000
 .Dt LWRES_RESUTIL 3
 .Os BIND9 9
@@ -27,7 +27,7 @@
 .Nd lightweight resolver utility functions
 .Sh SYNOPSIS
 .Fd #include 
-.Fd 
+.Fd
 .Ft lwres_result_t
 .Fo lwres_string_parse
 .Fa "lwres_buffer_t *b"
@@ -68,7 +68,7 @@ and the length of that string is given by
 .Fa *len .
 The buffer's current pointer is advanced to point at the character
 following the string length, the encoded string, and the trailing
-.Dv NULL 
+.Dv NULL
 character.
 .Fn lwres_string_parse
 has an assertion check that
@@ -117,7 +117,7 @@ typedef struct {
 .Ed
 The contents of this structure are not manipulated directly but
 they are controlled through the
-.Xr lwres_gabn 3 
+.Xr lwres_gabn 3
 functions.
 .Pp
 The lightweight resolver uses
@@ -139,7 +139,7 @@ Results of the lookup are returned in
 .Fa *structp .
 .Fn lwres_getaddrsbyname
 checks that its pointer arguments are not
-.Dv NULL 
+.Dv NULL
 and that
 .Fa addrtypes
 is non-zero.
@@ -165,8 +165,8 @@ Like
 .Fn lwres_getaddrsbyname ,
 .Fn lwres_getnamebyaddr
 uses assertion checking to ensure its pointer arguments are not
-.Dv NULL 
-and 
+.Dv NULL
+and
 .Fa addrtype
 is not zero.
 .Fn lwres_getaddrsbyname
diff --git a/lib/lwres/man/lwres_sethostent.3 b/lib/lwres/man/lwres_sethostent.3
index 69f0ee5a08..08f1beebd6 100644
--- a/lib/lwres/man/lwres_sethostent.3
+++ b/lib/lwres/man/lwres_sethostent.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_sethostent.3,v 1.2 2000/07/27 09:45:40 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_sethostent.3,v 1.3 2000/08/01 01:21:58 tale Exp $
+.\"
 .so lwres_gethostent.3
diff --git a/lib/lwres/man/lwres_sethostent_r.3 b/lib/lwres/man/lwres_sethostent_r.3
index 1dc1f12662..b728e84626 100644
--- a/lib/lwres/man/lwres_sethostent_r.3
+++ b/lib/lwres/man/lwres_sethostent_r.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_sethostent_r.3,v 1.2 2000/07/27 09:45:41 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_sethostent_r.3,v 1.3 2000/08/01 01:21:59 tale Exp $
+.\"
 .so lwres_gethostent.3
diff --git a/lib/lwres/man/lwres_string_parse.3 b/lib/lwres/man/lwres_string_parse.3
index da30657d05..57e97edb63 100644
--- a/lib/lwres/man/lwres_string_parse.3
+++ b/lib/lwres/man/lwres_string_parse.3
@@ -1,9 +1,9 @@
 .\" 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
 .\" 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
@@ -12,7 +12,7 @@
 .\" 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: lwres_string_parse.3,v 1.2 2000/07/27 09:45:43 tale Exp $
-.\" 
+.\"
+.\" $Id: lwres_string_parse.3,v 1.3 2000/08/01 01:22:01 tale Exp $
+.\"
 .so lwres_resutil.3
diff --git a/lib/lwres/version.c b/lib/lwres/version.c
index b4e3a69092..0369425c41 100644
--- a/lib/lwres/version.c
+++ b/lib/lwres/version.c
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.c,v 1.4 2000/07/27 09:53:54 tale Exp $ */
+/* $Id: version.c,v 1.5 2000/08/01 01:32:30 tale Exp $ */
 
 char lwres_version[] = VERSION;
 
diff --git a/lib/omapi/Makefile.in b/lib/omapi/Makefile.in
index 969aa8c63e..c1faf3ad3b 100644
--- a/lib/omapi/Makefile.in
+++ b/lib/omapi/Makefile.in
@@ -1,9 +1,9 @@
 # Copyright (C) 1999, 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
 # 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
@@ -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.13 2000/07/27 09:54:11 tale Exp $
+# $Id: Makefile.in,v 1.14 2000/08/01 01:32:47 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/omapi/auth.c b/lib/omapi/auth.c
index 9eae2b43f0..beeb255a00 100644
--- a/lib/omapi/auth.c
+++ b/lib/omapi/auth.c
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: auth.c,v 1.11 2000/07/27 09:54:12 tale Exp $ */
+/* $Id: auth.c,v 1.12 2000/08/01 01:32:48 tale Exp $ */
 
 /* Principal Author: DCL */
 
@@ -197,7 +197,7 @@ omapi_auth_register(const char *name, unsigned int algorithms,
 		new->name = isc_mem_strdup(omapi_mctx, name);
 		if (new->name == NULL)
 			result = ISC_R_NOMEMORY;
-	
+
 		new->secret = isc_mem_allocate(omapi_mctx, secretlen);
 		if (new->secret == NULL)
 			result = ISC_R_NOMEMORY;
diff --git a/lib/omapi/connection.c b/lib/omapi/connection.c
index 5174d770d0..e3285d29fc 100644
--- a/lib/omapi/connection.c
+++ b/lib/omapi/connection.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1996-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: connection.c,v 1.32 2000/07/27 09:54:14 tale Exp $ */
+/* $Id: connection.c,v 1.33 2000/08/01 01:32:49 tale Exp $ */
 
 /* Principal Author: DCL */
 
@@ -192,7 +192,7 @@ end_connection(omapi_connection_t *connection) {
  * Pause the client until it has received a message from the server, either the
  * introductory message or a response to a message it has sent.  This is
  * necessary because the underlying socket library is multithreaded, and
- * it is possible that reading incoming data would trigger an error 
+ * it is possible that reading incoming data would trigger an error
  * that causes the connection to be destroyed --- while the client program
  * is still trying to use it.
  *
@@ -218,7 +218,7 @@ connection_wait(omapi_connection_t *connection_handle) {
 
 	INSIST(connection->state == omapi_connection_connecting ||
 	       connection->state == omapi_connection_connected);
-	
+
 	connection->waiting = ISC_TRUE;
 
 	while (connection->events_pending > 0)
@@ -314,7 +314,7 @@ recv_done(isc_task_t *task, isc_event_t *event) {
 	unsigned int bytes_read;
 
 	UNUSED(task);
-	
+
 	sock = event->ev_sender;
 	connection = event->ev_arg;
 	socketevent = (isc_socketevent_t *)event;
@@ -402,7 +402,7 @@ send_done(isc_task_t *task, isc_event_t *event) {
 	unsigned int sent_bytes;
 
 	UNUSED(task);
-	
+
 	sock = event->ev_sender;
 	connection = event->ev_arg;
 	socketevent = (isc_socketevent_t *)event;
@@ -491,7 +491,7 @@ connection_send(omapi_connection_t *connection) {
 	 */
 	if (connection->is_client)
 		LOCK(&connection->wait_lock);
-		
+
 	isc_socket_sendv(connection->socket, &connection->output_buffers,
 			 connection->task, send_done, connection);
 
@@ -549,7 +549,7 @@ connect_toserver(omapi_object_t *protocol, const char *server_name,
 				     sizeof(*connection));
 	if (result != ISC_R_SUCCESS)
 		goto free_obuffer;
-		
+
 	connection->is_client = ISC_TRUE;
 	connection->waiting = ISC_FALSE;
 	connection->state = omapi_connection_connecting;
@@ -714,7 +714,7 @@ connection_copyout(unsigned char *dst, omapi_connection_t *connection,
 	REQUIRE(protocol != NULL && protocol->type == omapi_type_protocol);
 
 	INSIST(size <= connection->in_bytes);
-	
+
 	connection->bytes_needed -= size;
 
 	buffer = ISC_LIST_HEAD(connection->input_buffers);
@@ -946,7 +946,7 @@ omapi_connection_putuint32(omapi_object_t *c, isc_uint32_t value) {
 	isc_uint32_t inbuf;
 
 	inbuf = htonl(value);
-	
+
 	return (omapi_connection_putmem(c, (unsigned char *)&inbuf,
 					sizeof(inbuf)));
 }
@@ -958,7 +958,7 @@ omapi_connection_putuint16(omapi_object_t *c, isc_uint32_t value) {
 	REQUIRE(value < 65536);
 
 	inbuf = htons((isc_uint16_t)value);
-	
+
 	return (omapi_connection_putmem(c, (unsigned char *)&inbuf,
 					sizeof(inbuf)));
 }
@@ -1073,7 +1073,7 @@ connection_setvalue(omapi_object_t *connection, omapi_string_t *name,
 {
 	REQUIRE(connection != NULL &&
 		connection->type == omapi_type_connection);
-	
+
 	return (omapi_object_passsetvalue(connection, name, value));
 }
 
@@ -1124,7 +1124,7 @@ connection_signalhandler(omapi_object_t *connection, const char *name,
 {
 	REQUIRE(connection != NULL &&
 		connection->type == omapi_type_connection);
-	
+
 	return (omapi_object_passsignal(connection, name, ap));
 }
 
diff --git a/lib/omapi/data.c b/lib/omapi/data.c
index 978ed43a38..cf634e47d3 100644
--- a/lib/omapi/data.c
+++ b/lib/omapi/data.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1996-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: data.c,v 1.16 2000/07/27 09:54:15 tale Exp $ */
+/* $Id: data.c,v 1.17 2000/08/01 01:32:50 tale Exp $ */
 
 /* Principal Author: Ted Lemon */
 
diff --git a/lib/omapi/generic.c b/lib/omapi/generic.c
index 3c96387b71..b60e349892 100644
--- a/lib/omapi/generic.c
+++ b/lib/omapi/generic.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1996-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: generic.c,v 1.16 2000/07/27 09:54:16 tale Exp $ */
+/* $Id: generic.c,v 1.17 2000/08/01 01:32:51 tale Exp $ */
 
 /* Principal Author: Ted Lemon */
 
@@ -84,7 +84,7 @@ generic_setvalue(omapi_object_t *h, omapi_string_t *name, omapi_data_t *value)
 
 			return (ISC_R_SUCCESS);
 		}
-	}			
+	}
 
 	/*
 	 * If the name isn't already attached to this object, see if an
@@ -146,7 +146,7 @@ generic_getvalue(omapi_object_t *h, omapi_string_t *name,
 	REQUIRE(h != NULL && h->type == omapi_type_generic);
 
 	g = (omapi_generic_t *)h;
-	
+
 	/*
 	 * Look up the specified name in our list of objects.
 	 */
@@ -165,7 +165,7 @@ generic_getvalue(omapi_object_t *h, omapi_string_t *name,
 			omapi_value_reference(value, g->values[i]);
 			return (ISC_R_SUCCESS);
 		}
-	}			
+	}
 
 	return (omapi_object_passgetvalue(h, name, value));
 }
@@ -178,7 +178,7 @@ generic_destroy(omapi_object_t *h) {
 	REQUIRE(h != NULL && h->type == omapi_type_generic);
 
 	g = (omapi_generic_t *)h;
-	
+
 	if (g->values != NULL) {
 		for (i = 0; i < g->nvalues; i++)
 			if (g->values[i] != NULL)
@@ -220,7 +220,7 @@ generic_stuffvalues(omapi_object_t *connection, omapi_object_t *h) {
 	REQUIRE(h != NULL && h->type == omapi_type_generic);
 
 	src = (omapi_generic_t *)h;
-	
+
 	for (i = 0; i < src->nvalues; i++) {
 		if (src->values[i] != NULL &&
 		    src->values[i]->name->len != 0) {
@@ -239,7 +239,7 @@ generic_stuffvalues(omapi_object_t *connection, omapi_object_t *h) {
 			if (result != ISC_R_SUCCESS)
 				return (result);
 		}
-	}			
+	}
 
 	return (omapi_object_passstuffvalues(connection, h));
 }
diff --git a/lib/omapi/handle.c b/lib/omapi/handle.c
index 6303c33121..2a794312c4 100644
--- a/lib/omapi/handle.c
+++ b/lib/omapi/handle.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1996-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: handle.c,v 1.15 2000/07/27 09:54:17 tale Exp $ */
+/* $Id: handle.c,v 1.16 2000/08/01 01:32:52 tale Exp $ */
 
 /* Principal Author: Ted Lemon */
 
@@ -50,7 +50,7 @@
  * next handle should go, and if necessary create additional nodes in
  * the tree to contain the new handle.  The pointer to the object is
  * then stored in the correct position.
- * 
+ *
  * XXXTL
  * Theoretically, we could have some code here to free up handle
  * tables as they go out of use, but by and large handle tables won't
@@ -138,7 +138,7 @@ handle_store(omapi_handle_t h, omapi_handletable_t *table, omapi_object_t *o) {
 
 	if (table->first > h || table->limit <= h)
 		return (ISC_R_NOSPACE);
-	
+
 	/*
 	 * If this is a leaf table, just stash the object in the
 	 * appropriate place.
@@ -228,7 +228,7 @@ object_gethandle(omapi_handle_t *h, omapi_object_t *o) {
 		 */
 		while (next_handle >= toptable->limit) {
 			omapi_handletable_t *new;
-		
+
 			new = isc_mem_get(omapi_mctx, sizeof(*new));
 			if (new != NULL) {
 				memset(new, 0, sizeof(*new));
diff --git a/lib/omapi/include/Makefile.in b/lib/omapi/include/Makefile.in
index 029f14016f..fa5707e0fa 100644
--- a/lib/omapi/include/Makefile.in
+++ b/lib/omapi/include/Makefile.in
@@ -1,9 +1,9 @@
 # Copyright (C) 1999, 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
 # 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
@@ -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.4 2000/07/27 09:54:29 tale Exp $
+# $Id: Makefile.in,v 1.5 2000/08/01 01:33:04 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/omapi/include/omapi/Makefile.in b/lib/omapi/include/omapi/Makefile.in
index 2f57410eaa..e2daa381cc 100644
--- a/lib/omapi/include/omapi/Makefile.in
+++ b/lib/omapi/include/omapi/Makefile.in
@@ -1,9 +1,9 @@
 # Copyright (C) 1999, 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
 # 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
@@ -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.8 2000/07/27 09:54:30 tale Exp $
+# $Id: Makefile.in,v 1.9 2000/08/01 01:33:06 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/omapi/include/omapi/compatibility.h b/lib/omapi/include/omapi/compatibility.h
index 3dbbd6d11f..b3ae23cf51 100644
--- a/lib/omapi/include/omapi/compatibility.h
+++ b/lib/omapi/include/omapi/compatibility.h
@@ -1,10 +1,10 @@
 /*
  * 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: compatibility.h,v 1.5 2000/07/27 09:54:31 tale Exp $ */
+/* $Id: compatibility.h,v 1.6 2000/08/01 01:33:07 tale Exp $ */
 
 #ifndef OMAPI_COMPATIBILITY_H
 #define OMAPI_COMPATIBILITY_H 1
@@ -56,7 +56,7 @@
  * The get_value, set_value and stuff_values methods all had their id
  * parameter removed, so those functions for special client/server objects
  * need to have their definitions adjusted.
- * 
+ *
  */
 #define omapi_set_value(h, id, name, value) \
 	omapi_object_set(h, name, value)
diff --git a/lib/omapi/include/omapi/lib.h b/lib/omapi/include/omapi/lib.h
index 59df39db0e..44b03eb534 100644
--- a/lib/omapi/include/omapi/lib.h
+++ b/lib/omapi/include/omapi/lib.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lib.h,v 1.4 2000/07/27 09:54:32 tale Exp $ */
+/* $Id: lib.h,v 1.5 2000/08/01 01:33:08 tale Exp $ */
 
 #ifndef OMAPI_LIB_H
 #define OMAPI_LIB_H 1
diff --git a/lib/omapi/include/omapi/omapi.h b/lib/omapi/include/omapi/omapi.h
index 31b5a3f58d..282c6fe1d3 100644
--- a/lib/omapi/include/omapi/omapi.h
+++ b/lib/omapi/include/omapi/omapi.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1996-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: omapi.h,v 1.16 2000/07/27 09:54:33 tale Exp $ */
+/* $Id: omapi.h,v 1.17 2000/08/01 01:33:09 tale Exp $ */
 
 /*
  * Definitions for the object management API and protocol.
@@ -264,7 +264,7 @@ omapi_object_setstring(omapi_object_t *handle, const char *name,
 
 isc_result_t
 omapi_object_getvalue(omapi_object_t *handle, const char *name,
-		      omapi_value_t **value); 
+		      omapi_value_t **value);
 
 isc_result_t
 omapi_object_passgetvalue(omapi_object_t *object, omapi_string_t *name,
diff --git a/lib/omapi/include/omapi/private.h b/lib/omapi/include/omapi/private.h
index 42a710cfd9..5ca869738f 100644
--- a/lib/omapi/include/omapi/private.h
+++ b/lib/omapi/include/omapi/private.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1996-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: private.h,v 1.23 2000/07/27 09:54:34 tale Exp $ */
+/* $Id: private.h,v 1.24 2000/08/01 01:33:10 tale Exp $ */
 
 /*****
  ***** Private master include file for the OMAPI library.
@@ -166,7 +166,7 @@ struct omapi_connection {
 	/*
 	 * The error that caused the connection to be freed.
 	 */
-	isc_result_t			result;	
+	isc_result_t			result;
 	/*
 	 * Number of socket events outstanding.  This should always be
 	 * either 0 or 1 under the current model; having any more than
@@ -222,7 +222,7 @@ struct omapi_connection {
 
 struct omapi_protocol {
 	OMAPI_OBJECT_PREAMBLE;
-	isc_uint32_t			header_size;		
+	isc_uint32_t			header_size;
 	isc_uint32_t			protocol_version;
 	isc_uint32_t			next_xid;
 	omapi_object_t *		authinfo;	/* Default authinfo. */
@@ -264,7 +264,7 @@ extern omapi_objecttype_t *omapi_type_message;
 extern omapi_objecttype_t *omapi_object_types;
 
 /*
- * Everything needs a memory context. 
+ * Everything needs a memory context.
  */
 extern isc_mem_t *omapi_mctx;
 
@@ -318,7 +318,7 @@ connection_init(void);
 
 #define connect_toserver omapi__connect_toserver
 isc_result_t
-connect_toserver(omapi_object_t *connection, const char *server, 
+connect_toserver(omapi_object_t *connection, const char *server,
 		 in_port_t port);
 
 #define connection_send omapi__connection_send
diff --git a/lib/omapi/include/omapi/result.h b/lib/omapi/include/omapi/result.h
index 1b6be92d3f..be70e574a6 100644
--- a/lib/omapi/include/omapi/result.h
+++ b/lib/omapi/include/omapi/result.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: result.h,v 1.6 2000/07/27 09:54:35 tale Exp $ */
+/* $Id: result.h,v 1.7 2000/08/01 01:33:11 tale Exp $ */
 
 #ifndef OMAPI_RESULT_H
 #define OMAPI_RESULT_H 1
diff --git a/lib/omapi/include/omapi/types.h b/lib/omapi/include/omapi/types.h
index 6946b3d188..6a9dafa346 100644
--- a/lib/omapi/include/omapi/types.h
+++ b/lib/omapi/include/omapi/types.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1996-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: types.h,v 1.6 2000/07/27 09:54:37 tale Exp $ */
+/* $Id: types.h,v 1.7 2000/08/01 01:33:12 tale Exp $ */
 
 #ifndef OMAPI_TYPES_H
 #define OMAPI_TYPES_H 1
diff --git a/lib/omapi/lib.c b/lib/omapi/lib.c
index 4154968d37..c036cbc38e 100644
--- a/lib/omapi/lib.c
+++ b/lib/omapi/lib.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lib.c,v 1.12 2000/07/27 09:54:18 tale Exp $ */
+/* $Id: lib.c,v 1.13 2000/08/01 01:32:54 tale Exp $ */
 
 #include 
 
diff --git a/lib/omapi/listener.c b/lib/omapi/listener.c
index fb9bd60d48..a93b3579da 100644
--- a/lib/omapi/listener.c
+++ b/lib/omapi/listener.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1996-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: listener.c,v 1.28 2000/07/27 09:54:19 tale Exp $ */
+/* $Id: listener.c,v 1.29 2000/08/01 01:32:55 tale Exp $ */
 
 /*
  * Subroutines that support the generic listener object.
@@ -149,7 +149,7 @@ listener_accept(isc_task_t *task, isc_event_t *event) {
 	 */
 	if (result != ISC_R_SUCCESS)
 		return;
-	
+
 	/*
 	 * Is the connection from a valid host?
 	 */
@@ -361,7 +361,7 @@ omapi_listener_listen(omapi_object_t *manager, isc_sockaddr_t *addr,
 
 	} else {
 		/*
-		 * Failed to set up the listener.  
+		 * Failed to set up the listener.
 		 */
 		listener->listening = ISC_FALSE;
 		OBJECT_DEREF(&listener);
@@ -417,7 +417,7 @@ listener_getvalue(omapi_object_t *listener, omapi_string_t *name,
 	 * continue the call through the object chain.
 	 */
 	REQUIRE(listener != NULL && listener->type == omapi_type_listener);
-	
+
 	return (omapi_object_passgetvalue(listener, name, value));
 }
 
diff --git a/lib/omapi/message.c b/lib/omapi/message.c
index 9420444955..7d455a43c4 100644
--- a/lib/omapi/message.c
+++ b/lib/omapi/message.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1996-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: message.c,v 1.27 2000/07/27 09:54:20 tale Exp $ */
+/* $Id: message.c,v 1.28 2000/08/01 01:32:56 tale Exp $ */
 
 /*
  * Subroutines for dealing with message objects.
@@ -72,7 +72,7 @@ omapi_message_register(omapi_object_t *h) {
 	REQUIRE(h != NULL && h->type == omapi_type_message);
 
 	m = (omapi_message_t *)h;
-	
+
 	/*
 	 * Already registered?
 	 */
@@ -96,7 +96,7 @@ omapi_message_unregister(omapi_object_t *h) {
 	REQUIRE(h != NULL && h->type == omapi_type_message);
 
 	m = (omapi_message_t *)h;
-	
+
 	/*
 	 * Not registered?
 	 */
@@ -276,7 +276,7 @@ omapi_message_send(omapi_object_t *message, omapi_object_t *protocol) {
 		c->bytes_needed = p->header_size;
 
 		result = connection_send(c);
-		
+
 		/*
 		 * The client waited for the result; the server did not.
 		 * The server's result will always be ISC_R_SUCCESS.
@@ -499,7 +499,7 @@ message_process(omapi_object_t *mo, omapi_object_t *po) {
 					    isc_result_totext(result)));
 
 		/*
-		 * All messages except for the first attempt to set 
+		 * All messages except for the first attempt to set
 		 * the dst key used by the protocol must be signed.
 		 */
 #ifdef notyet /* not for 9.0.0 */
@@ -531,7 +531,7 @@ message_process(omapi_object_t *mo, omapi_object_t *po) {
 		 * under the current design of OMAPI, there just isn't
 		 * a good way to set the authentication values.  The
 		 * connection object and protocol object are the only
-		 * things that hold state on the server throughout the life 
+		 * things that hold state on the server throughout the life
 		 * of a particular connection, and the original design
 		 * for lookup methods does not provide a way to identify
 		 * the current protocol or connection object.
@@ -566,7 +566,7 @@ message_process(omapi_object_t *mo, omapi_object_t *po) {
 		if (result == ISC_R_NOTFOUND && create == 0) {
 			return (send_status(po, ISC_R_NOTFOUND, message->id,
 					   "no object matches specification"));
-		}			
+		}
 
 		/*
 		 * If we found an object, we're supposed to be creating an
@@ -601,7 +601,7 @@ message_process(omapi_object_t *mo, omapi_object_t *po) {
 						    "can't update object"));
 			}
 		}
-		
+
 		/*
 		 * Now send the new contents of the object back in response.
 		 */
@@ -623,7 +623,7 @@ message_process(omapi_object_t *mo, omapi_object_t *po) {
 			return (send_status(po, result, message->id,
 					    "no matching handle"));
 
-	send:		
+	send:
 		result = send_update(po, message->id, object);
 		OBJECT_DEREF(&object);
 		return (result);
@@ -905,7 +905,7 @@ message_signalhandler(omapi_object_t *handle, const char *name, va_list ap) {
 	REQUIRE(handle != NULL && handle->type == omapi_type_message);
 
 	message = (omapi_message_t *)handle;
-	
+
 	/*
 	 * XXXDCL It would make the client side a bit cleaner if when "status"
 	 * is signalled, it sets both "waitresult" and "waittext" (or some
diff --git a/lib/omapi/object.c b/lib/omapi/object.c
index 344c772f26..9cd6080f2e 100644
--- a/lib/omapi/object.c
+++ b/lib/omapi/object.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1996-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: object.c,v 1.21 2000/07/27 22:25:58 bwelling Exp $ */
+/* $Id: object.c,v 1.22 2000/08/01 01:32:57 tale Exp $ */
 
 /* Principal Author: Ted Lemon */
 
@@ -32,7 +32,7 @@
 struct omapi_objecttype {
 	const char *		name;
 	omapi_objecttype_t *	next;
-	
+
 	isc_result_t		(*set_value)(omapi_object_t *object,
 					     omapi_string_t *name,
 					     omapi_data_t *value);
@@ -216,7 +216,7 @@ omapi_object_dereference(omapi_object_t **h) {
 
 		} else
 			(*h)->refcnt--;
-			
+
 	} else
 		(*h)->refcnt--;
 
@@ -460,7 +460,7 @@ omapi_object_setstring(omapi_object_t *h, const char *name, const char *value)
 }
 
 isc_result_t
-omapi_object_getvalue(omapi_object_t *h, const char *name, 
+omapi_object_getvalue(omapi_object_t *h, const char *name,
 		      omapi_value_t **value)
 {
 	omapi_object_t *outer;
diff --git a/lib/omapi/protocol.c b/lib/omapi/protocol.c
index 6b89dc4dc7..e632939f48 100644
--- a/lib/omapi/protocol.c
+++ b/lib/omapi/protocol.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1996-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: protocol.c,v 1.30 2000/07/27 09:54:23 tale Exp $ */
+/* $Id: protocol.c,v 1.31 2000/08/01 01:32:58 tale Exp $ */
 
 /*
  * Functions supporting the object management protocol.
@@ -273,8 +273,8 @@ send_update(omapi_object_t *po, unsigned int rid, omapi_object_t *object) {
 		if (result == ISC_R_SUCCESS)
 			result = omapi_object_setinteger(message, "handle",
 							 (int)handle);
-	}		
-		
+	}
+
 	if (result == ISC_R_SUCCESS)
 		result = omapi_object_setobject(message, "object", object);
 
@@ -312,7 +312,7 @@ dispatch_messages(omapi_protocol_t *protocol,
 		 */
 		connection_getuint32(connection, &protocol->protocol_version);
 		connection_getuint32(connection, &protocol->header_size);
-	
+
 		/*
 		 * Currently only the current protocol version is supported.
 		 */
@@ -762,7 +762,7 @@ protocol_getvalue(omapi_object_t *h, omapi_string_t *name,
 		  omapi_value_t **value)
 {
 	REQUIRE(h != NULL && h->type == omapi_type_protocol);
-	
+
 	return (omapi_object_passgetvalue(h, name, value));
 }
 
diff --git a/lib/omapi/result.c b/lib/omapi/result.c
index b3cee89bd0..081dff984c 100644
--- a/lib/omapi/result.c
+++ b/lib/omapi/result.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: result.c,v 1.9 2000/07/27 09:54:24 tale Exp $ */
+/* $Id: result.c,v 1.10 2000/08/01 01:33:00 tale Exp $ */
 #include 
 
 #include 
diff --git a/lib/omapi/string.c b/lib/omapi/string.c
index fb19f049de..8f9bda83f5 100644
--- a/lib/omapi/string.c
+++ b/lib/omapi/string.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1996-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: string.c,v 1.8 2000/07/27 09:54:25 tale Exp $ */
+/* $Id: string.c,v 1.9 2000/08/01 01:33:01 tale Exp $ */
 
 /* Principal Author: Ted Lemon */
 
diff --git a/lib/omapi/value.c b/lib/omapi/value.c
index c1888a102e..2b3cbf93d4 100644
--- a/lib/omapi/value.c
+++ b/lib/omapi/value.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1996-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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: value.c,v 1.8 2000/07/27 09:54:26 tale Exp $ */
+/* $Id: value.c,v 1.9 2000/08/01 01:33:02 tale Exp $ */
 
 /* Principal Author: Ted Lemon */
 
diff --git a/lib/omapi/version.c b/lib/omapi/version.c
index 81b149489a..cbbcd41477 100644
--- a/lib/omapi/version.c
+++ b/lib/omapi/version.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: version.c,v 1.4 2000/07/27 09:54:27 tale Exp $ */
+/* $Id: version.c,v 1.5 2000/08/01 01:33:03 tale Exp $ */
 
 char omapi_version[] = VERSION;
 
diff --git a/lib/tests/Makefile.in b/lib/tests/Makefile.in
index 756543ba6f..5ab4ff308f 100644
--- a/lib/tests/Makefile.in
+++ b/lib/tests/Makefile.in
@@ -1,9 +1,9 @@
 # Copyright (C) 1998-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
 # 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
@@ -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.12 2000/07/27 09:54:38 tale Exp $
+# $Id: Makefile.in,v 1.13 2000/08/01 01:33:13 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/tests/include/Makefile.in b/lib/tests/include/Makefile.in
index de02336ce1..2e7e81d966 100644
--- a/lib/tests/include/Makefile.in
+++ b/lib/tests/include/Makefile.in
@@ -1,9 +1,9 @@
 # Copyright (C) 1998-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
 # 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
@@ -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.6 2000/07/27 09:54:40 tale Exp $
+# $Id: Makefile.in,v 1.7 2000/08/01 01:33:16 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/tests/include/tests/Makefile.in b/lib/tests/include/tests/Makefile.in
index 9cbbf70190..ed0d1926e4 100644
--- a/lib/tests/include/tests/Makefile.in
+++ b/lib/tests/include/tests/Makefile.in
@@ -1,9 +1,9 @@
 # Copyright (C) 1999, 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
 # 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
@@ -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.4 2000/07/27 09:54:41 tale Exp $
+# $Id: Makefile.in,v 1.5 2000/08/01 01:33:17 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/tests/include/tests/t_api.h b/lib/tests/include/tests/t_api.h
index 40c29b7813..92ef1130cd 100644
--- a/lib/tests/include/tests/t_api.h
+++ b/lib/tests/include/tests/t_api.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_api.h,v 1.11 2000/07/27 09:54:43 tale Exp $ */
+/* $Id: t_api.h,v 1.12 2000/08/01 01:33:18 tale Exp $ */
 
 #ifndef TESTS_T_API_H
 #define TESTS_T_API_H 1
diff --git a/lib/tests/t_api.c b/lib/tests/t_api.c
index 749f2ee851..0f6d6cff6b 100644
--- a/lib/tests/t_api.c
+++ b/lib/tests/t_api.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 1999, 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
  * 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
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_api.c,v 1.41 2000/07/27 09:54:39 tale Exp $ */
+/* $Id: t_api.c,v 1.42 2000/08/01 01:33:14 tale Exp $ */
 
 #include 
 
@@ -649,7 +649,7 @@ struct dc_method_map {
 	unsigned int	dc_method;
 	const char 	*text;
 } dc_method_map[] = {
-	
+
 	{	DNS_COMPRESS_NONE,	"DNS_COMPRESS_NONE"	},
 	{	DNS_COMPRESS_GLOBAL14,	"DNS_COMPRESS_GLOBAL14"	},
 	{	DNS_COMPRESS_GLOBAL16,	"DNS_COMPRESS_GLOBAL16"	},
diff --git a/ltconfig b/ltconfig
index 65ec6f65d0..48f0c524de 100755
--- a/ltconfig
+++ b/ltconfig
@@ -777,7 +777,7 @@ if test -n "$pic_flag"; then
   if { (eval echo $progname:777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
     # Append any warnings to the config.log.
     cat conftest.err 1>&5
-    
+
     case "$host_os" in
     hpux9* | hpux10* | hpux11*)
       # On HP-UX, both CC and GCC only warn that PIC is supported... then they
@@ -937,7 +937,7 @@ if test "$with_gcc" = yes; then
   else
     no_builtin_flag=' -fno-builtin'
   fi
-  
+
 fi
 
 # Check for any special shared library compilation flags.
@@ -1183,7 +1183,7 @@ EOF
       $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~
       $CC $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts'
 
-      old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$libname.a' 
+      old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$libname.a'
     ;;
 
   netbsd*)
@@ -1215,7 +1215,7 @@ EOF
     else
       ld_shlibs=no
     fi
-    ;;      
+    ;;
 
   sunos4*)
     archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linkopts'
@@ -1452,8 +1452,8 @@ else
     archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
     runpath_var='LD_RUN_PATH'
     hardcode_shlibpath_var=no
-    hardcode_direct=no #Motorola manual says yes, but my tests say they lie 
-    ;;  
+    hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+    ;;
 
   sysv4.3*)
     archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
@@ -1822,7 +1822,7 @@ cygwin* | mingw*)
 freebsd1*)
   dynamic_linker=no
   ;;
-  
+
 freebsd*)
   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
   version_type=freebsd-$objformat
@@ -2372,10 +2372,10 @@ fi
 
 fi
 
-    
+
 fi
 
-  
+
 fi
 
 
@@ -2481,7 +2481,7 @@ else
 fnord() { int i=42;}
 main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
     if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord");
-	       if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } 
+	       if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); }
 
 EOF
 if { (eval echo $progname:2487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
@@ -2554,7 +2554,7 @@ else
 fnord() { int i=42;}
 main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
     if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord");
-    if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } 
+    if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); }
 
 EOF
 if { (eval echo $progname:2560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
diff --git a/ltmain.sh b/ltmain.sh
index ae10cad021..231f2f6b5b 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -670,29 +670,29 @@ compiler."
       # starting and closing comments
 # /* impgen.c starts here */
 # /*   Copyright (C) 1999 Free Software Foundation, Inc.
-# 
+#
 #  This file is part of GNU libtool.
-# 
+#
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation; either version 2 of the License, or
 #  (at your option) any later version.
-# 
+#
 #  This program is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #  GNU General Public License for more details.
-# 
+#
 #  You should have received a copy of the GNU General Public License
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #  */
-# 
+#
 #  #include 		/* for printf() */
 #  #include 		/* for open(), lseek(), read() */
 #  #include 		/* for O_RDONLY, O_BINARY */
 #  #include 		/* for strdup() */
-# 
+#
 #  static unsigned int
 #  pe_get16 (fd, offset)
 #       int fd;
@@ -703,7 +703,7 @@ compiler."
 #    read (fd, b, 2);
 #    return b[0] + (b[1]<<8);
 #  }
-# 
+#
 #  static unsigned int
 #  pe_get32 (fd, offset)
 #      int fd;
@@ -714,7 +714,7 @@ compiler."
 #    read (fd, b, 4);
 #    return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
 #  }
-# 
+#
 #  static unsigned int
 #  pe_as32 (ptr)
 #       void *ptr;
@@ -722,7 +722,7 @@ compiler."
 #    unsigned char *b = ptr;
 #    return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
 #  }
-# 
+#
 #  int
 #  main (argc, argv)
 #      int argc;
@@ -734,32 +734,32 @@ compiler."
 #      unsigned long name_rvas, nexp;
 #      unsigned char *expdata, *erva;
 #      char *filename, *dll_name;
-# 
+#
 #      filename = argv[1];
-# 
+#
 #      dll = open(filename, O_RDONLY|O_BINARY);
 #      if (!dll)
 #  	return 1;
-# 
+#
 #      dll_name = filename;
-#    
+#
 #      for (i=0; filename[i]; i++)
 #  	if (filename[i] == '/' || filename[i] == '\\'  || filename[i] == ':')
 #  	    dll_name = filename + i +1;
-# 
+#
 #      pe_header_offset = pe_get32 (dll, 0x3c);
 #      opthdr_ofs = pe_header_offset + 4 + 20;
 #      num_entries = pe_get32 (dll, opthdr_ofs + 92);
-# 
+#
 #      if (num_entries < 1) /* no exports */
 #  	return 1;
-# 
+#
 #      export_rva = pe_get32 (dll, opthdr_ofs + 96);
 #      export_size = pe_get32 (dll, opthdr_ofs + 100);
 #      nsections = pe_get16 (dll, pe_header_offset + 4 +2);
 #      secptr = (pe_header_offset + 4 + 20 +
 #  	      pe_get16 (dll, pe_header_offset + 4 + 16));
-# 
+#
 #      expptr = 0;
 #      for (i = 0; i < nsections; i++)
 #      {
@@ -778,22 +778,22 @@ compiler."
 #  	    break;
 #  	}
 #      }
-# 
+#
 #      expdata = (unsigned char*)malloc(export_size);
 #      lseek (dll, expptr, SEEK_SET);
 #      read (dll, expdata, export_size);
 #      erva = expdata - export_rva;
-# 
+#
 #      nexp = pe_as32 (expdata+24);
 #      name_rvas = pe_as32 (expdata+32);
-# 
+#
 #      printf ("EXPORTS\n");
 #      for (i = 0; i/dev/null \
 			 | grep " -> " >/dev/null; then
-			continue 
+			continue
 		      fi
 		      # The statement above tries to avoid entering an
 		      # endless loop below, in case of cyclic links.
@@ -2025,7 +2025,7 @@ EOF
       library_names=
       old_library=
       dlname=
-      
+
       # Test again, we may have decided not to build it any more
       if test "$build_libtool_libs" = yes; then
 	# Get the real and link names of the library.
@@ -2217,7 +2217,7 @@ EOF
       gentop=
       # reload_cmds runs $LD directly, so let us get rid of
       # -Wl from whole_archive_flag_spec
-      wl= 
+      wl=
 
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
@@ -2337,9 +2337,9 @@ EOF
 	if test "$dlopen" = unknown && test "$dlopen_self" = unknown &&
 	   test "$dlopen_self_static" = unknown; then
 	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
-	fi 
+	fi
       fi
-    
+
       if test -n "$rpath$xrpath"; then
 	# If the user specified any rpath flags, then add them.
 	for libdir in $rpath $xrpath; do
@@ -2503,7 +2503,7 @@ extern \"C\" {
 	      $run eval 'egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
 	      $run eval '$mv "$nlist"T "$nlist"'
 	    fi
-	    
+
 	    if test -n "$export_symbols_regex"; then
 	      $run eval 'egrep -e "$export_symbols_regex" "$nlist" > "$nlist"T'
 	      $run eval '$mv "$nlist"T "$nlist"'
@@ -2641,7 +2641,7 @@ static const void *lt_preloaded_setup() {
 	$show "$link_command"
 	$run eval "$link_command"
 	status=$?
-	
+
 	# Delete the generated files.
 	if test -n "$dlsyms"; then
 	  $show "$rm $output_objdir/${outputname}S.${objext}"
@@ -2701,7 +2701,7 @@ static const void *lt_preloaded_setup() {
 	# Fast installation is not supported
 	link_command="$compile_var$compile_command$compile_rpath"
 	relink_command="$finalize_var$finalize_command$finalize_rpath"
-	
+
 	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
 	$echo "$modename: \`$output' will be relinked during installation" 1>&2
       else
@@ -2721,7 +2721,7 @@ static const void *lt_preloaded_setup() {
 
       # Replace the output file specification.
       link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-      
+
       # Delete the old output files.
       $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
 
@@ -2834,7 +2834,7 @@ else
 	  echo >> $output "\
   program=lt-'$outputname'
   progdir=\"\$thisdir/$objdir\"
-  
+
   if test ! -f \"\$progdir/\$program\" || \\
      { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\
        test \"X\$file\" != \"X\$progdir/\$program\"; }; then
@@ -2965,7 +2965,7 @@ fi\
 	  exit $status
 	fi
 	generated="$generated $gentop"
-	  
+
 	# Add in members from convenience archives.
 	for xlib in $addlibs; do
 	  # Extract the objects.
diff --git a/make/Makefile.in b/make/Makefile.in
index 78b452caee..923926d7c0 100644
--- a/make/Makefile.in
+++ b/make/Makefile.in
@@ -1,9 +1,9 @@
 # Copyright (C) 1998-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
 # 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
@@ -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.11 2000/07/27 09:54:44 tale Exp $
+# $Id: Makefile.in,v 1.12 2000/08/01 01:33:19 tale Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/make/includes.in b/make/includes.in
index 05bea9f7c9..6f71e7f5c4 100644
--- a/make/includes.in
+++ b/make/includes.in
@@ -1,9 +1,9 @@
 # Copyright (C) 1999, 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
 # 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
@@ -13,9 +13,9 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: includes.in,v 1.8 2000/07/27 09:54:45 tale Exp $
+# $Id: includes.in,v 1.9 2000/08/01 01:33:20 tale Exp $
 
-# Search for machine-generated header files in the build tree, 
+# Search for machine-generated header files in the build tree,
 # and for normal headers in the source tree (${top_srcdir}).
 # We only need to look in OS-specific subdirectories for the
 # latter case, because there are no machine-generated OS-specific
diff --git a/make/mkdep.in b/make/mkdep.in
index 858b172553..60aea6fc6c 100644
--- a/make/mkdep.in
+++ b/make/mkdep.in
@@ -4,7 +4,7 @@
 ## -
 ## Copyright (c) 1987 Regents of the University of California.
 ## All rights reserved.
-## 
+##
 ## Redistribution and use in source and binary forms, with or without
 ## modification, are permitted provided that the following conditions
 ## are met:
@@ -33,14 +33,14 @@
 ## SUCH DAMAGE.
 ## -
 ## Portions Copyright (c) 1993 by Digital Equipment Corporation.
-## 
+##
 ## 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, and that
 ## the name of Digital Equipment Corporation not be used in advertising or
 ## publicity pertaining to distribution of the document or software without
 ## specific, written prior permission.
-## 
+##
 ## THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
 ## WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
 ## OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
diff --git a/make/rules.in b/make/rules.in
index 952cba2f84..decf20e110 100644
--- a/make/rules.in
+++ b/make/rules.in
@@ -1,9 +1,9 @@
 # Copyright (C) 1998-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
 # 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
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: rules.in,v 1.21 2000/07/27 09:54:46 tale Exp $
+# $Id: rules.in,v 1.22 2000/08/01 01:33:23 tale Exp $
 
 ###
 ### Common Makefile rules for BIND 9.
@@ -60,7 +60,7 @@ ALL_SUBDIRS = ${SUBDIRS} nulldir
 # We use a single-colon rule so that additional dependencies of
 # subdirectories can be specified after the inclusion of this file.
 # The "depend" target is treated the same way.
-# 
+#
 subdirs:
 	@for i in ${ALL_SUBDIRS}; do \
 		if [ "$$i" != "nulldir" -a -d $$i ]; then \
diff --git a/util/check-includes.pl b/util/check-includes.pl
index 2b66b897de..e30017523a 100644
--- a/util/check-includes.pl
+++ b/util/check-includes.pl
@@ -1,11 +1,11 @@
 #! /usr/bin/perl -ws
 #
 # 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
 # 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
@@ -15,7 +15,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: check-includes.pl,v 1.5 2000/07/27 09:54:49 tale Exp $
+# $Id: check-includes.pl,v 1.6 2000/08/01 01:33:24 tale Exp $
 
 # Rudimentary, primarily for use by the developers.
 # This just evolved with no serious attempt at making it
@@ -182,7 +182,7 @@ for (<>) {
     # Special exceptions.
     # XXXDCL some of these should be perhaps generalized (ie, look for
     # ISC_(LINK|LIST)_ when using .
-    # 
+    #
     if (($file =~ m%isc/log\.h$% && $elided eq "") ||
         ($file =~ m%isc/print\.h$% && $elided =~ /^$/) ||
         ($file =~ m%isc/string\.h$% && $elided eq "") ||
diff --git a/util/check-instincludes.sh b/util/check-instincludes.sh
index 4934cceb57..efd10580b6 100644
--- a/util/check-instincludes.sh
+++ b/util/check-instincludes.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
 # 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
 # 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
@@ -15,7 +15,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: check-instincludes.sh,v 1.5 2000/07/27 09:54:50 tale Exp $
+# $Id: check-instincludes.sh,v 1.6 2000/08/01 01:33:25 tale Exp $
 
 #
 # Check the installed bind9 header files to make sure that no header
@@ -23,7 +23,7 @@
 # they all compile as C++.
 #
 
-case $# in 
+case $# in
   1) ;;
   *) echo "usage: sh util/check-instincludes.sh " >&2;
      exit 1;
@@ -57,7 +57,7 @@ do
 EOF
 
     # Compile the test program.
-    if 
+    if
        gcc  -W -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings \
            -I/usr/pkg/pthreads/include -I$prefix/include -c test.cc 2>&1
     then
diff --git a/util/check-sources.pl b/util/check-sources.pl
index 9697e3a255..f8a20ed557 100644
--- a/util/check-sources.pl
+++ b/util/check-sources.pl
@@ -1,11 +1,11 @@
 #! /usr/bin/perl -ws
 #
 # 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
 # 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
@@ -15,7 +15,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: check-sources.pl,v 1.5 2000/07/27 09:54:52 tale Exp $
+# $Id: check-sources.pl,v 1.6 2000/08/01 01:33:26 tale Exp $
 
 # Rudimentary, primarily for use by the developers.
 # This just evolved with no serious attempt at making it
diff --git a/util/kit.sh b/util/kit.sh
index a9387524b7..6620b2c71c 100644
--- a/util/kit.sh
+++ b/util/kit.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
 # 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
 # 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
@@ -15,11 +15,11 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: kit.sh,v 1.1 2000/07/28 01:47:16 gson Exp $
+# $Id: kit.sh,v 1.2 2000/08/01 01:33:27 tale Exp $
 
 # Make a release kit
 #
-# Usage: sh makekit.sh tag tmpdir 
+# Usage: sh makekit.sh tag tmpdir
 #
 # (e.g., sh makekit.sh v9_0_0b5 /tmp/bindkit
 #
diff --git a/util/make-snapshot.sh b/util/make-snapshot.sh
index 764e323139..c4255b3bdf 100755
--- a/util/make-snapshot.sh
+++ b/util/make-snapshot.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
 # 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
 # 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
@@ -15,7 +15,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: make-snapshot.sh,v 1.3 2000/07/27 09:54:53 tale Exp $
+# $Id: make-snapshot.sh,v 1.4 2000/08/01 01:33:28 tale Exp $
 
 CVS_RSH=ssh ; export CVS_RSH
 
diff --git a/util/memleak.pl b/util/memleak.pl
index c0928745ab..00d2e02139 100644
--- a/util/memleak.pl
+++ b/util/memleak.pl
@@ -1,11 +1,11 @@
 #!/usr/bin/perl
 #
 # Copyright (C) 1999, 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
 # 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
@@ -15,7 +15,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: memleak.pl,v 1.8 2000/07/27 09:54:54 tale Exp $
+# $Id: memleak.pl,v 1.9 2000/08/01 01:33:29 tale Exp $
 
 # Massage the output from ISC_MEM_DEBUG to extract mem_get() calls
 # with no corresponding mem_put().
diff --git a/util/merge_copyrights b/util/merge_copyrights
index 1ef2837e31..997b3eb9ad 100644
--- a/util/merge_copyrights
+++ b/util/merge_copyrights
@@ -1,11 +1,11 @@
 #!/usr/local/bin/perl -w
 #
 # Copyright (C) 1998-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
 # 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
@@ -15,7 +15,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: merge_copyrights,v 1.14 2000/07/27 09:54:55 tale Exp $
+# $Id: merge_copyrights,v 1.15 2000/08/01 01:33:30 tale Exp $
 
 %file_types = ();
 %file_years = ();
diff --git a/util/mkreslib.pl b/util/mkreslib.pl
index 4553b19523..ea793ff056 100644
--- a/util/mkreslib.pl
+++ b/util/mkreslib.pl
@@ -1,11 +1,11 @@
 #!/usr/bin/perl
 #
 # 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
 # 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
@@ -15,7 +15,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: mkreslib.pl,v 1.6 2000/07/27 09:54:56 tale Exp $
+# $Id: mkreslib.pl,v 1.7 2000/08/01 01:33:32 tale Exp $
 
 # Build a res_* library distribution from the BIND 8 source
 
diff --git a/util/nanny.pl b/util/nanny.pl
index fd6d225cc2..380608581f 100644
--- a/util/nanny.pl
+++ b/util/nanny.pl
@@ -1,11 +1,11 @@
 #!/usr/bin/perl
 #
 # 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
 # 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
@@ -15,7 +15,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: nanny.pl,v 1.5 2000/07/27 09:54:57 tale Exp $
+# $Id: nanny.pl,v 1.6 2000/08/01 01:33:33 tale Exp $
 
 # A simple nanny to make sure named stays running.
 
@@ -32,7 +32,7 @@ for (;;) {
   $pid = ;
   close(FILE);
   chomp($pid);
-  
+
   $ps_command = "ps -axw | grep named | grep $pid | grep -v grep |";
   # ps_command MUST end in a pipe (|) character!
 
diff --git a/util/nt-kit b/util/nt-kit
index 93e314eee1..d908368411 100644
--- a/util/nt-kit
+++ b/util/nt-kit
@@ -1,11 +1,11 @@
 #! /bin/sh -ex
 #
 # Copyright (C) 1999, 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
 # 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
@@ -15,7 +15,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: nt-kit,v 1.4 2000/07/27 09:54:58 tale Exp $
+# $Id: nt-kit,v 1.5 2000/08/01 01:33:34 tale Exp $
 
 # XXX no command line options at all.  especially useful would be a way
 # to specify the target directory on the NT machine, since it is needed
@@ -35,7 +35,7 @@ case "$1" in
 esac
 
 case $# in
-0) 
+0)
     dstdir=../bind9-nt
     rmtdir=g:/proj/bind9-nt
     ;;
@@ -47,7 +47,7 @@ case $# in
     dstdir="$2"
     rmtdir="$1"
     ;;
-*)  
+*)
     echo "usage: $0 rmtdir [dstdir]" >&2
     exit 99
     ;;
diff --git a/util/sanitize.pl b/util/sanitize.pl
index 550632c133..92a7e842b3 100644
--- a/util/sanitize.pl
+++ b/util/sanitize.pl
@@ -1,11 +1,11 @@
 #!/usr/bin/perl
 #
 # 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
 # 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
@@ -15,7 +15,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: sanitize.pl,v 1.2 2000/07/27 09:54:59 tale Exp $
+# $Id: sanitize.pl,v 1.3 2000/08/01 01:33:35 tale Exp $
 
 # Don't try and sanitize this file: NOMINUM_IGNORE
 
diff --git a/util/sanitize_all.sh b/util/sanitize_all.sh
index a567d77b9b..403e596ab0 100755
--- a/util/sanitize_all.sh
+++ b/util/sanitize_all.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
 # 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
 # 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
@@ -15,7 +15,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: sanitize_all.sh,v 1.4 2000/07/28 05:42:36 gson Exp $
+# $Id: sanitize_all.sh,v 1.5 2000/08/01 01:33:36 tale Exp $
 
 PERL=perl5
 
diff --git a/util/update-drafts.pl b/util/update-drafts.pl
index 06644ec011..21428c0446 100644
--- a/util/update-drafts.pl
+++ b/util/update-drafts.pl
@@ -1,11 +1,11 @@
 #!/usr/local/bin/perl -w
 #
 # 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
 # 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
@@ -15,7 +15,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: update-drafts.pl,v 1.2 2000/07/27 09:55:02 tale Exp $
+# $Id: update-drafts.pl,v 1.3 2000/08/01 01:33:37 tale Exp $
 
 #
 # Replace internet drafts with updated versions, if any.
@@ -37,7 +37,7 @@ foreach (@ARGV) {
 	    if ($? == 0) {
 		unlink($ofile);
 		system "cvs remove $ofile";
-		system "cvs add $nfile";		
+		system "cvs add $nfile";
 	    }
     }
 }