diff options
| author | Damien Miller <djm@mindrot.org> | 2014-07-30 12:33:20 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2014-07-30 12:33:20 +1000 |
| commit | 426117b2e965e43f47015942b5be8dd88fe74b88 (patch) | |
| tree | 73487762ff2b620f0b161cc60ce85af1de0a02a9 | |
| parent | f497794b6962eaf802ab4ac2a7b22ae591cca1d5 (diff) | |
| download | openssh-git-426117b2e965e43f47015942b5be8dd88fe74b88.tar.gz | |
- schwarze@cvs.openbsd.org 2014/07/28 15:40:08
[sftp-server.8 sshd_config.5]
some systems no longer need /dev/log;
issue noticed by jirib;
ok deraadt
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sftp-server.8 | 10 | ||||
| -rw-r--r-- | sshd_config.5 | 8 |
3 files changed, 14 insertions, 9 deletions
@@ -9,6 +9,11 @@ left in memory after they have been expired or deleted in some cases (but note that ssh-agent is setgid so you would still need root to access them). Pointed out by Kevin Burns, ok deraadt + - schwarze@cvs.openbsd.org 2014/07/28 15:40:08 + [sftp-server.8 sshd_config.5] + some systems no longer need /dev/log; + issue noticed by jirib; + ok deraadt 20140725 - (djm) [regress/multiplex.sh] restore incorrectly deleted line; diff --git a/sftp-server.8 b/sftp-server.8 index 1e0b277b..75d8d8d5 100644 --- a/sftp-server.8 +++ b/sftp-server.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sftp-server.8,v 1.25 2013/10/14 14:18:56 jmc Exp $ +.\" $OpenBSD: sftp-server.8,v 1.26 2014/07/28 15:40:08 schwarze Exp $ .\" .\" Copyright (c) 2000 Markus Friedl. All rights reserved. .\" @@ -22,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: October 14 2013 $ +.Dd $Mdocdate: July 28 2014 $ .Dt SFTP-SERVER 8 .Os .Sh NAME @@ -140,11 +140,11 @@ to be applied to newly-created files and directories, instead of the user's default mask. .El .Pp -For logging to work, +On some systems, .Nm must be able to access -.Pa /dev/log . -Use of +.Pa /dev/log +for logging to work, and use of .Nm in a chroot configuration therefore requires that .Xr syslogd 8 diff --git a/sshd_config.5 b/sshd_config.5 index f9208485..6766b57f 100644 --- a/sshd_config.5 +++ b/sshd_config.5 @@ -33,8 +33,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: sshd_config.5,v 1.175 2014/07/15 15:54:14 millert Exp $ -.Dd $Mdocdate: July 15 2014 $ +.\" $OpenBSD: sshd_config.5,v 1.176 2014/07/28 15:40:08 schwarze Exp $ +.Dd $Mdocdate: July 28 2014 $ .Dt SSHD_CONFIG 5 .Os .Sh NAME @@ -344,9 +344,9 @@ For file transfer sessions using .Dq sftp , no additional configuration of the environment is necessary if the in-process sftp server is used, -though sessions which use logging do require +though sessions which use logging may require .Pa /dev/log -inside the chroot directory (see +inside the chroot directory on some operating systems (see .Xr sftp-server 8 for details). .Pp |