- marc@cvs.openbsd.org 2002/08/02 16:00:07

     [ssh.1 sshd.8]
     note that .ssh/environment is only read when
     allowed (PermitUserEnvironment in sshd_config).
     OK markus@

diff --git a/ChangeLog b/ChangeLog
index 740ff54c0f8e71f8caf5334e8b335bf25e59014d..b684157fde41276308dcd0afe1e5ec462a40baf0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
      Change mm_zalloc() sanity checks to be more in line with what
      we do in calloc() and add a check to monitor_mm.c.
      OK provos@ and markus@
      Change mm_zalloc() sanity checks to be more in line with what
      we do in calloc() and add a check to monitor_mm.c.
      OK provos@ and markus@

+   - marc@cvs.openbsd.org 2002/08/02 16:00:07
+     [ssh.1 sshd.8]
+     note that .ssh/environment is only read when
+     allowed (PermitUserEnvironment in sshd_config).
+     OK markus@

 
 20020813
  - (tim) [configure.ac] Display OpenSSL header/library version.
 
 20020813
  - (tim) [configure.ac] Display OpenSSL header/library version.

diff --git a/ssh.1 b/ssh.1
index 1f3efca78541df9eb91f4a2f59690f02642a9071..00ebdd4dd6d3b9ef789d2309658bd64b1562a05d 100644 (file)
--- a/ssh.1
+++ b/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.
 .\"
 .\" (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
 .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
 .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
 .Sh FILES
 .Bl -tag -width Ds
 .It Pa $HOME/.ssh/known_hosts

diff --git a/sshd.8 b/sshd.8
index 37a7b58f6f35c71d64f03e5ce03a7608924152d0..a098b43ca9d78d87fe77caeb00b4305d93aa40a4 100644 (file)
--- a/sshd.8
+++ b/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.
 .\"
 .\" (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
 .Dd September 25, 1999
 .Dt SSHD 8
 .Os


@@ -350,7 +350,11 @@ Sets up basic environment.
 .It
 Reads
 .Pa $HOME/.ssh/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
 .It
 Changes to user's home directory.
 .It