From: jca@openbsd.org <jca@openbsd.org>
Date: Fri, 12 Aug 2016 19:19:04 +0000 (+0000)
Subject: upstream commit
X-Git-Tag: V_7_4_P1~159
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42d47adc5ad1187f22c726cbc52e71d6b1767ca2;p=thirdparty%2Fopenssh-portable.git

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
---

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 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: sshd_config.5,v 1.227 2016/07/19 12:59:16 jmc Exp $
-.Dd $Mdocdate: July 19 2016 $
+.\" $OpenBSD: sshd_config.5,v 1.228 2016/08/12 19:19:04 jca Exp $
+.Dd $Mdocdate: August 12 2016 $
 .Dt SSHD_CONFIG 5
 .Os
 .Sh NAME
@@ -1074,7 +1074,7 @@ criteria may additionally contain addresses to match in CIDR
 address/masklen format, e.g.\&
 .Dq 192.0.2.0/24
 or
-.Dq 3ffe:ffff::/32 .
+.Dq 2001:db8::/32 .
 Note that the mask length provided must be consistent with the address -
 it is an error to specify a mask length that is too long for the address
 or one with bits set in this host portion of the address.