summaryrefslogtreecommitdiff
path: root/ssh.1
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-10-17 11:47:23 +1100
committerDamien Miller <djm@mindrot.org>2013-10-17 11:47:23 +1100
commit0faf747e2f77f0f7083bcd59cbed30c4b5448444 (patch)
tree1f1b80f60be01d61f284070affc314d1b97b6b69 /ssh.1
parentd77b81f856e078714ec6b0f86f61c20249b7ead4 (diff)
- djm@cvs.openbsd.org 2013/10/16 02:31:47
[readconf.c readconf.h roaming_client.c ssh.1 ssh.c ssh_config.5] [sshconnect.c sshconnect.h] Implement client-side hostname canonicalisation to allow an explicit search path of domain suffixes to use to convert unqualified host names to fully-qualified ones for host key matching. This is particularly useful for host certificates, which would otherwise need to list unqualified names alongside fully-qualified ones (and this causes a number of problems). "looks fine" markus@
Diffstat (limited to 'ssh.1')
-rw-r--r--ssh.19
1 files changed, 7 insertions, 2 deletions
diff --git a/ssh.1 b/ssh.1
index 8091aecfd..d9e2cb658 100644
--- a/ssh.1
+++ b/ssh.1
@@ -33,8 +33,8 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: ssh.1,v 1.337 2013/10/15 14:10:25 jmc Exp $ 36.\" $OpenBSD: ssh.1,v 1.338 2013/10/16 02:31:46 djm Exp $
37.Dd $Mdocdate: October 15 2013 $ 37.Dd $Mdocdate: October 16 2013 $
38.Dt SSH 1 38.Dt SSH 1
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -417,6 +417,11 @@ For full details of the options listed below, and their possible values, see
417.It AddressFamily 417.It AddressFamily
418.It BatchMode 418.It BatchMode
419.It BindAddress 419.It BindAddress
420.It CanonicalDomains
421.It CanonicaliseFallbackLocal
422.It CanonicaliseHostname
423.It CanonicaliseMaxDots
424.It CanonicalisePermittedCNAMEs
420.It ChallengeResponseAuthentication 425.It ChallengeResponseAuthentication
421.It CheckHostIP 426.It CheckHostIP
422.It Cipher 427.It Cipher