summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2008-07-14 12:09:57 +1000
committerDamien Miller <djm@mindrot.org>2008-07-14 12:09:57 +1000
commit276571c29d0e8a0c0e2d75e18ff57d63eb26f68c (patch)
treedfe53848aa7f9be3b696dc160939df7b405c91c7
parent36d7056f4de36fa40cf9e16d7d21c64ae8763f80 (diff)
- djm@cvs.openbsd.org 2008/07/14 01:55:56
[sftp-server.8] mention requirement for /dev/log inside chroot when using sftp-server with ChrootDirectory
-rw-r--r--ChangeLog6
-rw-r--r--sftp-server.815
2 files changed, 18 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 611e87342..dfc8dc544 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,10 @@
15 increase number of piplelined requests so they properly fill the 15 increase number of piplelined requests so they properly fill the
16 (recently increased) channel window. prompted by rapier AT psc.edu; 16 (recently increased) channel window. prompted by rapier AT psc.edu;
17 ok markus@ 17 ok markus@
18 - djm@cvs.openbsd.org 2008/07/14 01:55:56
19 [sftp-server.8]
20 mention requirement for /dev/log inside chroot when using sftp-server
21 with ChrootDirectory
18 - (djm) [openbsd-compat/bindresvport.c] Rename variables s/sin/in/ to 22 - (djm) [openbsd-compat/bindresvport.c] Rename variables s/sin/in/ to
19 avoid clash with sin(3) function; reported by 23 avoid clash with sin(3) function; reported by
20 cristian.ionescu-idbohrn AT axis.com 24 cristian.ionescu-idbohrn AT axis.com
@@ -4658,4 +4662,4 @@
4658 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4662 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4659 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4663 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4660 4664
4661$Id: ChangeLog,v 1.5081 2008/07/14 02:04:43 djm Exp $ 4665$Id: ChangeLog,v 1.5082 2008/07/14 02:09:57 djm Exp $
diff --git a/sftp-server.8 b/sftp-server.8
index d760974ca..8b7131390 100644
--- a/sftp-server.8
+++ b/sftp-server.8
@@ -1,4 +1,4 @@
1.\" $OpenBSD: sftp-server.8,v 1.12 2007/05/31 19:20:16 jmc Exp $ 1.\" $OpenBSD: sftp-server.8,v 1.13 2008/07/14 01:55:56 djm Exp $
2.\" 2.\"
3.\" Copyright (c) 2000 Markus Friedl. All rights reserved. 3.\" Copyright (c) 2000 Markus Friedl. All rights reserved.
4.\" 4.\"
@@ -22,7 +22,7 @@
22.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 22.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24.\" 24.\"
25.Dd $Mdocdate: May 31 2007 $ 25.Dd $Mdocdate: July 14 2008 $
26.Dt SFTP-SERVER 8 26.Dt SFTP-SERVER 8
27.Os 27.Os
28.Sh NAME 28.Sh NAME
@@ -72,6 +72,17 @@ DEBUG and DEBUG1 are equivalent.
72DEBUG2 and DEBUG3 each specify higher levels of debugging output. 72DEBUG2 and DEBUG3 each specify higher levels of debugging output.
73The default is ERROR. 73The default is ERROR.
74.El 74.El
75.Pp
76For logging to work,
77.Nm
78must be able to access
79.Pa /dev/log .
80Use of
81.Nm
82in a chroot configuation therefore requires that
83.Xr syslogd 8
84establish a logging socket inside the chroot directory.
85.Pp
75.Sh SEE ALSO 86.Sh SEE ALSO
76.Xr sftp 1 , 87.Xr sftp 1 ,
77.Xr ssh 1 , 88.Xr ssh 1 ,