From fa8aa6dfe7e9aaab9f8fa1e3290e7242fc12d83d Mon Sep 17 00:00:00 2001
From: des <des@FreeBSD.org>
Date: Sun, 23 Jun 2002 16:09:08 +0000
Subject: Resolve conflicts.  Known issues:

 - sshd fails to set TERM correctly.
 - privilege separation may break PAM and is currently turned off.
 - man pages have not yet been updated

I will have these issues resolved, and privilege separation turned on by
default, in time for DP2.

Sponsored by:	DARPA, NAI Labs
---
 crypto/openssh/ssh_config | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'crypto/openssh/ssh_config')

diff --git a/crypto/openssh/ssh_config b/crypto/openssh/ssh_config
index 07814b6..ab6206e 100644
--- a/crypto/openssh/ssh_config
+++ b/crypto/openssh/ssh_config
@@ -1,10 +1,10 @@
-#	$OpenBSD: ssh_config,v 1.12 2002/01/16 17:55:33 stevesk Exp $
-# $FreeBSD$
+#	$OpenBSD: ssh_config,v 1.15 2002/06/20 20:03:34 stevesk Exp $
+#	$FreeBSD$
 
-# This is the ssh client system-wide configuration file.  See ssh(1)
-# for more information.  This file provides defaults for users, and
-# the values can be changed in per-user configuration files or on the
-# command line.
+# This is the ssh client system-wide configuration file.  See
+# ssh_config(5) for more information.  This file provides defaults for
+# users, and the values can be changed in per-user configuration files
+# or on the command line.
 
 # Configuration data is parsed as follows:
 #  1. command line options
@@ -19,12 +19,10 @@
 # Host *
 #   ForwardAgent no
 #   ForwardX11 no
-#   RhostsAuthentication yes
-#   RhostsRSAAuthentication yes
+#   RhostsAuthentication no
+#   RhostsRSAAuthentication no
 #   RSAAuthentication yes
 #   PasswordAuthentication yes
-#   FallBackToRsh no
-#   UseRsh no
 #   BatchMode no
 #   CheckHostIP yes
 #   StrictHostKeyChecking ask
-- 
cgit v1.1