From: Peter van Dijk Date: Tue, 28 Nov 2017 13:18:44 +0000 (+0100) Subject: nit X-Git-Tag: auth-4.1.0~3^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=54c4c0d838af6862f3f22041ec9ed9acb45a6b7c;p=pdns nit --- diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc index 1070ce001..4c74222c9 100644 --- a/pdns/common_startup.cc +++ b/pdns/common_startup.cc @@ -149,7 +149,7 @@ void declareArguments() ::arg().set("negquery-cache-ttl","Seconds to store negative query results in the QueryCache")="60"; ::arg().set("query-cache-ttl","Seconds to store query results in the QueryCache")="20"; ::arg().set("soa-minimum-ttl","Default SOA minimum ttl")="3600"; - ::arg().set("server-id", "Returned when queried for 'server.id' TXT or NSID, defaults to hostname - disabled or custom")=""; + ::arg().set("server-id", "Returned when queried for 'id.server' TXT or NSID, defaults to hostname - disabled or custom")=""; ::arg().set("soa-refresh-default","Default SOA refresh")="10800"; ::arg().set("soa-retry-default","Default SOA retry")="3600"; ::arg().set("soa-expire-default","Default SOA expire")="604800"; diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc index e9b926867..caa8ba45a 100644 --- a/pdns/pdns_recursor.cc +++ b/pdns/pdns_recursor.cc @@ -3367,7 +3367,7 @@ int main(int argc, char **argv) ::arg().set("packetcache-ttl", "maximum number of seconds to keep a cached entry in packetcache")="3600"; ::arg().set("max-packetcache-entries", "maximum number of entries to keep in the packetcache")="500000"; ::arg().set("packetcache-servfail-ttl", "maximum number of seconds to keep a cached servfail entry in packetcache")="60"; - ::arg().set("server-id", "Returned when queried for 'server.id' TXT or NSID, defaults to hostname")=""; + ::arg().set("server-id", "Returned when queried for 'id.server' TXT or NSID, defaults to hostname")=""; ::arg().set("stats-ringbuffer-entries", "maximum number of packets to store statistics for")="10000"; ::arg().set("version-string", "string reported on version.pdns or version.bind")=fullVersionString(); ::arg().set("allow-from", "If set, only allow these comma separated netmasks to recurse")=LOCAL_NETS; diff --git a/pdns/recursordist/docs/manpages/pdns_recursor.rst b/pdns/recursordist/docs/manpages/pdns_recursor.rst index aa1561d1f..a6b5c51e2 100644 --- a/pdns/recursordist/docs/manpages/pdns_recursor.rst +++ b/pdns/recursordist/docs/manpages/pdns_recursor.rst @@ -97,7 +97,7 @@ at `` --quiet Suppress logging of questions and answers. --server-id= - Return *text* WHen queried for 'server.id' TXT, defaults to + Return *text* WHen queried for 'id.server' TXT, defaults to hostname. --serve-rfc1918 On by default, this makes the server authoritatively aware of: