summaryrefslogtreecommitdiff
path: root/usr.bin/ssh
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2017-10-18 02:49:45 +0000
committerDamien Miller <djm@cvs.openbsd.org>2017-10-18 02:49:45 +0000
commite896864539237f765ae9617958ace6938cd9a840 (patch)
tree0a260901f07e0725bd44324119efd8ce33e0694f /usr.bin/ssh
parentdf40889f135cc2cb5f4baca47cff8010e0eba8ea (diff)
In the description of pattern-lists, clarify negated matches by
explicitly stating that a negated match will never yield a positive result, and that at least one positive term in the pattern-list must match. bz#1918
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r--usr.bin/ssh/ssh_config.517
1 files changed, 15 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5
index eae42760774..01acd428603 100644
--- a/usr.bin/ssh/ssh_config.5
+++ b/usr.bin/ssh/ssh_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: ssh_config.5,v 1.257 2017/10/05 12:56:50 jmc Exp $
-.Dd $Mdocdate: October 5 2017 $
+.\" $OpenBSD: ssh_config.5,v 1.258 2017/10/18 02:49:44 djm Exp $
+.Dd $Mdocdate: October 18 2017 $
.Dt SSH_CONFIG 5
.Os
.Sh NAME
@@ -1674,6 +1674,19 @@ pool,
the following entry (in authorized_keys) could be used:
.Pp
.Dl from=\&"!*.dialup.example.com,*.example.com\&"
+.Pp
+Note that a negated match will never produce a positive result by itself.
+For example, attempting to match
+.Qq host3
+against the following pattern-list will fail:
+.Pp
+.Dl from=\&"!host1,!host2\&"
+.Pp
+The solution here is to include a term that will yield a positive match,
+such as a wildcard:
+.Pp
+.Dl from=\&"!host1,!host2,*\&"
+.Pp
.Sh TOKENS
Arguments to some keywords can make use of tokens,
which are expanded at runtime: