tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-31 01:35:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

- dtucker@cvs.openbsd.org 2006/07/18 08:22:23

Browse Source 
[sshd_config.5]
     Clarify description of Match, with minor correction from jmc@
This commit is contained in:
Damien Miller 2006-07-24 14:05:08 +10:00
parent 393821ad72
commit 8c23403b51
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -46,6 +46,9 @@
- jmc@cvs.openbsd.org 2006/07/18 08:03:09 - jmc@cvs.openbsd.org 2006/07/18 08:03:09
[ssh-agent.1 sshd_config.5] [ssh-agent.1 sshd_config.5]
mark up angle brackets; mark up angle brackets;
- dtucker@cvs.openbsd.org 2006/07/18 08:22:23
[sshd_config.5]
Clarify description of Match, with minor correction from jmc@
20060713 20060713
- (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h - (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h
@ -4964,4 +4967,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.4418 2006/07/24 04:04:53 djm Exp $ $Id: ChangeLog,v 1.4419 2006/07/24 04:05:08 djm Exp $

11
sshd_config.5
View File

@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: sshd_config.5,v 1.64 2006/07/18 08:03:09 jmc Exp $ .\" $OpenBSD: sshd_config.5,v 1.65 2006/07/18 08:22:23 dtucker Exp $
.Dd September 25, 1999 .Dd September 25, 1999
.Dt SSHD_CONFIG 5 .Dt SSHD_CONFIG 5
.Os .Os
@ -465,14 +465,15 @@ The default is:
.Dq hmac-md5,hmac-sha1,hmac-ripemd160,hmac-sha1-96,hmac-md5-96 . .Dq hmac-md5,hmac-sha1,hmac-ripemd160,hmac-sha1-96,hmac-md5-96 .
.It Cm Match .It Cm Match
Introduces a conditional block. Introduces a conditional block.
Keywords on lines following a If all of the criteria on the
.Cm Match .Cm Match
block are only applied if all of the criteria on the line are satisfied, the keywords on the following lines override those
set in the global section of the config file, until either another
.Cm Match .Cm Match
are satisfied. line or the end of the file.
The arguments to The arguments to
.Cm Match .Cm Match
block are one or more criteria-pattern pairs. are one or more criteria-pattern pairs.
The available criteria are The available criteria are
.Cm User , .Cm User ,
.Cm Host , .Cm Host ,