summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2014-02-27 22:47:08 +0000
committerDamien Miller <djm@cvs.openbsd.org>2014-02-27 22:47:08 +0000
commit1c5e54241bd850947135adb2f2d6bd86dd511433 (patch)
tree81a17122374af5a59df9dd041608983931b8a0df /usr.bin
parente5d8214a982bcbc588bdb02810770004a9394e0a (diff)
bz#2184 clarify behaviour of a keyword that appears in multiple
matching Match blocks; ok dtucker@
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/sshd_config.58
1 files changed, 6 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshd_config.5 b/usr.bin/ssh/sshd_config.5
index 2326d0a6bf7..feaea2a8961 100644
--- a/usr.bin/ssh/sshd_config.5
+++ b/usr.bin/ssh/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
@@ -771,6 +771,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