]> granicus.if.org Git - pdns/commitdiff
Merge pull request #7197 from pieterlexis/dnsdist-expose-secpoll
authorPieter Lexis <pieterlexis@users.noreply.github.com>
Tue, 20 Nov 2018 11:02:25 +0000 (12:02 +0100)
committerGitHub <noreply@github.com>
Tue, 20 Nov 2018 11:02:25 +0000 (12:02 +0100)
dnsdist: expose secpoll status

1  2 
pdns/dnsdist-console.cc
pdns/dnsdist-lua.cc
pdns/dnsdist.hh

index 654520cdc4cf7e34e3ee718510de13151e0fc44a,ab205d3a5657edd05cae865292122d8fac5c2f69..da894202abb878a03bc963f7794cf7214b6fbef3
@@@ -462,9 -462,10 +462,10 @@@ const std::vector<ConsoleKeyword> g_con
    { "showResponseLatency", true, "", "show a plot of the response time latency distribution" },
    { "showResponseRules", true, "[{showUUIDs=false, truncateRuleWidth=-1}]", "show all defined response rules, optionally with their UUIDs and optionally truncated to a given width" },
    { "showRules", true, "[{showUUIDs=false, truncateRuleWidth=-1}]", "show all defined rules, optionally with their UUIDs and optionally truncated to a given width" },
+   { "showSecurityStatus", true, "", "Show the security status"},
    { "showSelfAnsweredResponseRules", true, "[{showUUIDs=false, truncateRuleWidth=-1}]", "show all defined self-answered response rules, optionally with their UUIDs and optionally truncated to a given width" },
    { "showServerPolicy", true, "", "show name of currently operational server selection policy" },
 -  { "showServers", true, "", "output all servers" },
 +  { "showServers", true, "[{showUUIDs=false}]", "output all servers, optionally with their UUIDs" },
    { "showTCPStats", true, "", "show some statistics regarding TCP" },
    { "showTLSContexts", true, "", "list all the available TLS contexts" },
    { "showVersion", true, "", "show the current version" },
Simple merge
diff --cc pdns/dnsdist.hh
Simple merge