diff options
| author | Jakob Schlyter <jakob@cvs.openbsd.org> | 2008-07-09 19:02:53 +0000 |
|---|---|---|
| committer | Jakob Schlyter <jakob@cvs.openbsd.org> | 2008-07-09 19:02:53 +0000 |
| commit | a782231a2edf859eaeab735c2e30ae93acc83cd7 (patch) | |
| tree | 8e563f9110ae796e715d5525a359fc4d4c81d9e6 /usr.sbin/bind/doc | |
| parent | ef3e0b7330680c3b86240d29d91cdef77656bb36 (diff) | |
merge and resolve conflicts introduced by 9.4.2-P1
Diffstat (limited to 'usr.sbin/bind/doc')
| -rw-r--r-- | usr.sbin/bind/doc/arm/Bv9ARM-book.xml | 12 | ||||
| -rw-r--r-- | usr.sbin/bind/doc/arm/Bv9ARM.ch06.html | 18 |
2 files changed, 23 insertions, 7 deletions
diff --git a/usr.sbin/bind/doc/arm/Bv9ARM-book.xml b/usr.sbin/bind/doc/arm/Bv9ARM-book.xml index f033cd9ca8c..47573adf218 100644 --- a/usr.sbin/bind/doc/arm/Bv9ARM-book.xml +++ b/usr.sbin/bind/doc/arm/Bv9ARM-book.xml @@ -18,7 +18,7 @@ - PERFORMANCE OF THIS SOFTWARE. --> -<!-- File: $ISC: Bv9ARM-book.xml,v 1.241.18.82 2007/09/26 03:28:27 marka Exp $ --> +<!-- File: $ISC: Bv9ARM-book.xml,v 1.241.18.82.8.1 2008/05/22 21:28:04 each Exp $ --> <book xmlns:xi="http://www.w3.org/2001/XInclude"> <title>BIND 9 Administrator Reference Manual</title> @@ -6067,7 +6067,15 @@ listen-on-v6 port 1234 { !2001:db8::/32; any; }; a wildcard IP address (<command>INADDR_ANY</command>) will be used. If <command>port</command> is <command>*</command> or is omitted, - a random unprivileged port will be used. The <command>avoid-v4-udp-ports</command> + a random unprivileged port number is picked up and will be + used for each query. + It is generally strongly discouraged to + specify a particular port for the + <command>query-source</command> or + <command>query-source-v6</command> options; + it implicitly disables the use of randomized port numbers + and leads to insecure operation. + The <command>avoid-v4-udp-ports</command> and <command>avoid-v6-udp-ports</command> options can be used to prevent named from selecting certain ports. The defaults are: diff --git a/usr.sbin/bind/doc/arm/Bv9ARM.ch06.html b/usr.sbin/bind/doc/arm/Bv9ARM.ch06.html index ef243d58d67..65f71cd5083 100644 --- a/usr.sbin/bind/doc/arm/Bv9ARM.ch06.html +++ b/usr.sbin/bind/doc/arm/Bv9ARM.ch06.html @@ -14,7 +14,7 @@ - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - PERFORMANCE OF THIS SOFTWARE. --> -<!-- $ISC: Bv9ARM.ch06.html,v 1.82.18.73 2007/10/31 01:35:58 marka Exp $ --> +<!-- $ISC: Bv9ARM.ch06.html,v 1.82.18.73.8.1 2008/05/27 22:07:34 each Exp $ --> <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> @@ -3078,10 +3078,18 @@ listen-on-v6 port 1234 { !2001:db8::/32; any; }; a wildcard IP address (<span><strong class="command">INADDR_ANY</strong></span>) will be used. If <span><strong class="command">port</strong></span> is <span><strong class="command">*</strong></span> or is omitted, - a random unprivileged port will be used. The <span><strong class="command">avoid-v4-udp-ports</strong></span> - and <span><strong class="command">avoid-v6-udp-ports</strong></span> options can be used - to prevent named - from selecting certain ports. The defaults are: + a random unprivileged port number is picked up and will be + used for each query. + It is generally strongly discouraged to + specify a particular port for the + <span><strong class="command">query-source</strong></span> or + <span><strong class="command">query-source-v6</strong></span> + options; it implicitly disables the use of randomized port numbers + and leads to insecure operation. + The <span><strong class="command">avoid-v4-udp-ports</strong></span> + and <span><strong class="command">avoid-v6-udp-ports</strong></span> options can be used + to prevent named + from selecting certain ports. The defaults are: </p> <pre class="programlisting">query-source address * port *; query-source-v6 address * port *; |