diff options
author | jca@openbsd.org <jca@openbsd.org> | 2016-08-12 19:19:04 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-08-14 11:19:14 +1000 |
commit | 42d47adc5ad1187f22c726cbc52e71d6b1767ca2 (patch) | |
tree | d95e04acb95d3b73032d76946701ec35f2fdb74e /sshd_config.5 | |
parent | b61f53c0c3b43c28e013d3b3696d64d1c0204821 (diff) |
upstream commit
Use 2001:db8::/32, the official IPv6 subnet for
configuration examples.
This makes the IPv6 example consistent with IPv4, and removes a dubious
mention of a 6bone subnet.
ok sthen@ millert@
Upstream-ID: b027f3d0e0073419a132fd1bf002e8089b233634
Diffstat (limited to 'sshd_config.5')
-rw-r--r-- | sshd_config.5 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sshd_config.5 b/sshd_config.5 index 1bc26ec4d..b70c31307 100644 --- a/sshd_config.5 +++ b/sshd_config.5 | |||
@@ -33,8 +33,8 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: sshd_config.5,v 1.227 2016/07/19 12:59:16 jmc Exp $ | 36 | .\" $OpenBSD: sshd_config.5,v 1.228 2016/08/12 19:19:04 jca Exp $ |
37 | .Dd $Mdocdate: July 19 2016 $ | 37 | .Dd $Mdocdate: August 12 2016 $ |
38 | .Dt SSHD_CONFIG 5 | 38 | .Dt SSHD_CONFIG 5 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -1074,7 +1074,7 @@ criteria may additionally contain addresses to match in CIDR | |||
1074 | address/masklen format, e.g.\& | 1074 | address/masklen format, e.g.\& |
1075 | .Dq 192.0.2.0/24 | 1075 | .Dq 192.0.2.0/24 |
1076 | or | 1076 | or |
1077 | .Dq 3ffe:ffff::/32 . | 1077 | .Dq 2001:db8::/32 . |
1078 | Note that the mask length provided must be consistent with the address - | 1078 | Note that the mask length provided must be consistent with the address - |
1079 | it is an error to specify a mask length that is too long for the address | 1079 | it is an error to specify a mask length that is too long for the address |
1080 | or one with bits set in this host portion of the address. | 1080 | or one with bits set in this host portion of the address. |