fixup nss compile (no ldns in it).

fixup warning in unitldns
fixup WKS and rdata type service to print unsigned because strings are not portable.

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

diff --git a/ldns/wire2str.c b/ldns/wire2str.c
index 25ff58703116020d08eec322220d22f7f472f8a5..e70d1bd580fb01428c4cfafc9343ce0b583e2ace 100644 (file)
--- a/ldns/wire2str.c
+++ b/ldns/wire2str.c
@@ -1432,8 +1432,16 @@ int sldns_wire2str_wks_scan(uint8_t** d, size_t* dl, char** s, size_t* sl)
                        if(!(((*d)[i])&(0x80>>bit)))
                                continue;
                        port = (int)i*8 + bit;
+
+                       /* we cannot print with strings because they
+                        * are not portable, the presentation format may
+                        * not be able to be read in on another computer.
+                        */
+                       service = NULL;
+                       /*
                        service = getservbyport((int)htons((uint16_t)port),
                                proto_name);
+                       */
                        if(service && service->s_name)
                                w += sldns_str_print(s, sl, " %s",
                                        service->s_name);

diff --git a/testcode/unitldns.c b/testcode/unitldns.c
index a32d81d0cb446e00b182f0f6379bb27fe8b58bc8..8f473a31f6759d53e50f160207af1810f152628c 100644 (file)
--- a/testcode/unitldns.c
+++ b/testcode/unitldns.c
@@ -153,7 +153,7 @@ rr_test_file(const char* input, const char* check)
        if(0) {
                /* debug: create check file */
                of = fopen("outputfile", "w");
-               if(!of) fatal_exit("cannot write output: %s", input, strerror(errno));
+               if(!of) fatal_exit("cannot write output: %s", strerror(errno));
        }
 
        while(fgets(txt_in, (int)bufs, inf)) {

diff --git a/testdata/nss_compile.tpkg b/testdata/nss_compile.tpkg
index 20b778a1e4baeebffe57110a4e9d3c6ffc32fdff..d6412017c532e120f17896d8f98504934b6e9f89 100644 (file)
Binary files a/testdata/nss_compile.tpkg and b/testdata/nss_compile.tpkg differ

diff --git a/testdata/test_ldnsrr.c3 b/testdata/test_ldnsrr.c3
index 42c09b8cf1a027298e08ffb4dac678b4838ffadd..6353cd613d317ae6862683647f8b4f0522bdbfc0 100644 (file)
--- a/testdata/test_ldnsrr.c3
+++ b/testdata/test_ldnsrr.c3
@@ -755,7 +755,7 @@ type107.types-signed.wb.sidnlabs.nl.        3600    IN      NSEC    type11.types-signed.wb.sidnlab
 07747970653130370C74797065732D7369676E6564027762087369646E6C616273026E6C00002E000100000E1000AF002F080500000E1052EC3900524963DCF35A0C74797065732D7369676E6564027762087369646E6C616273026E6C005A6CB3E2ABFA42752071ADC3D73D83DF1C2C9E3C97807735797FACACB8B86CFEF0ADA194E5E0433B99A2501DDA9E478C6AE1FDB180FC63956ED945EAD07D81A25CDD90CF8E5486ADB00104AD0A1815350786FDF45AF9718329DD0917132EE20F22CB587A9AC13FC40D582BD9EEBE8AEEA6796658341C24D02E886B4462EE45D1
 type107.types-signed.wb.sidnlabs.nl.   3600    IN      RRSIG   NSEC 8 5 3600 20140201000000 20130930114324 62298 types-signed.wb.sidnlabs.nl. Wmyz4qv6QnUgca3D1z2D3xwsnjyXgHc1eX+srLi4bP7wraGU5eBDO5miUB3ankeMauH9sYD8Y5Vu2UXq0H2BolzdkM+OVIatsAEErQoYFTUHhv30WvlxgyndCRcTLuIPIstYeprBP8QNWCvZ7r6K7qZ5Zlg0HCTQLohrRGLuRdE= ;{id = 62298}
 067479706531310C74797065732D7369676E6564027762087369646E6C616273026E6C00000B00010000003C000A0A00000106E00005A060
-type11.types-signed.wb.sidnlabs.nl.    60      IN      WKS     10.0.0.1 tcp 0 tcpmux compressnet ftp telnet lmtp 26 dsp 34
+type11.types-signed.wb.sidnlabs.nl.    60      IN      WKS     10.0.0.1 tcp 0 1 2 21 23 24 26 33 34
 067479706531310C74797065732D7369676E6564027762087369646E6C616273026E6C00002E00010000003C00AF000B08050000003C52EC3900524963DCF35A0C74797065732D7369676E6564027762087369646E6C616273026E6C006CD9FF11E609BBB56BD60D0AEBD0E20B790ADB9D1926B5DA2E0770B717250B31A5D1C8FA96278125C3D124E3039EDDF04D065FB5D101DBB3FA7B9B4337D38E547773719AD5319CFD865A6A9307B27D2512F0325729C75CF22D59D9682D511D8565BA7157120A5E3E35934EF2FA27EF333142854B5B9EE47FCAC9062535A0C137
 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= ;{id = 62298}
 067479706531310C74797065732D7369676E6564027762087369646E6C616273026E6C00002F000100000E10002C067479706531320C74797065732D7369676E6564027762087369646E6C616273026E6C000006001000000003
@@ -1027,7 +1027,7 @@ type99.types-signed.wb.sidnlabs.nl.       3600    IN      NSEC    wks.types-signed.wb.sidnlabs.nl
 067479706539390C74797065732D7369676E6564027762087369646E6C616273026E6C00002E000100000E1000AF002F080500000E1052EC3900524963DCF35A0C74797065732D7369676E6564027762087369646E6C616273026E6C000BF173CBB81D152D94323BA05F9CD0C7F20D36FDA59C122A42A7B72C24D4CA2450BB307707441233BD4E47FBA8FA3222F524978E06DCD2CA719E24B6C776B68D345424FBBE32B3FD342A4CC0233381CF2545769820A173293054D207A3E410BAA7B1D06FA9E0E85B34B1FCA90F52F1B2D13137DA51D4B8B868F8791EBF54D507
 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= ;{id = 62298}
 03776B730C74797065732D7369676E6564027762087369646E6C616273026E6C00000B00010000003C000A0A00000106E00005A060
-wks.types-signed.wb.sidnlabs.nl.       60      IN      WKS     10.0.0.1 tcp 0 tcpmux compressnet ftp telnet lmtp 26 dsp 34
+wks.types-signed.wb.sidnlabs.nl.       60      IN      WKS     10.0.0.1 tcp 0 1 2 21 23 24 26 33 34
 03776B730C74797065732D7369676E6564027762087369646E6C616273026E6C00002E00010000003C00AF000B08050000003C52EC3900524963DCF35A0C74797065732D7369676E6564027762087369646E6C616273026E6C009F701D990D4713040E9A68527D76706368EAC0979ADB9A6C07F08940E7FEB2B3B6BC977AE26804A40D087A44B1F1A8CA92D8A51EA39533B13F1EAA8D64357230A08E56B5618D266E23B7B6B8D8F79825A6B5432C984B0457704B2E4C3436FCF83173A5FA074F102483A8B75C739EA9B61A22452DF9C2F1B69475D4C635221906
 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= ;{id = 62298}
 03776B730C74797065732D7369676E6564027762087369646E6C616273026E6C00002F000100000E10002B05776B7330310C74797065732D7369676E6564027762087369646E6C616273026E6C000006001000000003
@@ -1035,7 +1035,7 @@ wks.types-signed.wb.sidnlabs.nl.  3600    IN      NSEC    wks01.types-signed.wb.sidnlabs.nl.
 03776B730C74797065732D7369676E6564027762087369646E6C616273026E6C00002E000100000E1000AF002F080500000E1052EC3900524963DCF35A0C74797065732D7369676E6564027762087369646E6C616273026E6C004646BF2DCEA8D73FE608B97BFD19A4BA0BFDA0686AC90721B7FB0C238201D365E94D5632469A539ED5844AEB0A5D0D9C46A374E88AB19FD4619340D560A81126A3637B0116646EED03FBB7E92BB25C2792B479A06E4A16F7AD9958CD500DCF23F816074B5A532A4C7AC7EE4485BD32F92C8C672CBADB6F5625F4992D4E7808BE
 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= ;{id = 62298}
 05776B7330310C74797065732D7369676E6564027762087369646E6C616273026E6C00000B00010000003C000A0A00000106E00005A060
-wks01.types-signed.wb.sidnlabs.nl.     60      IN      WKS     10.0.0.1 tcp 0 tcpmux compressnet ftp telnet lmtp 26 dsp 34
+wks01.types-signed.wb.sidnlabs.nl.     60      IN      WKS     10.0.0.1 tcp 0 1 2 21 23 24 26 33 34
 05776B7330310C74797065732D7369676E6564027762087369646E6C616273026E6C00002E00010000003C00AF000B08050000003C52EC3900524963DCF35A0C74797065732D7369676E6564027762087369646E6C616273026E6C0097B1D87F38DC2212100D9DB3209974803E63B1877387FD6A41140B15719B8D09577AB11AC3F60124F5F344F166D5C694F31CF6ADB92A317572A086670EDEA91FECBF31F14D950863B30586D2ADD61947E9525C9F242A5213415D75FA21EF7EB69B8DA62D381B7E8AE7260BB16E07582D0FCD7CB8A7AC57817CD124E19142536D
 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= ;{id = 62298}
 05776B7330310C74797065732D7369676E6564027762087369646E6C616273026E6C00002F000100000E10002B05776B7330320C74797065732D7369676E6564027762087369646E6C616273026E6C000006001000000003
@@ -1043,7 +1043,7 @@ wks01.types-signed.wb.sidnlabs.nl.        3600    IN      NSEC    wks02.types-signed.wb.sidnlabs.n
 05776B7330310C74797065732D7369676E6564027762087369646E6C616273026E6C00002E000100000E1000AF002F080500000E1052EC3900524963DCF35A0C74797065732D7369676E6564027762087369646E6C616273026E6C00D01001A192EE66714896D115CCFE402266CF993F711D456B71B1BAB0D097F3023E3F682FE2D44DB0A7E7790688C8A78F327F75D370B597EECE17B49F5516D438C619E76A41B62D32065D04082ADFE235D60596777B4BDC5CD0340699FD7CBC5E6321CB6B08479653C2CB6F6FD67B38CE95A3BC8A61C46DD7F5F9C4055673448E
 wks01.types-signed.wb.sidnlabs.nl.     3600    IN      RRSIG   NSEC 8 5 3600 20140201000000 20130930114324 62298 types-signed.wb.sidnlabs.nl. 0BABoZLuZnFIltEVzP5AImbPmT9xHUVrcbG6sNCX8wI+P2gv4tRNsKfneQaIyKePMn9103C1l+7OF7SfVRbUOMYZ52pBti0yBl0ECCrf4jXWBZZ3e0vcXNA0Bpn9fLxeYyHLawhHllPCy29v1ns4zpWjvIphxG3X9fnEBVZzRI4= ;{id = 62298}
 05776B7330320C74797065732D7369676E6564027762087369646E6C616273026E6C00000B00010000003C000C0A00000111E0000000000004
-wks02.types-signed.wb.sidnlabs.nl.     60      IN      WKS     10.0.0.1 udp 0 tcpmux compressnet domain
+wks02.types-signed.wb.sidnlabs.nl.     60      IN      WKS     10.0.0.1 udp 0 1 2 53
 05776B7330320C74797065732D7369676E6564027762087369646E6C616273026E6C00002E00010000003C00AF000B08050000003C52EC3900524963DCF35A0C74797065732D7369676E6564027762087369646E6C616273026E6C003FEA7581C41B3B823FB01414664B6BCF8435A2C58814814694AF28F92CC85CC8F199D372DFABE3C16E927F2F7B0B271B2D114843682B3EFFDC3DA5EDA0C6FEBAC1C2A03B65E6C4AF2D32459A0F61A50FB19B5D86BEE9D9BC06001B1F5F66273E42F2DA85283E723A97D4CD2847D07AF20731F9DB8C74BCDAC2551C22A5FC8260
 wks02.types-signed.wb.sidnlabs.nl.     60      IN      RRSIG   WKS 8 5 60 20140201000000 20130930114324 62298 types-signed.wb.sidnlabs.nl. P+p1gcQbO4I/sBQUZktrz4Q1osWIFIFGlK8o+SzIXMjxmdNy36vjwW6Sfy97CycbLRFIQ2grPv/cPaXtoMb+usHCoDtl5sSvLTJFmg9hpQ+xm12GvunZvAYAGx9fZic+QvLahSg+cjqX1M0oR9B68gcx+duMdLzawlUcIqX8gmA= ;{id = 62298}
 05776B7330320C74797065732D7369676E6564027762087369646E6C616273026E6C00002F000100000E100029037777770C74797065732D7369676E6564027762087369646E6C616273026E6C000006001000000003