summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--sshd_config.57
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 712a9caf5..604b5d773 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,10 @@
43 [ssh_config.5] 43 [ssh_config.5]
44 explain the constraints on LocalCommand some more so people don't 44 explain the constraints on LocalCommand some more so people don't
45 try to abuse it. 45 try to abuse it.
46 - djm@cvs.openbsd.org 2009/11/10 02:58:56
47 [sshd_config.5]
48 clarify that StrictModes does not apply to ChrootDirectory. Permissions
49 and ownership are always checked when chrooting. bz#1532
46 50
4720091226 5120091226
48 - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1 52 - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1
diff --git a/sshd_config.5 b/sshd_config.5
index 7e7c6f855..e54e70079 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.111 2009/10/28 21:45:08 jmc Exp $ 37.\" $OpenBSD: sshd_config.5,v 1.112 2009/11/10 02:58:56 djm Exp $
38.Dd $Mdocdate: October 28 2009 $ 38.Dd $Mdocdate: November 10 2009 $
39.Dt SSHD_CONFIG 5 39.Dt SSHD_CONFIG 5
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -832,6 +832,9 @@ This is normally desirable because novices sometimes accidentally leave their
832directory or files world-writable. 832directory or files world-writable.
833The default is 833The default is
834.Dq yes . 834.Dq yes .
835Note that this does not apply to
836.Cm ChrootDirectory ,
837whose permissions and ownership are checked unconditionally.
835.It Cm Subsystem 838.It Cm Subsystem
836Configures an external subsystem (e.g. file transfer daemon). 839Configures an external subsystem (e.g. file transfer daemon).
837Arguments should be a subsystem name and a command (with optional arguments) 840Arguments should be a subsystem name and a command (with optional arguments)