From: Jelte Jansen <jelte@isc.org>
Date: Fri, 17 Feb 2012 15:07:40 +0000 (+0100)
Subject: [master] Merge branch 'trac1613'
X-Git-Tag: trac2351_base~247^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e98da500d7b02e11347431a74f2efce5a7d622aa;p=thirdparty%2Fkea.git

[master] Merge branch 'trac1613'

Conflicts:
	src/bin/auth/auth.spec.pre.in
(due to removal of spaces in earlier spec descriptions)
---

e98da500d7b02e11347431a74f2efce5a7d622aa
diff --cc src/bin/auth/auth.spec.pre.in
index f0aa96dfc3,1f7b5666a9..97b0e79ee0
--- a/src/bin/auth/auth.spec.pre.in
+++ b/src/bin/auth/auth.spec.pre.in
@@@ -272,7 -272,143 +272,143 @@@
          "item_optional": true,
          "item_default": 0,
          "item_title": "Received requests opcode 15",
 -        "item_description": "The number of total request counts whose opcode is15 (reserved)"
 +        "item_description": "The number of total request counts whose opcode is 15 (reserved)"
+       },
+       {
+         "item_name": "rcode.noerror",
+         "item_type": "integer",
+         "item_optional": true,
+         "item_default": 0,
+         "item_title": "Sent success response",
+         "item_description": "The number of total responses with rcode 0 (NOERROR)"
+       },
+       {
+         "item_name": "rcode.formerr",
+         "item_type": "integer",
+         "item_optional": true,
+         "item_default": 0,
+         "item_title": "Sent 'format error' response",
+         "item_description": "The number of total responses with rcode 1 (FORMERR)"
+       },
+       {
+         "item_name": "rcode.servfail",
+         "item_type": "integer",
+         "item_optional": true,
+         "item_default": 0,
+         "item_title": "Sent 'server failure' response",
+         "item_description": "The number of total responses with rcode 2 (SERVFAIL)"
+       },
+       {
+         "item_name": "rcode.nxdomain",
+         "item_type": "integer",
+         "item_optional": true,
+         "item_default": 0,
+         "item_title": "Sent 'name error' response",
+         "item_description": "The number of total responses with rcode 3 (NXDOMAIN)"
+       },
+       {
+         "item_name": "rcode.notimp",
+         "item_type": "integer",
+         "item_optional": true,
+         "item_default": 0,
+         "item_title": "Sent 'not implemented' response",
+         "item_description": "The number of total responses with rcode 4 (NOTIMP)"
+       },
+       {
+         "item_name": "rcode.refused",
+         "item_type": "integer",
+         "item_optional": true,
+         "item_default": 0,
+         "item_title": "Sent 'refused' response",
+         "item_description": "The number of total responses with rcode 5 (REFUSED)"
+       },
+       {
+         "item_name": "rcode.yxdomain",
+         "item_type": "integer",
+         "item_optional": true,
+         "item_default": 0,
+         "item_title": "Sent 'name unexpectedly exists' response",
+         "item_description": "The number of total responses with rcode 6 (YXDOMAIN)"
+       },
+       {
+         "item_name": "rcode.yxrrset",
+         "item_type": "integer",
+         "item_optional": true,
+         "item_default": 0,
+         "item_title": "Sent 'rrset unexpectedly exists' response",
+         "item_description": "The number of total responses with rcode 7 (YXRRSET)"
+       },
+       {
+         "item_name": "rcode.nxrrset",
+         "item_type": "integer",
+         "item_optional": true,
+         "item_default": 0,
+         "item_title": "Sent 'no such rrset' response",
+         "item_description": "The number of total responses with rcode 8 (NXRRSET)"
+       },
+       {
+         "item_name": "rcode.notauth",
+         "item_type": "integer",
+         "item_optional": true,
+         "item_default": 0,
+         "item_title": "Sent 'not authoritative' response",
+         "item_description": "The number of total responses with rcode 9 (NOTAUTH)"
+       },
+       {
+         "item_name": "rcode.notzone",
+         "item_type": "integer",
+         "item_optional": true,
+         "item_default": 0,
+         "item_title": "Sent 'name not in zone' response",
+         "item_description": "The number of total responses with rcode 10 (NOTZONE)"
+       },
+       {
+         "item_name": "rcode.reserved11",
+         "item_type": "integer",
+         "item_optional": true,
+         "item_default": 0,
+         "item_title": "Sent response with rcode 11",
+         "item_description": "The number of total responses with rcode 11 (reserved)"
+       },
+       {
+         "item_name": "rcode.reserved12",
+         "item_type": "integer",
+         "item_optional": true,
+         "item_default": 0,
+         "item_title": "Sent response with rcode 12",
+         "item_description": "The number of total responses with rcode 12 (reserved)"
+       },
+       {
+         "item_name": "rcode.reserved13",
+         "item_type": "integer",
+         "item_optional": true,
+         "item_default": 0,
+         "item_title": "Sent response with rcode 13",
+         "item_description": "The number of total responses with rcode 13 (reserved)"
+       },
+       {
+         "item_name": "rcode.reserved14",
+         "item_type": "integer",
+         "item_optional": true,
+         "item_default": 0,
+         "item_title": "Sent response with rcode 14",
+         "item_description": "The number of total responses with rcode 14 (reserved)"
+       },
+       {
+         "item_name": "rcode.reserved15",
+         "item_type": "integer",
+         "item_optional": true,
+         "item_default": 0,
+         "item_title": "Sent response with rcode 15",
+         "item_description": "The number of total responses with rcode 15 (reserved)"
+       },
+       {
+         "item_name": "rcode.badvers",
+         "item_type": "integer",
+         "item_optional": true,
+         "item_default": 0,
+         "item_title": "Sent 'EDNS version not implemented' response",
+         "item_description": "The number of total responses with rcode 16 (BADVERS)"
        }
      ]
    }