summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-11-17 21:19:49 +1100
committerDamien Miller <djm@mindrot.org>2003-11-17 21:19:49 +1100
commitfe44847cb82d984618176722376f0a491f7b2b29 (patch)
treecef8969c55cb4db0264ff4f981334da000c54f03
parent150b55745b5a0790cfc8d5e6560ab5e7f2f94340 (diff)
- jmc@cvs.openbsd.org 2003/11/12 20:14:51
[ssh_config.5] make verb agree with subject, and kill some whitespace;
-rw-r--r--ChangeLog5
-rw-r--r--ssh_config.58
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index b5667e79a..eb3c71b3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,9 @@
34 - jakob@cvs.openbsd.org 2003/11/12 16:39:58 34 - jakob@cvs.openbsd.org 2003/11/12 16:39:58
35 [dns.c dns.h readconf.c ssh_config.5 sshconnect.c] 35 [dns.c dns.h readconf.c ssh_config.5 sshconnect.c]
36 update SSHFP validation. ok markus@ 36 update SSHFP validation. ok markus@
37 - jmc@cvs.openbsd.org 2003/11/12 20:14:51
38 [ssh_config.5]
39 make verb agree with subject, and kill some whitespace;
37 40
3820031115 4120031115
39 - (dtucker) [regress/agent-ptrace.sh] Test for GDB output from Solaris and 42 - (dtucker) [regress/agent-ptrace.sh] Test for GDB output from Solaris and
@@ -1454,4 +1457,4 @@
1454 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1457 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1455 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1458 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1456 1459
1457$Id: ChangeLog,v 1.3106 2003/11/17 10:19:29 djm Exp $ 1460$Id: ChangeLog,v 1.3107 2003/11/17 10:19:49 djm Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 55ca907eb..8857073a5 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh_config.5,v 1.24 2003/11/12 16:39:58 jakob Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.25 2003/11/12 20:14:51 jmc Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH_CONFIG 5 39.Dt SSH_CONFIG 5
40.Os 40.Os
@@ -644,7 +644,7 @@ Specifies whether to verify the remote key using DNS and SSHFP resource
644records. 644records.
645If this option is set to 645If this option is set to
646.Dq yes , 646.Dq yes ,
647the client will implicitly trust keys that matches a secure fingerprint 647the client will implicitly trust keys that match a secure fingerprint
648from DNS. 648from DNS.
649Insecure fingerprints will be handled as if this option was set to 649Insecure fingerprints will be handled as if this option was set to
650.Dq ask . 650.Dq ask .
@@ -657,8 +657,8 @@ option.
657The argument must be 657The argument must be
658.Dq yes , 658.Dq yes ,
659.Dq no 659.Dq no
660or 660or
661.Dq ask . 661.Dq ask .
662The default is 662The default is
663.Dq no . 663.Dq no .
664Note that this option applies to protocol version 2 only. 664Note that this option applies to protocol version 2 only.