summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sftp-server.810
-rw-r--r--sshd_config.58
3 files changed, 14 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index f6ed38812..5f086f76e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,11 @@
9 left in memory after they have been expired or deleted in some cases 9 left in memory after they have been expired or deleted in some cases
10 (but note that ssh-agent is setgid so you would still need root to 10 (but note that ssh-agent is setgid so you would still need root to
11 access them). Pointed out by Kevin Burns, ok deraadt 11 access them). Pointed out by Kevin Burns, ok deraadt
12 - schwarze@cvs.openbsd.org 2014/07/28 15:40:08
13 [sftp-server.8 sshd_config.5]
14 some systems no longer need /dev/log;
15 issue noticed by jirib;
16 ok deraadt
12 17
1320140725 1820140725
14 - (djm) [regress/multiplex.sh] restore incorrectly deleted line; 19 - (djm) [regress/multiplex.sh] restore incorrectly deleted line;
diff --git a/sftp-server.8 b/sftp-server.8
index 1e0b277b4..75d8d8d53 100644
--- a/sftp-server.8
+++ b/sftp-server.8
@@ -1,4 +1,4 @@
1.\" $OpenBSD: sftp-server.8,v 1.25 2013/10/14 14:18:56 jmc Exp $ 1.\" $OpenBSD: sftp-server.8,v 1.26 2014/07/28 15:40:08 schwarze 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: October 14 2013 $ 25.Dd $Mdocdate: July 28 2014 $
26.Dt SFTP-SERVER 8 26.Dt SFTP-SERVER 8
27.Os 27.Os
28.Sh NAME 28.Sh NAME
@@ -140,11 +140,11 @@ to be applied to newly-created files and directories, instead of the
140user's default mask. 140user's default mask.
141.El 141.El
142.Pp 142.Pp
143For logging to work, 143On some systems,
144.Nm 144.Nm
145must be able to access 145must be able to access
146.Pa /dev/log . 146.Pa /dev/log
147Use of 147for logging to work, and use of
148.Nm 148.Nm
149in a chroot configuration therefore requires that 149in a chroot configuration therefore requires that
150.Xr syslogd 8 150.Xr syslogd 8
diff --git a/sshd_config.5 b/sshd_config.5
index f92084857..6766b57fc 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -33,8 +33,8 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: sshd_config.5,v 1.175 2014/07/15 15:54:14 millert Exp $ 36.\" $OpenBSD: sshd_config.5,v 1.176 2014/07/28 15:40:08 schwarze Exp $
37.Dd $Mdocdate: July 15 2014 $ 37.Dd $Mdocdate: July 28 2014 $
38.Dt SSHD_CONFIG 5 38.Dt SSHD_CONFIG 5
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -344,9 +344,9 @@ For file transfer sessions using
344.Dq sftp , 344.Dq sftp ,
345no additional configuration of the environment is necessary if the 345no additional configuration of the environment is necessary if the
346in-process sftp server is used, 346in-process sftp server is used,
347though sessions which use logging do require 347though sessions which use logging may require
348.Pa /dev/log 348.Pa /dev/log
349inside the chroot directory (see 349inside the chroot directory on some operating systems (see
350.Xr sftp-server 8 350.Xr sftp-server 8
351for details). 351for details).
352.Pp 352.Pp