summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh_config.53
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f65b751d4..f545802a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,9 @@
15 - deraadt@cvs.openbsd.org 2003/05/29 16:58:45 15 - deraadt@cvs.openbsd.org 2003/05/29 16:58:45
16 [sshd.c uidswap.c] 16 [sshd.c uidswap.c]
17 seteuid and setegid; markus ok 17 seteuid and setegid; markus ok
18 - jakob@cvs.openbsd.org 2003/06/02 08:31:10
19 [ssh_config.5]
20 VerifyHostKeyDNS is v2 only. ok markus@
18 21
1920030530 2220030530
20 - (dtucker) Add missing semicolon in md5crypt.c, patch from openssh at 23 - (dtucker) Add missing semicolon in md5crypt.c, patch from openssh at
@@ -1641,4 +1644,4 @@
1641 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1644 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1642 ok provos@ 1645 ok provos@
1643 1646
1644$Id: ChangeLog,v 1.2762 2003/06/02 09:09:48 djm Exp $ 1647$Id: ChangeLog,v 1.2763 2003/06/02 09:10:41 djm Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 99050d38a..aa86897a6 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.11 2003/05/20 12:09:32 jmc Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.12 2003/06/02 08:31:10 jakob 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
@@ -638,6 +638,7 @@ Specifies whether to verify the remote key using DNS and SSHFP resource
638records. 638records.
639The default is 639The default is
640.Dq no . 640.Dq no .
641Note that this option applies to protocol version 2 only.
641.It Cm XAuthLocation 642.It Cm XAuthLocation
642Specifies the full pathname of the 643Specifies the full pathname of the
643.Xr xauth 1 644.Xr xauth 1