summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--ssh.19
-rw-r--r--sshd.88
3 files changed, 19 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 34fe5f7f6..ab88cfcfa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
5 Change mm_zalloc() sanity checks to be more in line with what 5 Change mm_zalloc() sanity checks to be more in line with what
6 we do in calloc() and add a check to monitor_mm.c. 6 we do in calloc() and add a check to monitor_mm.c.
7 OK provos@ and markus@ 7 OK provos@ and markus@
8 - marc@cvs.openbsd.org 2002/08/02 16:00:07
9 [ssh.1 sshd.8]
10 note that .ssh/environment is only read when
11 allowed (PermitUserEnvironment in sshd_config).
12 OK markus@
8 13
920020813 1420020813
10 - (tim) [configure.ac] Display OpenSSL header/library version. 15 - (tim) [configure.ac] Display OpenSSL header/library version.
@@ -1502,4 +1507,4 @@
1502 - (stevesk) entropy.c: typo in debug message 1507 - (stevesk) entropy.c: typo in debug message
1503 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1508 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1504 1509
1505$Id: ChangeLog,v 1.2415 2002/08/20 18:36:25 mouring Exp $ 1510$Id: ChangeLog,v 1.2416 2002/08/20 18:38:02 mouring Exp $
diff --git a/ssh.1 b/ssh.1
index 1f3efca78..00ebdd4dd 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
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.160 2002/06/22 11:51:39 naddy Exp $ 37.\" $OpenBSD: ssh.1,v 1.161 2002/08/02 16:00:07 marc Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -742,7 +742,12 @@ reads
742.Pa $HOME/.ssh/environment , 742.Pa $HOME/.ssh/environment ,
743and adds lines of the format 743and adds lines of the format
744.Dq VARNAME=value 744.Dq VARNAME=value
745to the environment. 745to the environment if the file exists and if users are allowed to
746change their environment.
747See
748.Cm PermitUserEnvironment
749in
750.Xr sshd_config 5 .
746.Sh FILES 751.Sh FILES
747.Bl -tag -width Ds 752.Bl -tag -width Ds
748.It Pa $HOME/.ssh/known_hosts 753.It Pa $HOME/.ssh/known_hosts
diff --git a/sshd.8 b/sshd.8
index 37a7b58f6..a098b43ca 100644
--- a/sshd.8
+++ b/sshd.8
@@ -34,7 +34,7 @@
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.186 2002/06/22 16:45:29 stevesk Exp $ 37.\" $OpenBSD: sshd.8,v 1.187 2002/08/02 16:00:07 marc Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSHD 8 39.Dt SSHD 8
40.Os 40.Os
@@ -350,7 +350,11 @@ Sets up basic environment.
350.It 350.It
351Reads 351Reads
352.Pa $HOME/.ssh/environment 352.Pa $HOME/.ssh/environment
353if it exists. 353if it exists and users are allowed to change their environment.
354See
355.Cm PermitUserEnvironment
356in
357.Xr sshd_config 5 .
354.It 358.It
355Changes to user's home directory. 359Changes to user's home directory.
356.It 360.It