From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Tue, 16 Aug 2016 15:55:34 +0000 (+0200)
Subject: rec: Fix rec_control man page tests
X-Git-Tag: rec-4.0.2~1^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7194cb646e54af1de6c3df538c8c80fe124bb5e0;p=thirdparty%2Fpdns.git

rec: Fix rec_control man page tests
---

diff --git a/docs/manpages/rec_control.1.md b/docs/manpages/rec_control.1.md
index 788c9a6236..7cc301a4f6 100644
--- a/docs/manpages/rec_control.1.md
+++ b/docs/manpages/rec_control.1.md
@@ -125,6 +125,10 @@ reload-zones
 :    Reload authoritative and forward zones. Retains current configuration
      in case of errors.
 
+set-carbon-server *CARBON SERVER* [*CARBON OURNAME*]
+:    Set the carbon-server setting to *CARBON SERVER*. If *CARBON OURNAME* is not
+     empty, also set the carbon-ourname setting to *CARBON OURNAME*.
+
 set-dnssec-log-bogus *SETTING*
 :    Set dnssec-log-bogus setting to *SETTING*. Set to 'on' or 'yes' to log DNSSEC
      validation failures and to 'no' or 'off' to disable logging these failures.
@@ -132,10 +136,26 @@ set-dnssec-log-bogus *SETTING*
 set-minimum-ttl *NUM*
 :    Set minimum-ttl-override to *NUM*.
 
+top-queries
+:    Shows the top-20 queries. Statistics are over the last
+     'stats-ringbuffer-entries' queries.
+
+top-largeanswer-remotes
+:    Shows the top-20 remote hosts causing large answers. Statistics are over the
+     last 'stats-ringbuffer-entries' queries.
+
 top-remotes
 :    Shows the top-20 most active remote hosts. Statistics are over the
      last 'stats-ringbuffer-entries' queries.
 
+top-servfail-queries
+:    Shows the top-20 queries causing servfail responses. Statistics are
+     over the last 'stats-ringbuffer-entries' queries.
+
+top-servfail-remotes
+:    Shows the top-20 most active remote hosts causing servfail responses.
+     Statistics are over the last 'stats-ringbuffer-entries' queries.
+
 trace-regex *REGEX*
 :    Emit resolution trace for matching queries. Empty regex to disable trace.
 
diff --git a/pdns/rec_channel_rec.cc b/pdns/rec_channel_rec.cc
index 74b848ae33..be3724b6b4 100644
--- a/pdns/rec_channel_rec.cc
+++ b/pdns/rec_channel_rec.cc
@@ -1138,7 +1138,7 @@ string RecursorControlParser::getAnswer(const string& question, RecursorControlP
 "clear-nta [DOMAIN]...            Clear the Negative Trust Anchor for DOMAINs, if no DOMAIN is specified, remove all\n"
 "clear-ta [DOMAIN]...             Clear the Trust Anchor for DOMAINs\n"
 "dump-cache <filename>            dump cache contents to the named file\n"
-"dump-edns[status] <filename>     dump EDNS status to the named file\n"
+"dump-edns [status] <filename>    dump EDNS status to the named file\n"
 "dump-nsspeeds <filename>         dump nsspeeds statistics to the named file\n"
 "get [key1] [key2] ..             get specific statistics\n"
 "get-all                          get all statistics\n"