From: Otto Moerbeek Date: Fri, 7 Aug 2020 10:20:04 +0000 (+0200) Subject: A range is not a generally known thing, use "IP addreses or netmasks" more X-Git-Tag: rec-4.4.0-beta1~49^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9784564a097f2df231ddec2f85314ab3d0c78ee1;p=thirdparty%2Fpdns.git A range is not a generally known thing, use "IP addreses or netmasks" more consistently. --- diff --git a/pdns/recursordist/docs/settings.rst b/pdns/recursordist/docs/settings.rst index c547524954..81dc609653 100644 --- a/pdns/recursordist/docs/settings.rst +++ b/pdns/recursordist/docs/settings.rst @@ -16,7 +16,7 @@ As an example: ``allow-from`` -------------- -- IP ranges, separated by commas +- IP addresses or netmasks, separated by commas - Default: 127.0.0.0/8, 10.0.0.0/8, 100.64.0.0/10, 169.254.0.0/16, 192.168.0.0/16, 172.16.0.0/12, ::1/128, fc00::/7, fe80::/10 Netmasks (both IPv4 and IPv6) that are allowed to use the server. @@ -26,6 +26,8 @@ Questions from IP addresses not listed here are ignored and do not get an answer When the Proxy Protocol is enabled (see `proxy-protocol-from`_), the recursor will check the address of the client IP advertised in the Proxy Protocol header instead of the one of the proxy. +Note that specifying an IP address without a netmask uses an implicit netmask of /32 or /128. + .. _setting-allow-from-file: ``allow-from-file`` @@ -1276,7 +1278,7 @@ Whether to compute the latency of responses in protobuf messages using the times ----------------------- .. versionadded:: 4.4.0 -- IP ranges, separated by commas +- IP addresses or netmasks, separated by commas - Default: empty Ranges that are required to send a Proxy Protocol version 2 header in front of UDP and TCP queries, to pass the original source and destination addresses and ports to the recursor, as well as custom values. @@ -1838,7 +1840,7 @@ IP address for the webserver to listen on. ``webserver-allow-from`` ------------------------ -- IP ranges, comma separated +- IP addresses or netmasks, comma separated - Default: 127.0.0.1,::1 .. versionchanged:: 4.1.0 @@ -1923,7 +1925,7 @@ If a PID file should be written to `socket-dir`_ ------------------ .. versionadded:: 4.2.0 -- IP ranges, separated by commas +- IP addresses or netmasks, separated by commas - Default: empty .. note::