summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2008-11-03 19:21:21 +1100
committerDamien Miller <djm@mindrot.org>2008-11-03 19:21:21 +1100
commit49b78d4fbc138a252fc083c67d6b3750477d92a1 (patch)
tree4e03220507c035348929ddd75212fdd1ff5d76c4
parentd58f56000c95f2c4eca22b4f89f19c557e23d919 (diff)
- jmc@cvs.openbsd.org 2008/10/03 13:08:12
[sshd.8] do not give an example of how to chmod files: we can presume the user knows that. removes an ambiguity in the permission of authorized_keys; ok deraadt
-rw-r--r--ChangeLog7
-rw-r--r--sshd.86
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index d1061fdbc..5da1ee434 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,11 @@
34 - millert@cvs.openbsd.org 2008/10/02 14:39:35 34 - millert@cvs.openbsd.org 2008/10/02 14:39:35
35 [session.c] 35 [session.c]
36 Convert an unchecked strdup to xstrdup. OK deraadt@ 36 Convert an unchecked strdup to xstrdup. OK deraadt@
37 - jmc@cvs.openbsd.org 2008/10/03 13:08:12
38 [sshd.8]
39 do not give an example of how to chmod files: we can presume the user
40 knows that. removes an ambiguity in the permission of authorized_keys;
41 ok deraadt
37 42
3820080906 4320080906
39 - (dtucker) [config.guess config.sub] Update to latest versions from 44 - (dtucker) [config.guess config.sub] Update to latest versions from
@@ -4768,4 +4773,4 @@
4768 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4773 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4769 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4774 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4770 4775
4771$Id: ChangeLog,v 1.5107 2008/11/03 08:20:49 djm Exp $ 4776$Id: ChangeLog,v 1.5108 2008/11/03 08:21:21 djm Exp $
diff --git a/sshd.8 b/sshd.8
index c4c4181fc..a4b9e90c7 100644
--- a/sshd.8
+++ b/sshd.8
@@ -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.8,v 1.246 2008/07/02 02:24:18 djm Exp $ 37.\" $OpenBSD: sshd.8,v 1.247 2008/10/03 13:08:12 jmc Exp $
38.Dd $Mdocdate: July 2 2008 $ 38.Dd $Mdocdate: October 3 2008 $
39.Dt SSHD 8 39.Dt SSHD 8
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -741,8 +741,6 @@ will not allow it to be used unless the
741.Cm StrictModes 741.Cm StrictModes
742option has been set to 742option has been set to
743.Dq no . 743.Dq no .
744The recommended permissions can be set by executing
745.Dq chmod go-w ~/ ~/.ssh ~/.ssh/authorized_keys .
746.Pp 744.Pp
747.It ~/.ssh/environment 745.It ~/.ssh/environment
748This file is read into the environment at login (if it exists). 746This file is read into the environment at login (if it exists).