diff options
| author | Damien Miller <djm@mindrot.org> | 2014-02-28 10:01:28 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2014-02-28 10:01:28 +1100 |
| commit | fc5d6759aba71eb205b296b5f148010ffc828583 (patch) | |
| tree | 663384246d934c9fe715b3d502e9c3a1e50f7d85 | |
| parent | 172ec7e0af1a5f1d682f6a2dca335c6c186153d5 (diff) | |
| download | openssh-git-fc5d6759aba71eb205b296b5f148010ffc828583.tar.gz | |
- djm@cvs.openbsd.org 2014/02/27 22:47:07
[sshd_config.5]
bz#2184 clarify behaviour of a keyword that appears in multiple
matching Match blocks; ok dtucker@
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | sshd_config.5 | 8 |
2 files changed, 10 insertions, 2 deletions
@@ -7,6 +7,10 @@ - djm@cvs.openbsd.org 2014/02/27 08:25:09 [bufbn.c] off by one in range check + - djm@cvs.openbsd.org 2014/02/27 22:47:07 + [sshd_config.5] + bz#2184 clarify behaviour of a keyword that appears in multiple + matching Match blocks; ok dtucker@ 20140227 - OpenBSD CVS Sync diff --git a/sshd_config.5 b/sshd_config.5 index de330a00..ce71efe3 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.171 2014/01/29 14:04:51 jmc Exp $ -.Dd $Mdocdate: January 29 2014 $ +.\" $OpenBSD: sshd_config.5,v 1.172 2014/02/27 22:47:07 djm Exp $ +.Dd $Mdocdate: February 27 2014 $ .Dt SSHD_CONFIG 5 .Os .Sh NAME @@ -770,6 +770,10 @@ 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 line or the end of the file. +If a keyword appears in multiple +.Cm Match +blocks that are satisified, only the first instance of the keyword is +applied. .Pp The arguments to .Cm Match |