summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2008-02-10 22:46:22 +1100
committerDamien Miller <djm@mindrot.org>2008-02-10 22:46:22 +1100
commit520e61552a67c95dcf9b423241a0e4454ae911ef (patch)
tree447297218be1a40bbdb2fdf85e1306b557225eca
parent70433b5d7310b03a02424fecf7f40a756fee22ae (diff)
- mcbride@cvs.openbsd.org 2008/02/09 12:15:43
[ssh.1 sshd.8] Document the correct permissions for the ~/.ssh/ directory. ok jmc
-rw-r--r--ChangeLog6
-rw-r--r--ssh.111
-rw-r--r--sshd.811
3 files changed, 23 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 0324cbbbd..c941fb892 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -71,6 +71,10 @@
71 - markus@cvs.openbsd.org 2008/02/04 21:53:00 71 - markus@cvs.openbsd.org 2008/02/04 21:53:00
72 [session.c sftp-server.c sftp.h] 72 [session.c sftp-server.c sftp.h]
73 link sftp-server into sshd; feedback and ok djm@ 73 link sftp-server into sshd; feedback and ok djm@
74 - mcbride@cvs.openbsd.org 2008/02/09 12:15:43
75 [ssh.1 sshd.8]
76 Document the correct permissions for the ~/.ssh/ directory.
77 ok jmc
74 78
7520080119 7920080119
76 - (djm) Silence noice from expr in ssh-copy-id; patch from 80 - (djm) Silence noice from expr in ssh-copy-id; patch from
@@ -3599,4 +3603,4 @@
3599 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3603 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3600 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3604 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3601 3605
3602$Id: ChangeLog,v 1.4834 2008/02/10 11:29:40 djm Exp $ 3606$Id: ChangeLog,v 1.4835 2008/02/10 11:46:22 djm Exp $
diff --git a/ssh.1 b/ssh.1
index 81d404702..35e29cc0c 100644
--- a/ssh.1
+++ b/ssh.1
@@ -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: ssh.1,v 1.271 2008/01/19 19:13:28 djm Exp $ 37.\" $OpenBSD: ssh.1,v 1.272 2008/02/09 12:15:43 mcbride Exp $
38.Dd $Mdocdate: January 19 2008 $ 38.Dd $Mdocdate: February 9 2008 $
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -1245,6 +1245,13 @@ This file is used in exactly the same way as
1245but allows host-based authentication without permitting login with 1245but allows host-based authentication without permitting login with
1246rlogin/rsh. 1246rlogin/rsh.
1247.Pp 1247.Pp
1248.It ~/.ssh/
1249This directory is the default location for all user-specific configuration
1250and authentication information.
1251There is no general requirement to keep the entire contents of this directory
1252secret, but the recommended permissions are read/write/execute for the user,
1253and not accessible by others.
1254.Pp
1248.It ~/.ssh/authorized_keys 1255.It ~/.ssh/authorized_keys
1249Lists the public keys (RSA/DSA) that can be used for logging in as this user. 1256Lists the public keys (RSA/DSA) that can be used for logging in as this user.
1250The format of this file is described in the 1257The format of this file is described in the
diff --git a/sshd.8 b/sshd.8
index 66dc7c0eb..eff66eb0c 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.237 2007/06/07 19:37:34 pvalchev Exp $ 37.\" $OpenBSD: sshd.8,v 1.238 2008/02/09 12:15:43 mcbride Exp $
38.Dd $Mdocdate: June 11 2007 $ 38.Dd $Mdocdate: February 9 2008 $
39.Dt SSHD 8 39.Dt SSHD 8
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -682,6 +682,13 @@ This file is used in exactly the same way as
682but allows host-based authentication without permitting login with 682but allows host-based authentication without permitting login with
683rlogin/rsh. 683rlogin/rsh.
684.Pp 684.Pp
685.It ~/.ssh/
686This directory is the default location for all user-specific configuration
687and authentication information.
688There is no general requirement to keep the entire contents of this directory
689secret, but the recommended permissions are read/write/execute for the user,
690and not accessible by others.
691.Pp
685.It ~/.ssh/authorized_keys 692.It ~/.ssh/authorized_keys
686Lists the public keys (RSA/DSA) that can be used for logging in as this user. 693Lists the public keys (RSA/DSA) that can be used for logging in as this user.
687The format of this file is described above. 694The format of this file is described above.