From fa2fbb708b475d2bbaddf83ebf52d189d6606771 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 28 Jan 2016 15:38:06 +1100
Subject: [PATCH] 4304.   [port]          xfer system test failed as 'tail -n
 +value' is not                         portable. [RT #41315]

(cherry picked from commit 9d85a773829484832f762a9088a7dafd6794aa39)
---
 CHANGES                        |  3 +++
 bin/tests/system/xfer/tests.sh | 12 ++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 64e4773c8e..733d7314b8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4304.	[port]		xfer system test failed as 'tail -n +value' is not
+			portable. [RT #41315]
+
 4303.	[bug]		"dig +subnet" was unable to send a prefix length of
 			zero, as it was incorrectly changed to 32 for v4
 			prefixes or 128 for v6 prefixes. In addition to
diff --git a/bin/tests/system/xfer/tests.sh b/bin/tests/system/xfer/tests.sh
index 0966d73225..b894693aaf 100644
--- a/bin/tests/system/xfer/tests.sh
+++ b/bin/tests/system/xfer/tests.sh
@@ -257,7 +257,7 @@ do
 	sleep 1
 done
 
-tail -n +"$cur" < ns4/named.run | grep "Transfer status: success" > /dev/null || {
+sed -n "$cur,\$p" < ns4/named.run | grep "Transfer status: success" > /dev/null || {
     echo "I: failed: expected status was not logged"
     status=1
 }
@@ -277,7 +277,7 @@ $RNDCCMD retransfer nil | sed 's/^/I:ns4 /'
 
 sleep 2
 
-tail -n +"$cur" < ns4/named.run | grep "Transfer status: expected a TSIG or SIG(0)" > /dev/null || {
+sed -n "$cur,\$p" < ns4/named.run | grep "Transfer status: expected a TSIG or SIG(0)" > /dev/null || {
     echo "I: failed: expected status was not logged"
     status=1
 }
@@ -297,7 +297,7 @@ $RNDCCMD retransfer nil | sed 's/^/I:ns4 /'
 
 sleep 2
 
-tail -n +"$cur" < ns4/named.run | grep "Transfer status: tsig verify failure" > /dev/null || {
+sed -n "$cur,\$p" < ns4/named.run | grep "Transfer status: tsig verify failure" > /dev/null || {
     echo "I: failed: expected status was not logged"
     status=1
 }
@@ -317,7 +317,7 @@ $RNDCCMD retransfer nil | sed 's/^/I:ns4 /'
 
 sleep 2
 
-tail -n +"$cur" < ns4/named.run | grep "Transfer status: expected a TSIG or SIG(0)" > /dev/null || {
+sed -n "$cur,\$p" < ns4/named.run | grep "Transfer status: expected a TSIG or SIG(0)" > /dev/null || {
     echo "I: failed: expected status was not logged"
     status=1
 }
@@ -337,7 +337,7 @@ $RNDCCMD retransfer nil | sed 's/^/I:ns4 /'
 
 sleep 2
 
-tail -n +"$cur" < ns4/named.run | grep "tsig key 'tsig_key': key name and algorithm do not match" > /dev/null || {
+sed -n "$cur,\$p" < ns4/named.run | grep "tsig key 'tsig_key': key name and algorithm do not match" > /dev/null || {
     echo "I: failed: expected status was not logged"
     status=1
 }
@@ -357,7 +357,7 @@ $RNDCCMD retransfer nil | sed 's/^/I:ns4 /'
 
 sleep 2
 
-tail -n +"$cur" < ns4/named.run | grep "tsig key 'tsig_key': key name and algorithm do not match" > /dev/null || {
+sed -n "$cur,\$p" < ns4/named.run | grep "tsig key 'tsig_key': key name and algorithm do not match" > /dev/null || {
     echo "I: failed: expected status was not logged"
     status=1
 }