summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh_config.54
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0dfc4bebc..45c1ba5e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
13 [ssh.1 ssh_config.5] 13 [ssh.1 ssh_config.5]
14 document strict permission checks on ~/.ssh/config; prompted by, 14 document strict permission checks on ~/.ssh/config; prompted by,
15 with & ok jmc@ 15 with & ok jmc@
16 - jmc@cvs.openbsd.org 2004/04/19 16:12:14
17 [ssh_config.5]
18 kill whitespace at eol;
16 - (djm) [openbsd-compat/sys-queue.h] Sync with OpenBSD, needed for above change 19 - (djm) [openbsd-compat/sys-queue.h] Sync with OpenBSD, needed for above change
17 20
1820040419 2120040419
@@ -1018,4 +1021,4 @@
1018 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1021 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1019 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1022 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1020 1023
1021$Id: ChangeLog,v 1.3325 2004/04/20 10:12:53 djm Exp $ 1024$Id: ChangeLog,v 1.3326 2004/04/20 10:13:32 djm Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 75637e316..df479c63a 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.30 2004/04/19 13:02:40 djm Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.31 2004/04/19 16:12:14 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
@@ -410,7 +410,7 @@ identities will be tried in sequence.
410Specifies that 410Specifies that
411.Nm ssh 411.Nm ssh
412should only use the authentication identity files configured in the 412should only use the authentication identity files configured in the
413.Nm 413.Nm
414files, 414files,
415even if the 415even if the
416.Nm ssh-agent 416.Nm ssh-agent