diff options
author | Colin Watson <cjwatson@debian.org> | 2013-05-07 10:06:42 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-05-07 10:06:42 +0100 |
commit | ecebda56da46a03dafff923d91c382f31faa9eec (patch) | |
tree | 449614b6c06a2622c74a609b31fcc46c60037c56 /sftp-server.0 | |
parent | c6a2c0334e45419875687d250aed9bea78480f2e (diff) | |
parent | ffc06452028ba78cd693d4ed43df8b60a10d6163 (diff) |
merge 6.2p1; reorder additions to monitor.h for easier merging in future
Diffstat (limited to 'sftp-server.0')
-rw-r--r-- | sftp-server.0 | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sftp-server.0 b/sftp-server.0 index 340929d75..6beddcc13 100644 --- a/sftp-server.0 +++ b/sftp-server.0 | |||
@@ -4,7 +4,8 @@ NAME | |||
4 | sftp-server - SFTP server subsystem | 4 | sftp-server - SFTP server subsystem |
5 | 5 | ||
6 | SYNOPSIS | 6 | SYNOPSIS |
7 | sftp-server [-ehR] [-f log_facility] [-l log_level] [-u umask] | 7 | sftp-server [-ehR] [-d start_directory] [-f log_facility] [-l log_level] |
8 | [-u umask] | ||
8 | 9 | ||
9 | DESCRIPTION | 10 | DESCRIPTION |
10 | sftp-server is a program that speaks the server side of SFTP protocol to | 11 | sftp-server is a program that speaks the server side of SFTP protocol to |
@@ -17,6 +18,15 @@ DESCRIPTION | |||
17 | 18 | ||
18 | Valid options are: | 19 | Valid options are: |
19 | 20 | ||
21 | -d start_directory | ||
22 | specifies an alternate starting directory for users. The | ||
23 | pathname may contain the following tokens that are expanded at | ||
24 | runtime: %% is replaced by a literal '%', %h is replaced by the | ||
25 | home directory of the user being authenticated, and %u is | ||
26 | replaced by the username of that user. The default is to use the | ||
27 | user's home directory. This option is useful in conjunction with | ||
28 | the sshd_config(5) ChrootDirectory option. | ||
29 | |||
20 | -e Causes sftp-server to print logging information to stderr instead | 30 | -e Causes sftp-server to print logging information to stderr instead |
21 | of syslog for debugging. | 31 | of syslog for debugging. |
22 | 32 | ||
@@ -61,4 +71,4 @@ HISTORY | |||
61 | AUTHORS | 71 | AUTHORS |
62 | Markus Friedl <markus@openbsd.org> | 72 | Markus Friedl <markus@openbsd.org> |
63 | 73 | ||
64 | OpenBSD 5.2 January 9, 2010 OpenBSD 5.2 | 74 | OpenBSD 5.3 January 4, 2013 OpenBSD 5.3 |