Commit c12ca117 authored by Stephen Morris's avatar Stephen Morris
Browse files

[1213] Preparation for merge with master

Rename ixfr/clean.sh so it doesn't get executed in that directory.
Remove a few more blank lines at the start of shell scripts.
parent 4cfd2784
#!/bin/sh
#
# Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
......@@ -15,7 +14,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# Clean up after zone transfer tests.
# Clean up nameserver directories after zone transfer tests.
rm -f ns1/named.conf
rm -f ns1/db.example
......
#!/bin/sh
#
# Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
......
../clean.sh
\ No newline at end of file
../clean_ns.sh
\ No newline at end of file
#!/bin/sh
#
# Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
......
../clean.sh
\ No newline at end of file
../clean_ns.sh
\ No newline at end of file
../clean.sh
\ No newline at end of file
../clean_ns.sh
\ No newline at end of file
#!/bin/sh
#
# Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
......
#!/bin/sh
#
# Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
......
../clean.sh
\ No newline at end of file
../clean_ns.sh
\ No newline at end of file
#!/bin/sh
#
# Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
......
#!/bin/sh
#
# Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
......
......@@ -314,9 +314,9 @@ compare_zones() {
shift
$DIG @$client_ip -p $DNS_PORT example. axfr | grep -v '^;' | grep -v '^$' \
| sed -e 's/ //g' -e 's/\t//g' > client.dig
| sed -e 's/ //g' -e 's/\t//g' | sort > client.dig
$DIG @$server_ip -p $DNS_PORT example. axfr | grep -v '^;' | grep -v '^$' \
| sed -e 's/ //g' -e 's/\t//g' > server.dig
| sed -e 's/ //g' -e 's/\t//g' | sort > server.dig
diff client.dig server.dig
if [ $? -eq 0 ];
then
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment