diff options
author | Damien Miller <djm@mindrot.org> | 2006-01-02 23:38:21 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2006-01-02 23:38:21 +1100 |
commit | 14af93ee770f90a15ace4fb4f15506ffee75fe17 (patch) | |
tree | 24feba996d422ff688968fb9b9ad5377c94873ff | |
parent | 48c94abf5b4d262ce4572c5b26d0ffdff8d25a87 (diff) |
- jmc@cvs.openbsd.org 2005/12/31 13:44:04
[ssh.1]
clean up ENVIRONMENT a little;
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh.1 | 24 |
2 files changed, 18 insertions, 11 deletions
@@ -8,6 +8,9 @@ | |||
8 | some rewording done to make the text read better, plus some | 8 | some rewording done to make the text read better, plus some |
9 | improvements from djm; | 9 | improvements from djm; |
10 | ok djm | 10 | ok djm |
11 | - jmc@cvs.openbsd.org 2005/12/31 13:44:04 | ||
12 | [ssh.1] | ||
13 | clean up ENVIRONMENT a little; | ||
11 | 14 | ||
12 | 20060101 | 15 | 20060101 |
13 | - (djm) [Makefile.in configure.ac includes.h misc.c] | 16 | - (djm) [Makefile.in configure.ac includes.h misc.c] |
@@ -3598,4 +3601,4 @@ | |||
3598 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3601 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3599 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3602 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3600 | 3603 | ||
3601 | $Id: ChangeLog,v 1.4064 2006/01/02 12:38:00 djm Exp $ | 3604 | $Id: ChangeLog,v 1.4065 2006/01/02 12:38:21 djm Exp $ |
@@ -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.232 2005/12/31 10:46:17 jmc Exp $ | 37 | .\" $OpenBSD: ssh.1,v 1.233 2005/12/31 13:44:04 jmc Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSH 1 | 39 | .Dt SSH 1 |
40 | .Os | 40 | .Os |
@@ -964,9 +964,12 @@ variable indicates the location of the X11 server. | |||
964 | It is automatically set by | 964 | It is automatically set by |
965 | .Nm | 965 | .Nm |
966 | to point to a value of the form | 966 | to point to a value of the form |
967 | .Dq hostname:n | 967 | .Dq hostname:n , |
968 | where hostname indicates | 968 | where |
969 | the host where the shell runs, and n is an integer \*(Ge 1. | 969 | .Dq hostname |
970 | indicates the host where the shell runs, and | ||
971 | .Sq n | ||
972 | is an integer \*(Ge 1. | ||
970 | .Nm | 973 | .Nm |
971 | uses this special value to forward X11 connections over the secure | 974 | uses this special value to forward X11 connections over the secure |
972 | channel. | 975 | channel. |
@@ -1012,15 +1015,16 @@ may be necessary to redirect the input from | |||
1012 | .Pa /dev/null | 1015 | .Pa /dev/null |
1013 | to make this work.) | 1016 | to make this work.) |
1014 | .It Ev SSH_AUTH_SOCK | 1017 | .It Ev SSH_AUTH_SOCK |
1015 | Identifies the path of a unix-domain socket used to communicate with the | 1018 | Identifies the path of a |
1016 | agent. | 1019 | .Ux Ns -domain |
1020 | socket used to communicate with the agent. | ||
1017 | .It Ev SSH_CONNECTION | 1021 | .It Ev SSH_CONNECTION |
1018 | Identifies the client and server ends of the connection. | 1022 | Identifies the client and server ends of the connection. |
1019 | The variable contains | 1023 | The variable contains |
1020 | four space-separated values: client ip-address, client port number, | 1024 | four space-separated values: client IP address, client port number, |
1021 | server ip-address and server port number. | 1025 | server IP address, and server port number. |
1022 | .It Ev SSH_ORIGINAL_COMMAND | 1026 | .It Ev SSH_ORIGINAL_COMMAND |
1023 | The variable contains the original command line if a forced command | 1027 | This variable contains the original command line if a forced command |
1024 | is executed. | 1028 | is executed. |
1025 | It can be used to extract the original arguments. | 1029 | It can be used to extract the original arguments. |
1026 | .It Ev SSH_TTY | 1030 | .It Ev SSH_TTY |
@@ -1042,7 +1046,7 @@ reads | |||
1042 | .Pa ~/.ssh/environment , | 1046 | .Pa ~/.ssh/environment , |
1043 | and adds lines of the format | 1047 | and adds lines of the format |
1044 | .Dq VARNAME=value | 1048 | .Dq VARNAME=value |
1045 | to the environment if the file exists and if users are allowed to | 1049 | to the environment if the file exists and users are allowed to |
1046 | change their environment. | 1050 | change their environment. |
1047 | For more information, see the | 1051 | For more information, see the |
1048 | .Cm PermitUserEnvironment | 1052 | .Cm PermitUserEnvironment |