From 6a2a400f7a64d0dee83a1a32e7022445548ff348 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Tue, 10 Jun 2008 23:03:04 +1000 Subject: - jmc@cvs.openbsd.org 2008/06/10 07:12:00 [sshd_config.5] tweak previous; --- ChangeLog | 5 ++++- sshd_config.5 | 9 +++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3c2cc2168..c470c4002 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,9 @@ -T causes sshd to write its effective configuration to stdout and exit. -C causes any relevant Match rules to be applied before output. The combination allows tesing of the parser and config files. ok deraadt djm + - jmc@cvs.openbsd.org 2008/06/10 07:12:00 + [sshd_config.5] + tweak previous; 20080609 - (dtucker) OpenBSD CVS Sync @@ -4104,4 +4107,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.4951 2008/06/10 13:01:51 dtucker Exp $ +$Id: ChangeLog,v 1.4952 2008/06/10 13:03:04 dtucker Exp $ diff --git a/sshd_config.5 b/sshd_config.5 index 43e5c8522..ea6523584 100644 --- a/sshd_config.5 +++ b/sshd_config.5 @@ -34,7 +34,7 @@ .\" (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.92 2008/06/10 04:17:46 djm Exp $ +.\" $OpenBSD: sshd_config.5,v 1.93 2008/06/10 07:12:00 jmc Exp $ .Dd $Mdocdate: June 10 2008 $ .Dt SSHD_CONFIG 5 .Os @@ -576,16 +576,17 @@ section of The patterns in an .Cm Address criteria may additionally contain addresses to match in CIDR -address/masklen format, e.g. +address/masklen format, e.g.\& .Dq 192.0.2.0/24 or .Dq 3ffe:ffff::/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. For example, +or one with bits set in this host portion of the address. +For example, .Dq 192.0.2.0/33 and -.Dq 192.0.2.0/8 +.Dq 192.0.2.0/8 respectively. .Pp Only a subset of keywords may be used on the lines following a -- cgit v1.2.3