- Fix #572: Fix unit test failure for systems with different

  /etc/services.

git-svn-id: file:///svn/unbound/trunk@3103 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index bcfb6ebc60f1280b7115d7cd5323e3099a2e39ff..ccf2594914da211f29229ed656a6af70098e0cfe 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,8 @@
 7 April 2014: Wouter
        - C.ROOT-SERVERS.NET has an IPv6 address, and we updated the root
          hints (patch from Anand Buddhdev).
+       - Fix #572: Fix unit test failure for systems with different
+         /etc/services.
 
 28 March 2014: Wouter
        - Fix #569: do_tcp is do-tcp in unbound.conf man page.

diff --git a/testdata/test_ldnsrr.3 b/testdata/test_ldnsrr.3
index 54c51248e49be4fa874df507ac26ce86dfc6b210..70ca222f95c20079124e108391b8d8b5f9485afa 100644 (file)
--- a/testdata/test_ldnsrr.3
+++ b/testdata/test_ldnsrr.3
@@ -404,7 +404,7 @@ type107.types-signed.wb.sidnlabs.nl.    60 IN TYPE46 \# 175 00 6b 08 05 00 00 00
 ; NSEC:
 type107.types-signed.wb.sidnlabs.nl.    3600 IN TYPE47 \# 52 06 74 79 70 65 31 31 0c 74 79 70 65 73 2d 73 69 67 6e 65 64 02 77 62 08 73 69 64 6e 6c 61 62 73 02 6e 6c 00 00 0e 00 00 00 00 00 03 00 00 00 00 00 00 00 10 
 type107.types-signed.wb.sidnlabs.nl.   3600    IN      RRSIG   NSEC 8 5 3600 20140201000000 20130930114324 62298 types-signed.wb.sidnlabs.nl. Wmyz4qv6QnUgca3D1z2D3xwsnjyXgHc1eX+srLi4bP7wraGU5eBDO5miUB3ankeMauH9sYD8Y5Vu2UXq0H2BolzdkM+OVIatsAEErQoYFTUHhv30WvlxgyndCRcTLuIPIstYeprBP8QNWCvZ7r6K7qZ5Zlg0HCTQLohrRGLuRdE=
-type11.types-signed.wb.sidnlabs.nl.    60      IN      WKS     10.0.0.1 tcp 0 tcpmux 2 ftp telnet 24 26 33 34 
+type11.types-signed.wb.sidnlabs.nl.    60      IN      WKS     10.0.0.1 tcp 0 1 2 21 23 24 26 33 34 
 type11.types-signed.wb.sidnlabs.nl.    60      IN      RRSIG   WKS 8 5 60 20140201000000 20130930114324 62298 types-signed.wb.sidnlabs.nl. bNn/EeYJu7Vr1g0K69DiC3kK250ZJrXaLgdwtxclCzGl0cj6lieBJcPRJOMDnt3wTQZftdEB27P6e5tDN9OOVHdzcZrVMZz9hlpqkweyfSUS8DJXKcdc8i1Z2WgtUR2FZbpxVxIKXj41k07y+ifvMzFChUtbnuR/yskGJTWgwTc=
 type11.types-signed.wb.sidnlabs.nl.    3600    IN      NSEC    type12.types-signed.wb.sidnlabs.nl. WKS RRSIG NSEC 
 type11.types-signed.wb.sidnlabs.nl.    3600    IN      RRSIG   NSEC 8 5 3600 20140201000000 20130930114324 62298 types-signed.wb.sidnlabs.nl. uM88+sv5qkrcMjbHKBj0GTgKeDODbb1wsrsBYrIE523uIWf6uunseDDzuhaas2aY8kB0Et1GARV2ee+Lmswkbdhb10qhjRDlOba9g8u3ng7D/XDCIVfrKag3lptGpqJay0ATB7pQsz3nXHJJAxUoWVAwkHxtacW7EoAKLEno5XA=
@@ -552,11 +552,11 @@ type99.types-signed.wb.sidnlabs.nl.       60      IN      SPF     "v=spf1 +mx a:colo.example.com/28
 type99.types-signed.wb.sidnlabs.nl.    60      IN      RRSIG   SPF 8 5 60 20140201000000 20130930114324 62298 types-signed.wb.sidnlabs.nl. e+gPKZzvKt4QLeeZUnezhyUrEkw8KwYoZOQnp0OErRYrWQfSG0+pIWPqmQmjctv2KuruWoH8RDLYm94yMDzA+wuPxCCjmPsto63NXCzXHGuJUIQhq1DYbWhXQwa313Ms2Oquj84APx+fiB3hAulPJltF68b3XFspMUGIFRMABWY=
 type99.types-signed.wb.sidnlabs.nl.    3600    IN      NSEC    wks.types-signed.wb.sidnlabs.nl. RRSIG NSEC SPF 
 type99.types-signed.wb.sidnlabs.nl.    3600    IN      RRSIG   NSEC 8 5 3600 20140201000000 20130930114324 62298 types-signed.wb.sidnlabs.nl. C/Fzy7gdFS2UMjugX5zQx/INNv2lnBIqQqe3LCTUyiRQuzB3B0QSM71OR/uo+jIi9SSXjgbc0spxniS2x3a2jTRUJPu+MrP9NCpMwCMzgc8lRXaYIKFzKTBU0gej5BC6p7HQb6ng6Fs0sfypD1LxstExN9pR1Li4aPh5Hr9U1Qc=
-wks.types-signed.wb.sidnlabs.nl.       60      IN      WKS     10.0.0.1 tcp 0 tcpmux 2 ftp telnet 24 26 33 34 
+wks.types-signed.wb.sidnlabs.nl.       60      IN      WKS     10.0.0.1 tcp 0 1 2 21 23 24 26 33 34 
 wks.types-signed.wb.sidnlabs.nl.       60      IN      RRSIG   WKS 8 5 60 20140201000000 20130930114324 62298 types-signed.wb.sidnlabs.nl. n3AdmQ1HEwQOmmhSfXZwY2jqwJea25psB/CJQOf+srO2vJd64mgEpA0IekSx8ajKktilHqOVM7E/HqqNZDVyMKCOVrVhjSZuI7e2uNj3mCWmtUMsmEsEV3BLLkw0Nvz4MXOl+gdPECSDqLdcc56pthoiRS35wvG2lHXUxjUiGQY=
 wks.types-signed.wb.sidnlabs.nl.       3600    IN      NSEC    wks01.types-signed.wb.sidnlabs.nl. WKS RRSIG NSEC 
 wks.types-signed.wb.sidnlabs.nl.       3600    IN      RRSIG   NSEC 8 5 3600 20140201000000 20130930114324 62298 types-signed.wb.sidnlabs.nl. Rka/Lc6o1z/mCLl7/Rmkugv9oGhqyQcht/sMI4IB02XpTVYyRppTntWESusKXQ2cRqN06Iqxn9Rhk0DVYKgRJqNjewEWZG7tA/u36SuyXCeStHmgbkoW962ZWM1QDc8j+BYHS1pTKkx6x+5Ehb0y+SyMZyy6229WJfSZLU54CL4=
-wks01.types-signed.wb.sidnlabs.nl.     60      IN      WKS     10.0.0.1 tcp 0 tcpmux 2 ftp telnet 24 26 33 34 
+wks01.types-signed.wb.sidnlabs.nl.     60      IN      WKS     10.0.0.1 tcp 0 1 2 21 23 24 26 33 34 
 wks01.types-signed.wb.sidnlabs.nl.     60      IN      RRSIG   WKS 8 5 60 20140201000000 20130930114324 62298 types-signed.wb.sidnlabs.nl. l7HYfzjcIhIQDZ2zIJl0gD5jsYdzh/1qQRQLFXGbjQlXerEaw/YBJPXzRPFm1caU8xz2rbkqMXVyoIZnDt6pH+y/MfFNlQhjswWG0q3WGUfpUlyfJCpSE0Fddfoh7362m42mLTgbfornJguxbgdYLQ/NfLinrFeBfNEk4ZFCU20=
 wks01.types-signed.wb.sidnlabs.nl.     3600    IN      NSEC    wks02.types-signed.wb.sidnlabs.nl. WKS RRSIG NSEC 
 wks01.types-signed.wb.sidnlabs.nl.     3600    IN      RRSIG   NSEC 8 5 3600 20140201000000 20130930114324 62298 types-signed.wb.sidnlabs.nl. 0BABoZLuZnFIltEVzP5AImbPmT9xHUVrcbG6sNCX8wI+P2gv4tRNsKfneQaIyKePMn9103C1l+7OF7SfVRbUOMYZ52pBti0yBl0ECCrf4jXWBZZ3e0vcXNA0Bpn9fLxeYyHLawhHllPCy29v1ns4zpWjvIphxG3X9fnEBVZzRI4=

diff --git a/testdata/test_ldnsrr.5 b/testdata/test_ldnsrr.5
index 4b1d85fa587a7e6cabe8be91f3d5c63118d93ec2..70a2e692edbdd4feff81e37c8b00659f6e3cf152 100644 (file)
--- a/testdata/test_ldnsrr.5
+++ b/testdata/test_ldnsrr.5
@@ -6,7 +6,7 @@
 @      IN      MB      mb.atoom.net.
 @      IN      MG      mg.atoom.net.
 @      IN      MR      mr.atoom.net.
-@      IN      WKS     192.168.1.2 tcp domain smtp ssh 123
+@      IN      WKS     192.168.1.2 tcp domain 25 22 123
 @      IN      WKS     192.168.1.2 udp domain
 @      IN      PTR     ptr.atoom.net.
 @      IN      HINFO   "host" "info"