diff options
author | Damien Miller <djm@mindrot.org> | 2006-07-24 14:05:08 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2006-07-24 14:05:08 +1000 |
commit | 8c23403b5141b2cc570a8b55805855eea93d875a (patch) | |
tree | 5dd73e5c385b42aba076ec49ba784a775554a5e6 /sshd_config.5 | |
parent | 393821ad720050c014ef2dc62c519f66684c099c (diff) |
- dtucker@cvs.openbsd.org 2006/07/18 08:22:23
[sshd_config.5]
Clarify description of Match, with minor correction from jmc@
Diffstat (limited to 'sshd_config.5')
-rw-r--r-- | sshd_config.5 | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sshd_config.5 b/sshd_config.5 index cbc2176ff..02996a2ed 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.64 2006/07/18 08:03:09 jmc Exp $ | 37 | .\" $OpenBSD: sshd_config.5,v 1.65 2006/07/18 08:22:23 dtucker Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSHD_CONFIG 5 | 39 | .Dt SSHD_CONFIG 5 |
40 | .Os | 40 | .Os |
@@ -465,14 +465,15 @@ The default is: | |||
465 | .Dq hmac-md5,hmac-sha1,hmac-ripemd160,hmac-sha1-96,hmac-md5-96 . | 465 | .Dq hmac-md5,hmac-sha1,hmac-ripemd160,hmac-sha1-96,hmac-md5-96 . |
466 | .It Cm Match | 466 | .It Cm Match |
467 | Introduces a conditional block. | 467 | Introduces a conditional block. |
468 | Keywords on lines following a | 468 | If all of the criteria on the |
469 | .Cm Match | 469 | .Cm Match |
470 | block are only applied if all of the criteria on the | 470 | line are satisfied, the keywords on the following lines override those |
471 | set in the global section of the config file, until either another | ||
471 | .Cm Match | 472 | .Cm Match |
472 | are satisfied. | 473 | line or the end of the file. |
473 | The arguments to | 474 | The arguments to |
474 | .Cm Match | 475 | .Cm Match |
475 | block are one or more criteria-pattern pairs. | 476 | are one or more criteria-pattern pairs. |
476 | The available criteria are | 477 | The available criteria are |
477 | .Cm User , | 478 | .Cm User , |
478 | .Cm Host , | 479 | .Cm Host , |