summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sshd_config.59
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 @@
18 -T causes sshd to write its effective configuration to stdout and exit. 18 -T causes sshd to write its effective configuration to stdout and exit.
19 -C causes any relevant Match rules to be applied before output. The 19 -C causes any relevant Match rules to be applied before output. The
20 combination allows tesing of the parser and config files. ok deraadt djm 20 combination allows tesing of the parser and config files. ok deraadt djm
21 - jmc@cvs.openbsd.org 2008/06/10 07:12:00
22 [sshd_config.5]
23 tweak previous;
21 24
2220080609 2520080609
23 - (dtucker) OpenBSD CVS Sync 26 - (dtucker) OpenBSD CVS Sync
@@ -4104,4 +4107,4 @@
4104 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4107 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4105 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4108 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4106 4109
4107$Id: ChangeLog,v 1.4951 2008/06/10 13:01:51 dtucker Exp $ 4110$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 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: sshd_config.5,v 1.92 2008/06/10 04:17:46 djm Exp $ 37.\" $OpenBSD: sshd_config.5,v 1.93 2008/06/10 07:12:00 jmc Exp $
38.Dd $Mdocdate: June 10 2008 $ 38.Dd $Mdocdate: June 10 2008 $
39.Dt SSHD_CONFIG 5 39.Dt SSHD_CONFIG 5
40.Os 40.Os
@@ -576,16 +576,17 @@ section of
576The patterns in an 576The patterns in an
577.Cm Address 577.Cm Address
578criteria may additionally contain addresses to match in CIDR 578criteria may additionally contain addresses to match in CIDR
579address/masklen format, e.g. 579address/masklen format, e.g.\&
580.Dq 192.0.2.0/24 580.Dq 192.0.2.0/24
581or 581or
582.Dq 3ffe:ffff::/32 . 582.Dq 3ffe:ffff::/32 .
583Note that the mask length provided must be consistent with the address - 583Note that the mask length provided must be consistent with the address -
584it is an error to specify a mask length that is too long for the address 584it is an error to specify a mask length that is too long for the address
585or one with bits set in this host portion of the address. For example, 585or one with bits set in this host portion of the address.
586For example,
586.Dq 192.0.2.0/33 587.Dq 192.0.2.0/33
587and 588and
588.Dq 192.0.2.0/8 589.Dq 192.0.2.0/8
589respectively. 590respectively.
590.Pp 591.Pp
591Only a subset of keywords may be used on the lines following a 592Only a subset of keywords may be used on the lines following a