47d837a499
Conflicts: bin/tests/system/conf.sh.in lib/dns/win32/libdns.def.in lib/isc/win32/file.c The merge also needed to update files in legacy and tcp system tests (newly introduced in master after branch was created) to introduce use of lockfile.
Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC")
See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
The test setup for the SERVFAIL ncache tests has a secure root.
ns1 is the root server.
ns2 is an authoritative server for the various test domains.
ns5 is a caching-only server, configured with the an incorrect trusted
key for the root. It is used for testing failure cases.