diff options
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/ssh.1 | 9 | ||||
| -rw-r--r-- | usr.bin/ssh/sshd.8 | 8 |
2 files changed, 13 insertions, 4 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 diff --git a/usr.bin/ssh/sshd.8 b/usr.bin/ssh/sshd.8 index 37a7b58f6f3..a098b43ca9d 100644 --- a/usr.bin/ssh/sshd.8 +++ b/usr.bin/ssh/sshd.8 @@ -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: sshd.8,v 1.186 2002/06/22 16:45:29 stevesk Exp $ +.\" $OpenBSD: sshd.8,v 1.187 2002/08/02 16:00:07 marc Exp $ .Dd September 25, 1999 .Dt SSHD 8 .Os @@ -350,7 +350,11 @@ Sets up basic environment. .It Reads .Pa $HOME/.ssh/environment -if it exists. +if it exists and users are allowed to change their environment. +See +.Cm PermitUserEnvironment +in +.Xr sshd_config 5 . .It Changes to user's home directory. .It |