summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--ssh.16
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 09d24ce1f..9530ef55f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -60,6 +60,9 @@
60 - schwarze@cvs.openbsd.org 2013/07/16 00:07:52 60 - schwarze@cvs.openbsd.org 2013/07/16 00:07:52
61 [scp.1 sftp-server.8 ssh-keyscan.1 ssh-keysign.8 ssh-pkcs11-helper.8] 61 [scp.1 sftp-server.8 ssh-keyscan.1 ssh-keysign.8 ssh-pkcs11-helper.8]
62 use .Mt for email addresses; from Jan Stary <hans at stare dot cz>; ok jmc@ 62 use .Mt for email addresses; from Jan Stary <hans at stare dot cz>; ok jmc@
63 - djm@cvs.openbsd.org 2013/07/18 01:12:26
64 [ssh.1]
65 be more exact wrt perms for ~/.ssh/config; bz#2078
63 66
6420130702 6720130702
65 - (dtucker) [contrib/cygwin/README contrib/cygwin/ssh-host-config 68 - (dtucker) [contrib/cygwin/README contrib/cygwin/ssh-host-config
diff --git a/ssh.1 b/ssh.1
index 3cb4254eb..62292cc09 100644
--- a/ssh.1
+++ b/ssh.1
@@ -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: ssh.1,v 1.333 2013/06/27 14:05:37 jmc Exp $ 36.\" $OpenBSD: ssh.1,v 1.334 2013/07/18 01:12:26 djm Exp $
37.Dd $Mdocdate: June 27 2013 $ 37.Dd $Mdocdate: July 18 2013 $
38.Dt SSH 1 38.Dt SSH 1
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -1337,7 +1337,7 @@ This is the per-user configuration file.
1337The file format and configuration options are described in 1337The file format and configuration options are described in
1338.Xr ssh_config 5 . 1338.Xr ssh_config 5 .
1339Because of the potential for abuse, this file must have strict permissions: 1339Because of the potential for abuse, this file must have strict permissions:
1340read/write for the user, and not accessible by others. 1340read/write for the user, and not writable by others.
1341.Pp 1341.Pp
1342.It Pa ~/.ssh/environment 1342.It Pa ~/.ssh/environment
1343Contains additional definitions for environment variables; see 1343Contains additional definitions for environment variables; see