Commit ea606b1d authored by Marek Vavrusa's avatar Marek Vavrusa

Merge branch 'master' into dnssec-resign-early

Conflicts:
	NEWS
	src/knot/ctl/remote.c
parents 370cca88 a376e2f5
......@@ -8,6 +8,7 @@ Bugfixes:
* Zone-related log messages are logged into correct category
* DNSSEC: Refresh signatures earlier (3 days before their expiration
with the default signature lifetime)
* Fixed RCU synchronization causing deadlock on 'knotc signzone'
v1.4.1 - Jan 13, 2014
---------------------
......
......@@ -670,7 +670,7 @@ dbg_ns_exec(
const knot_dname_t *dname
= knot_node_owner(node);
ret = ns_follow_cname(&node, &dname, resp,
knot_response_add_rrset_additional, 0);
knot_response_add_rrset_additional, KNOT_PF_NOTRUNC);
if (ret != KNOT_EOK) {
dbg_ns("Failed to follow CNAME.\n");
return ret;
......@@ -703,7 +703,7 @@ dbg_ns_exec(
}
ret = ns_add_rrsigs(rrset_add, resp, dname,
knot_response_add_rrset_additional, 0);
knot_response_add_rrset_additional, KNOT_PF_NOTRUNC|KNOT_PF_CHECKDUP);
if (ret != KNOT_EOK) {
dbg_ns("Failed to add RRSIGs for A RR"
......@@ -738,7 +738,7 @@ dbg_ns_exec(
}
ret = ns_add_rrsigs(rrset_add, resp, dname,
knot_response_add_rrset_additional, 0);
knot_response_add_rrset_additional, KNOT_PF_NOTRUNC|KNOT_PF_CHECKDUP);
if (ret != KNOT_EOK) {
dbg_ns("Failed to add RRSIG for AAAA RR"
......@@ -2106,7 +2106,7 @@ static int ns_add_dnskey(const knot_node_t *apex, knot_packet_t *resp)
ret = knot_response_add_rrset_additional(resp, rrset, KNOT_PF_NOTRUNC);
if (ret == KNOT_EOK) {
ret = ns_add_rrsigs(rrset, resp, apex->owner,
knot_response_add_rrset_additional, 0);
knot_response_add_rrset_additional, KNOT_PF_NOTRUNC);
}
}
......
; File written on Thu Nov 21 15:45:29 2013
; dnssec_signzone version 9.9.3-rpz2+rl.13214.22-P2-Ubuntu-1:9.9.3.dfsg.P2-4ubuntu1
example. 3600 IN SOA ns1.example. bugs.x.w.example. 1081539377 3600 300 3600000 3600
example. 3600 IN RRSIG SOA 5 1 3600 20500101000000 20131121134528 1971 example. se2uWa7J7XCUHwKij10oYKy0TeTG1k9FLrMHuXJ3S06+egyldHDJHWdH ogY6OUKC/cd5C4bsM0DyW830WQ5/YTx+YgFCsVpDa1Oc6MHyfh/W5EN3 04mLTbjF+xXT85dM4gR7/D4iBW1GnYz/2jfSbc/n/Oz/zbPZsDDyjgwG TF4=
example. 3600 IN NS ns1.example.
example. 3600 IN NS ns2.example.
example. 3600 IN RRSIG NS 5 1 3600 20500101000000 20131121134528 1971 example. J7Rjb17s1+CXkdeAd0FWO/asJ5mF731Eow4VJHiR4eQBfVrJdpJEfpmS JvkSmqOivuVfwRE40qrH7etl8eMOV/j4zOlc5ucXgOjjuhcht+VorCVK yHmvzpURH74pB/iC2/lnpXI2hlu/oWW9HmtVqjMLBUIwHLHB4TbDVRPU Tm0=
example. 3600 IN MX 1 xx.example.
example. 3600 IN RRSIG MX 5 1 3600 20500101000000 20131121134528 1971 example. TlQlcowXjy2v63nOA3a+NiGlDPBbztq50+grzzOQLidHv4bvNZ6Nf2/L 56DSmOgaoIGzgOVXzAukU97iiPSrouZx7qIavVlo+iMnLNBrajMX8c3P 4IJ+NqzoK/34us2vkLzA0HK7ZG2r8AGwPUn/3cFHedDEtQpAgpmhnlUd OJI=
example. 3600 IN NSEC a.example. NS SOA MX RRSIG NSEC DNSKEY
example. 3600 IN RRSIG NSEC 5 1 3600 20500101000000 20131121134528 1971 example. G0FB4CUjNRnSGZmRrmhYIb8uGO64/f1+As7tylYGKki20mVoYQhIYW/T pF8X+6mmjMIA3cQeg0JW1TdCfR+MeHuWzWlPt0wPy5B4J6bOyL1biygw 0eiOcWe21G474wCT+IZq5Ckzx0KkF+hedxuCbnmAOgqFGvpwyWCIgd01 pPs=
example. 3600 IN DNSKEY 256 3 5 AwEAAeU82dYTj1B5+spFPBrFc8WyTms3wjkODhcNC5gy8HCLX+7coKKI 2uFiWIlvqGtqKHlAWWM6KtAZaLQMFrzIaxDJniXNxl71mMOdkmTYhbAr bul0qEqwW5Uid+vThmE0VZSPzSFEs3Si0trpp93l1N9P+NCdyVKOgCEV wTsAcGbD
example. 3600 IN DNSKEY 257 3 5 AwEAAbagnmyj3nvSvIFd36LkVufo0lEo5/NY+nWYo9u5XszUj9IdVNlz XtVDbcJkP3M/NwSPfcoZXul0hJHttAJ0++YWfcOD3zWY0FaJSQHz1B76 PEdfkHsaXyiSWZszp76qJJwAkkPSL6Frgv3OhYQHoBFjLVyLEowrnkPF tCLLOPpnxoLlgVCVq9gITBS0H9ym8ezZyNvIYAy4pzI1kiji9jVf+jr1 t6sMeqbH+aXSvIYGjvog1xghdl7j5MoJYhSBNw4i5d/c+LCEci+QWHtN l6/nwlCaqWOO0ub3nUA8CjiKMveh47HxwyULZbkKNhpWPDeasIrDvxmf 9C5j2GubGlM=
example. 3600 IN RRSIG DNSKEY 5 1 3600 20500101000000 20131121134528 1971 example. eQ+2iNQn2PUhg3GKQD2AI4ufM2cqTk1wtDY966tzCb6+iBpMbg77VMvE 48+aMnP2WYog62nGzALHs9MXl4nWuTGuHnKptOXc3nYzpOFYVjed+0yt 1Z7t0axMO3dqo8qpC5vkjTRmLxmh89ubMbqtqUHPebbXKVBZPfumwgP7 P3M=
example. 3600 IN RRSIG DNSKEY 5 1 3600 20500101000000 20131121134528 20584 example. s2PKrc/AuPGEfsVKY0S2kYtCV78lrbDg8SylVvjPiz7eP4PbhaO+xOK1 2TWTPyF08Vw1D9FRPzk8ZhYrU0r0du1/tCKEWjY1fzn3+sVvpd4Brh2o AjXng5WZqPEYbQaTCspE6ebUVuPZKlVR2DiFRj+q3Ls6X77NX+gqi0O3 9AK2TXdZn3dQTOUsVZTe3jZTTA/XbnWtmxPjY3tyasb6w5iqsYWMgXcc mcmWHPtJ6CITO7nWjyBwZWcfy9nXD3D4eEwYsHg8N7fc25KW1nQZGj4b vn7n5T5uJhFTVcaNnxpzJ2BRNoRo3qmWvIztlKI5gwVdqTPCMj2AmJz+ RQC6Ug==
ns1.a.example. 3600 IN A 192.0.2.5
ns2.a.example. 3600 IN A 192.0.2.6
ns1.b.example. 3600 IN A 192.0.2.7
ns2.b.example. 3600 IN A 192.0.2.8
a.example. 3600 IN NS ns1.a.example.
a.example. 3600 IN NS ns2.a.example.
a.example. 3600 IN DS 57855 5 1 B6DCD485719ADCA18E5F3D48A2331627FDD3636B
a.example. 3600 IN RRSIG DS 5 2 3600 20500101000000 20131121134528 1971 example. fACZCKLRb8GeinlsVOm01M1RpUVplkfKvHj4LGM/18fK5f6VkZWyubzO YW5HAZsc9gjnhA5/m1IJL2ZwxnCmoJefYB27a5h2qFR5OLKh47JpxOyz n4DJKsTyGssGSTpeHnYrjJx3fMBsr7IYO/QbnBvIYpM9Xz2+OH9hlxMm 6uM=
a.example. 3600 IN NSEC ai.example. NS DS RRSIG NSEC
a.example. 3600 IN RRSIG NSEC 5 2 3600 20500101000000 20131121134528 1971 example. ep06fTzyB/FBxPKrPYXWsS9Ms9k5XqnJgZGOguEAcVfOOxoGn5VQTg1z 6ALGs9BUtklxhsun/w7E7pZA6kY7f+FCLRi4ksjd7nEcc2NJiVJl3OFQ HFvQdmTtpv6Vhwow9hHToBsDlj2oSkKtWYXcdWyj4XMRIZ1HpgEIO8lM JXM=
b.example. 3600 IN NS ns1.b.example.
b.example. 3600 IN NS ns2.b.example.
b.example. 3600 IN NSEC ns1.example. NS RRSIG NSEC
b.example. 3600 IN RRSIG NSEC 5 2 3600 20500101000000 20131121134528 1971 example. doAI6APIg/dbVxiOQGFwNOIf9M+JZdqfviZ3hB+XUGRLiO7KrpAIPoSU IrCmVl4aqj5cuIMvAv2iE8q4vuGF1HtaSl+tgt9gvzIchno+Hu3YvxP4 zsg2I8vPjfYnspoJH5MeOr/oHN7vBt3sBKXLudicltVn8Ny4UPXj+umL hNw=
ai.example. 3600 IN A 192.0.2.9
ai.example. 3600 IN RRSIG A 5 2 3600 20500101000000 20131121134528 1971 example. ygIUjuGP/1aWbbhps1n/nOMif0pgE59QZsvwGLugVgjfJw+oyPvsF4KU DdCvaOz+xZ+QMtn7Gn9w5DiWcQDIY46FrfeIuTt96NYzo/p0bajwrffZ RCA5jphKdTI1Im2HRYFz/5zdwDMztaVkWdIP/3OJoW0lnLDiG/h0BNtY Xlw=
ai.example. 3600 IN HINFO "KLH-10" "ITS"
ai.example. 3600 IN RRSIG HINFO 5 2 3600 20500101000000 20131121134528 1971 example. lD5COEIdXENCo1bduvToEtDCQIjvtjnmcQvWOPC/L4NJUhW18kDSsc7Q ikCXbdFkgqFuCfDXUe90pl5uD1EM5S2Ek9/nGi/rIh2FSVrW/zn8UuPV 1uubUX+qDKvEWYIPqDi4RmWismoqrEdwNuuhMIoarXWputVshjCbHnXv llQ=
ai.example. 3600 IN AAAA 2001:db8::f00:baa9
ai.example. 3600 IN RRSIG AAAA 5 2 3600 20500101000000 20131121134528 1971 example. IoDSVYnwLQkgDrojcyivYjv8R8OsdTHEmbZbordOftqdkRy6QMroVk8k OM5XIp/siO+D5E/5dPFz/4+E/VnlC1NSSTpF1YQ8IjxK7gSOMLZCPbf8 4FTI65ns5JyJD7Xvm4rYBH1bpkg4v3utZb2t/Y8wlFN7fcOYBn5CuPUa h1U=
ai.example. 3600 IN NSEC b.example. A HINFO AAAA RRSIG NSEC
ai.example. 3600 IN RRSIG NSEC 5 2 3600 20500101000000 20131121134528 1971 example. 0XY0fQgxxASkVbWX7yqNOF68lVKS7I9xWkfH/wJhikBMLtZbPR+ETf9d NM6Mz2Z1Tc2N2A+WB6e9o8rLAQE12rT5rghbMx/6wRPpOx5J8CUSzDTy ikj/kJE9ZWwITXKhQ4dKSJUUUK7V9wppGTqFRJ3xWI9asDMelJvuJHjW TMg=
ns1.example. 3600 IN A 192.0.2.1
ns1.example. 3600 IN RRSIG A 5 2 3600 20500101000000 20131121134528 1971 example. tzduIcQ1xzQ+9wS37RvoMkzOY6eERFfuUvtMpN1r+FT/xm68ztog0Eel E1V5qj8f34/Y0Jue3iD744Crr7khQmE79Alkll2j44Awo+/TRwst82pM 7d5y21iVDjgLyMQbWPZ6g4ovoJ4s1DVqvNC9ORBldOK5koiI5S50geKv Au4=
ns1.example. 3600 IN NSEC ns2.example. A RRSIG NSEC
ns1.example. 3600 IN RRSIG NSEC 5 2 3600 20500101000000 20131121134528 1971 example. lzDXHCbEutk9KAco61yqjjAGbL4ae2FKVb3VaFhq/LY8sN8ZP0g2f/WR aDr6fl8dJfC0Hxn29ExYnMM2v1D+ssDmAel+k4yRREHealWsO2KfMi8G y0iyDJaKknx12E3lB5eMjdXRy77Na4h9hmkfTZbAzH/CX5BtuHvIXCjE VOw=
ns2.example. 3600 IN A 192.0.2.2
ns2.example. 3600 IN RRSIG A 5 2 3600 20500101000000 20131121134528 1971 example. Euy4kvjbwQ2njoN9Y0VzNGe3wlETmWUUvNQF+JXw2V3HGg0GHgOXj9ly MVBsUOMqFQuREw6+j8spRg7FAM28YQOrcYRxKJiN0oD0690zCT7edn7A vFqYvyiKC7dMcYqYGN1CVd2glJACh2K57g6j2+NJlTJfBJEKvpz7wg4m E/M=
ns2.example. 3600 IN NSEC *.w.example. A RRSIG NSEC
ns2.example. 3600 IN RRSIG NSEC 5 2 3600 20500101000000 20131121134528 1971 example. mdZO+V61bcGmMbQGZrj02GxwCewTqOTKGWTf5JL+m/fCZqZ/tTpFdm2E YaH2cTakt/H8mBDHdzCdPB4BnzyzKoJVc5FzJ+9LMDmIVFqbC+NAkhZw jC0O6lgYGKFAGy8zjXYs+lF5pvKtpZmIX/3j3ezDaSrFbOcpQKuwXrae dF0=
*.w.example. 3600 IN MX 1 ai.example.
*.w.example. 3600 IN RRSIG MX 5 2 3600 20500101000000 20131121134528 1971 example. tTE7c8oD9xkn6HpL+Of2hBfOCwzyKmKVBK8B4Ky6pYz2U98u8Y4iP9bo 8nvsZkM1FvnfEngbVjEEE7PDqtItKWuIjucfCiQ6JAXJPBBL5KQ6O4mV QCWZEcLM2PQbMXwLPzQavHwICTxvxaNN9skj4In+MuLuoG1VwKeineZM WR0=
*.w.example. 3600 IN NSEC x.w.example. MX RRSIG NSEC
*.w.example. 3600 IN RRSIG NSEC 5 2 3600 20500101000000 20131121134528 1971 example. ji5OZlmfnUh3MLL1o8cdCLoOjBZQAArz0w5hHOIVj01bNdTthYmDRv0S u9gxFj+c83ohAZQO5fQIh7KmUr1LqDXUGXXJYRgYz0q8GTMwhGKXsygr MJrnq1DLpemmG4JaG+BeAuT/5qZ3CifDSQYzu5vUauiTpJlTg4yoxOYr qQI=
x.w.example. 3600 IN MX 1 xx.example.
x.w.example. 3600 IN RRSIG MX 5 3 3600 20500101000000 20131121134528 1971 example. o9Rpea74a6yC9K6ZHasizK6hXZjpB1kC63jwI9ha8tlpgSSCd5OWJhd1 CCPstDCSGurpzi7Qr3Q8qL71oyRm09BIcvVoE/4BbNDj9slk8Ai4FKik 0Iy1DF1/3wWTTNdiOYvnTM347A1WKX5KxwUDRvu/DBV1NnYWOPdlpqnK 2ns=
x.w.example. 3600 IN NSEC x.y.w.example. MX RRSIG NSEC
x.w.example. 3600 IN RRSIG NSEC 5 3 3600 20500101000000 20131121134528 1971 example. I2gdagfYSLw/fV4o4eGPAMOKS1Ih9nkUc1r51D5JnqdX5fLU7oyso5nQ R0l9BHAvfw2KKJn4AfVW3m0Vbe0oUBg+xqJtwtRjSsD80NqvUohqKun/ 4+LEaKro5IkaOgn7kiuTZYJHZ5+TPEk+6TsmmM4eC4mzF9Y5ZfzZxTj3 VM4=
x.y.w.example. 3600 IN MX 1 xx.example.
x.y.w.example. 3600 IN RRSIG MX 5 4 3600 20500101000000 20131121134528 1971 example. gemBd/zaP6fu1cP7Fa2iFr4oQqUV0EVe4DdHy1dfEg/3NBy3dVZT0SsQ iLOHwkhKh18vOdDX1YbcwvOP7T7Z0FPzUSG9nZY/MKTrCsEDNdLwy8Z8 gKkhkVXqf+GiY8HHG50Sp4UZZAtstmTDfIE4dIMLjbBjeJVKTZhWR8jc 1Rg=
x.y.w.example. 3600 IN NSEC xx.example. MX RRSIG NSEC
x.y.w.example. 3600 IN RRSIG NSEC 5 4 3600 20500101000000 20131121134528 1971 example. yo+8UjHIb5YtPtRPIMU3uUKcGdaUSI23yQqHRwRJeVu6dF7F63iXvmdB Hd/lg7L+CAeB6iHYvbDJOAxlL0BpvvbSoU3Xy4f1r6T8+Y7VBsnijVI+ lETOE6IJevwHzrHU0jsMelRvZvOUs5skyQD7/JTwdDjwyQSb+cojMDgB wBQ=
xx.example. 3600 IN A 192.0.2.10
xx.example. 3600 IN RRSIG A 5 2 3600 20500101000000 20131121134528 1971 example. ZBkt0zR1GotODoClSpplvseMfpnXYXQz3k+EIopYvMubU+MprkfNLZiT 1COKki7ul7t885tibK0ZsiV5vHbrZwBuQd7U2wZH2UILTuoUI0WkJh6l 427ubpymY+c2JYVJ02nA9zEvwlkeL34XUyksv0I5UbxPvqVvxbsg6b8r UC4=
xx.example. 3600 IN HINFO "KLH-10" "TOPS-20"
xx.example. 3600 IN RRSIG HINFO 5 2 3600 20500101000000 20131121134528 1971 example. dNS+7A5/HdDti/G7fD3kgX9iMGx5hf7yTDYxH822v85ynQ86SI19aHKN FIIa/JlBfIFTIpQVz7lD9jjjPs3wFqF+0Rpjs2i2h/Jnpty0qPt4NPLe 9uEKEg4qYhMLD5tY3b3Rv8px/derUQDr6sKwOHQLjXm3Szo6xKzq/jv3 nDI=
xx.example. 3600 IN AAAA 2001:db8::f00:baaa
xx.example. 3600 IN RRSIG AAAA 5 2 3600 20500101000000 20131121134528 1971 example. 2kCfP1nujvDjGK+jQt+Q1MPGjpRRMvuicrEuBnjrUkazJXLKXPfxhsmA vkCP2cjqj99m/oS0jb8yX6JE4XW9zhbbW1cABq/9aTTT5IcrknaoQ8dz dwxvZ8rFU4QFiJIJ5qoY8QxpCuZJ4AvZNj1sRzQGBfatnn/yvZC+EjSK Zkw=
xx.example. 3600 IN NSEC example. A HINFO AAAA RRSIG NSEC
xx.example. 3600 IN RRSIG NSEC 5 2 3600 20500101000000 20131121134528 1971 example. UJ0Swaux9UZDSX8ZDB9bES/f83bNOIU6gmZeNo3G9b0OgLqovmEyTPSK dkKxO8wd7FuurP2+Hn8F20MMydMdS81TEQfMFkDESqFWorchXnN8rcOB e9Drk1y7AeWBM0WLtlcVpgrjz5Jte3U1+ceNdeXxX2nSn30PEelhZn+3 6Js=
......@@ -8,10 +8,10 @@ t = Test()
knot = t.server("knot")
bind = t.server("bind")
zone = t.zone("flags.")
zones = t.zone("flags.") + t.zone("example.", "example.zone.nsec", local=True)
t.link(zone, knot)
t.link(zone, bind)
t.link(zones, knot)
t.link(zones, bind)
t.start()
......@@ -29,4 +29,8 @@ resp.cmp(bind)
resp = knot.dig("513resp.flags", "TXT", udp=True, bufsize=524)
resp.check(noflags="TC")
# check if RRSIG not fitting in the AR causes truncation
resp = knot.dig("example", "SOA", udp=True, dnssec=True, bufsize=1400)
resp.check(noflags="TC")
t.end()
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