summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2009-06-21 17:56:00 +1000
committerDarren Tucker <dtucker@zip.com.au>2009-06-21 17:56:00 +1000
commit00fcd719a5877c6e02a0d6c66bd2de651fee728c (patch)
treef8694aed11189d97e73529e104a4ed5b2e413580
parentac46a915e83c6a69237d683a136bc919049b22d5 (diff)
- stevesk@cvs.openbsd.org 2009/04/17 19:40:17
[sshd_config.5] clarify that even internal-sftp needs /dev/log for logging to work; ok markus@
-rw-r--r--ChangeLog4
-rw-r--r--sshd_config.512
2 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 4d6051053..7a75cdd65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,6 +40,10 @@
40 [session.c] 40 [session.c]
41 use INTERNAL_SFTP_NAME for setproctitle() of in-process sftp-server; 41 use INTERNAL_SFTP_NAME for setproctitle() of in-process sftp-server;
42 ok djm@ markus@ 42 ok djm@ markus@
43 - stevesk@cvs.openbsd.org 2009/04/17 19:40:17
44 [sshd_config.5]
45 clarify that even internal-sftp needs /dev/log for logging to work; ok
46 markus@
43 47
4420090616 4820090616
45 - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t 49 - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t
diff --git a/sshd_config.5 b/sshd_config.5
index 684c1c25e..5c100bdaa 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.103 2009/04/13 19:07:44 stevesk Exp $ 37.\" $OpenBSD: sshd_config.5,v 1.104 2009/04/17 19:40:17 stevesk Exp $
38.Dd $Mdocdate: April 13 2009 $ 38.Dd $Mdocdate: April 17 2009 $
39.Dt SSHD_CONFIG 5 39.Dt SSHD_CONFIG 5
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -213,11 +213,17 @@ and
213.Xr tty 4 213.Xr tty 4
214devices. 214devices.
215For file transfer sessions using 215For file transfer sessions using
216.Dq sftp , 216.Dq sftp
217which do not use logging,
217no additional configuration of the environment is necessary if the 218no additional configuration of the environment is necessary if the
218in-process sftp server is used (see 219in-process sftp server is used (see
219.Cm Subsystem 220.Cm Subsystem
220for details). 221for details).
222sftp sessions which do use logging require
223.Pa /dev/log
224inside the chroot directory (see
225.Xr sftp-server 8
226for details).
221.Pp 227.Pp
222The default is not to 228The default is not to
223.Xr chroot 2 . 229.Xr chroot 2 .