summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/ssh.1
diff options
context:
space:
mode:
authorMarco S Hyman <marc@cvs.openbsd.org>2002-08-02 16:00:08 +0000
committerMarco S Hyman <marc@cvs.openbsd.org>2002-08-02 16:00:08 +0000
commita408a8552e051923f5d58590f9babd6375099c5f (patch)
treeac36e825f1f40a48e5c70071db4d1157fb662cf5 /usr.bin/ssh/ssh.1
parent00795ba1dbecae1566b3c4be1cf26a171ce3c930 (diff)
note that .ssh/environment is only read when
allowed (PermitUserEnvironment in sshd_config). OK markus@
Diffstat (limited to 'usr.bin/ssh/ssh.1')
-rw-r--r--usr.bin/ssh/ssh.19
1 files changed, 7 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1
index 1f3efca7854..00ebdd4dd6d 100644
--- a/usr.bin/ssh/ssh.1
+++ b/usr.bin/ssh/ssh.1
@@ -34,7 +34,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.
.\"
-.\" $OpenBSD: ssh.1,v 1.160 2002/06/22 11:51:39 naddy Exp $
+.\" $OpenBSD: ssh.1,v 1.161 2002/08/02 16:00:07 marc Exp $
.Dd September 25, 1999
.Dt SSH 1
.Os
@@ -742,7 +742,12 @@ reads
.Pa $HOME/.ssh/environment ,
and adds lines of the format
.Dq VARNAME=value
-to the environment.
+to the environment if the file exists and if users are allowed to
+change their environment.
+See
+.Cm PermitUserEnvironment
+in
+.Xr sshd_config 5 .
.Sh FILES
.Bl -tag -width Ds
.It Pa $HOME/.ssh/known_hosts