summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2008-02-10 22:47:24 +1100
committerDamien Miller <djm@mindrot.org>2008-02-10 22:47:24 +1100
commitcdb6e65175fab4346be5b74b2527e4f28437e5fe (patch)
tree6a7b94d47f477eaa9fa65d71cb5bebef09f09a9d
parent520e61552a67c95dcf9b423241a0e4454ae911ef (diff)
- djm@cvs.openbsd.org 2008/02/10 09:55:37
[sshd_config.5] mantion that "internal-sftp" is useful with ForceCommand too
-rw-r--r--ChangeLog5
-rw-r--r--sshd_config.59
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c941fb892..eb10e1059 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -75,6 +75,9 @@
75 [ssh.1 sshd.8] 75 [ssh.1 sshd.8]
76 Document the correct permissions for the ~/.ssh/ directory. 76 Document the correct permissions for the ~/.ssh/ directory.
77 ok jmc 77 ok jmc
78 - djm@cvs.openbsd.org 2008/02/10 09:55:37
79 [sshd_config.5]
80 mantion that "internal-sftp" is useful with ForceCommand too
78 81
7920080119 8220080119
80 - (djm) Silence noice from expr in ssh-copy-id; patch from 83 - (djm) Silence noice from expr in ssh-copy-id; patch from
@@ -3603,4 +3606,4 @@
3603 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3606 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3604 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3607 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3605 3608
3606$Id: ChangeLog,v 1.4835 2008/02/10 11:46:22 djm Exp $ 3609$Id: ChangeLog,v 1.4836 2008/02/10 11:47:24 djm Exp $
diff --git a/sshd_config.5 b/sshd_config.5
index 6fb93a078..2d9126ee4 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -34,8 +34,8 @@
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: sshd_config.5,v 1.81 2008/02/09 08:04:31 jmc Exp $ 37.\" $OpenBSD: sshd_config.5,v 1.82 2008/02/10 09:55:37 djm Exp $
38.Dd $Mdocdate: February 9 2008 $ 38.Dd $Mdocdate: February 10 2008 $
39.Dt SSHD_CONFIG 5 39.Dt SSHD_CONFIG 5
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -333,6 +333,11 @@ block.
333The command originally supplied by the client is available in the 333The command originally supplied by the client is available in the
334.Ev SSH_ORIGINAL_COMMAND 334.Ev SSH_ORIGINAL_COMMAND
335environment variable. 335environment variable.
336Specifying a command of
337.Dq internal-sftp
338will force the use of an in-process sftp server that requires no support
339files when used with
340.Cm ChrootDirectory .
336.It Cm GatewayPorts 341.It Cm GatewayPorts
337Specifies whether remote hosts are allowed to connect to ports 342Specifies whether remote hosts are allowed to connect to ports
338forwarded for the client. 343forwarded for the client.