summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2008-06-11 09:33:01 +1000
committerDarren Tucker <dtucker@zip.com.au>2008-06-11 09:33:01 +1000
commitc9807e825a83df6d95ae7e0390c34ab71321f30b (patch)
treee27a6a798e161949907530446707dcb0a8ffd360
parent34f49c60fd8f5320ac91f191379adf748405ed9a (diff)
- dtucker@cvs.openbsd.org 2008/06/10 18:21:24
[ssh_config.5] clarify that Host patterns are space-separated. ok deraadt
-rw-r--r--ChangeLog5
-rw-r--r--ssh_config.55
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 53a094a8..5239fd53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,9 @@
- dtucker@cvs.openbsd.org 2008/06/10 15:28:49
[test-exec.sh]
Add quotes
+ - dtucker@cvs.openbsd.org 2008/06/10 18:21:24
+ [ssh_config.5]
+ clarify that Host patterns are space-separated. ok deraadt
- (dtucker) [openbsd-compat/fake-rfc2553.h] Add sin6_scope_id to sockaddr_in6
since the new CIDR code in addmatch.c references it.
- (dtucker) [Makefile.in configure.ac regress/addrmatch.sh] Skip IPv6
@@ -4130,4 +4133,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@
-$Id: ChangeLog,v 1.4960 2008/06/10 19:15:51 dtucker Exp $
+$Id: ChangeLog,v 1.4961 2008/06/10 23:33:01 dtucker Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 17fc0ec6..d6f3fbf8 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,8 +34,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.105 2007/10/29 07:48:19 jmc Exp $
-.Dd $Mdocdate: December 2 2007 $
+.\" $OpenBSD: ssh_config.5,v 1.106 2008/06/10 18:21:24 dtucker Exp $
+.Dd $Mdocdate: June 10 2008 $
.Dt SSH_CONFIG 5
.Os
.Sh NAME
@@ -103,6 +103,7 @@ Restricts the following declarations (up to the next
.Cm Host
keyword) to be only for those hosts that match one of the patterns
given after the keyword.
+If more than one pattern is provided, they should be separated by whitepsace.
A single
.Ql *
as a pattern can be used to provide global