summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2019-01-22 11:51:26 +0000
committerDamien Miller <djm@cvs.openbsd.org>2019-01-22 11:51:26 +0000
commit421745c38b13c2b7c2f083815c6a9f4f7c20a448 (patch)
tree64258b4bfc2fdd3a9da36df9491e4174a07146ad /usr.bin
parent1dbcf2376ab3ead1cc6efd6e9f8d4be2b648c5eb (diff)
Mention that configuration for the destination host is not applied
to any ProxyJump/-J hosts. This has confused a few people...
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/ssh.19
-rw-r--r--usr.bin/ssh/ssh_config.510
2 files changed, 15 insertions, 4 deletions
diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1
index 7760c307596..ca4373d11f6 100644
--- a/usr.bin/ssh/ssh.1
+++ b/usr.bin/ssh/ssh.1
@@ -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.1,v 1.399 2018/09/20 06:58:48 jmc Exp $
-.Dd $Mdocdate: September 20 2018 $
+.\" $OpenBSD: ssh.1,v 1.400 2019/01/22 11:51:25 djm Exp $
+.Dd $Mdocdate: January 22 2019 $
.Dt SSH 1
.Os
.Sh NAME
@@ -308,6 +308,11 @@ Multiple jump hops may be specified separated by comma characters.
This is a shortcut to specify a
.Cm ProxyJump
configuration directive.
+Note that configuration directives supplied on the command-line generally
+apply to the destination host and not any specified jump hosts.
+Use
+.Pa ~/.ssh/config
+to specify configuration for jump hosts.
.Pp
.It Fl K
Enables GSSAPI-based authentication and forwarding (delegation) of GSSAPI
diff --git a/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5
index f0ca8f638dd..17023bf8095 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.288 2018/11/23 06:58:28 jmc Exp $
-.Dd $Mdocdate: November 23 2018 $
+.\" $OpenBSD: ssh_config.5,v 1.289 2019/01/22 11:51:25 djm Exp $
+.Dd $Mdocdate: January 22 2019 $
.Dt SSH_CONFIG 5
.Os
.Sh NAME
@@ -1264,6 +1264,12 @@ Note that this option will compete with the
.Cm ProxyCommand
option - whichever is specified first will prevent later instances of the
other from taking effect.
+.Pp
+Note also that the configuration for the destination host (either supplied
+via the command-line or the configuration file) is not generally applied
+to jump hosts.
+.Pa ~/.ssh/config
+should be used if specific configuration is required for jump hosts.
.It Cm ProxyUseFdpass
Specifies that
.Cm ProxyCommand