summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--sftp.14
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 3c522ea36..29f4b599a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,12 @@
7 [channels.c channels.h clientloop.c] 7 [channels.c channels.h clientloop.c]
8 add channel output filter interface. 8 add channel output filter interface.
9 ok djm@, suggested by markus@ 9 ok djm@, suggested by markus@
10 - jmc@cvs.openbsd.org 2005/12/30 16:59:00
11 [sftp.1]
12 do not suggest that interactive authentication will work
13 with the -b flag;
14 based on a diff from john l. scarfone;
15 ok djm
10 16
1120051229 1720051229
12 - (tim) [buildpkg.sh.in] grep for $SSHDUID instead of $SSHDGID on /etc/passwd 18 - (tim) [buildpkg.sh.in] grep for $SSHDUID instead of $SSHDGID on /etc/passwd
@@ -3562,4 +3568,4 @@
3562 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3568 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3563 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3569 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3564 3570
3565$Id: ChangeLog,v 1.4054 2005/12/31 05:22:32 djm Exp $ 3571$Id: ChangeLog,v 1.4055 2005/12/31 05:22:55 djm Exp $
diff --git a/sftp.1 b/sftp.1
index c89ffc30f..6b500596c 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: sftp.1,v 1.61 2005/03/01 17:19:35 jmc Exp $ 1.\" $OpenBSD: sftp.1,v 1.62 2005/12/30 16:59:00 jmc Exp $
2.\" 2.\"
3.\" Copyright (c) 2001 Damien Miller. All rights reserved. 3.\" Copyright (c) 2001 Damien Miller. All rights reserved.
4.\" 4.\"
@@ -78,7 +78,7 @@ to start in a remote directory.
78The final usage format allows for automated sessions using the 78The final usage format allows for automated sessions using the
79.Fl b 79.Fl b
80option. 80option.
81In such cases, it is usually necessary to configure public key authentication 81In such cases, it is necessary to configure non-interactive authentication
82to obviate the need to enter a password at connection time (see 82to obviate the need to enter a password at connection time (see
83.Xr sshd 8 83.Xr sshd 8
84and 84and