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 @@ some rewording done to make the text read better, plus some improvements from djm; ok djm + - jmc@cvs.openbsd.org 2005/12/31 13:44:04 + [ssh.1] + clean up ENVIRONMENT a little; 20060101 - (djm) [Makefile.in configure.ac includes.h misc.c] @@ -3598,4 +3601,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.4064 2006/01/02 12:38:00 djm Exp $ +$Id: ChangeLog,v 1.4065 2006/01/02 12:38:21 djm Exp $ @@ -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.232 2005/12/31 10:46:17 jmc Exp $ +.\" $OpenBSD: ssh.1,v 1.233 2005/12/31 13:44:04 jmc Exp $ .Dd September 25, 1999 .Dt SSH 1 .Os @@ -964,9 +964,12 @@ variable indicates the location of the X11 server. It is automatically set by .Nm to point to a value of the form -.Dq hostname:n -where hostname indicates -the host where the shell runs, and n is an integer \*(Ge 1. +.Dq hostname:n , +where +.Dq hostname +indicates the host where the shell runs, and +.Sq n +is an integer \*(Ge 1. .Nm uses this special value to forward X11 connections over the secure channel. @@ -1012,15 +1015,16 @@ may be necessary to redirect the input from .Pa /dev/null to make this work.) .It Ev SSH_AUTH_SOCK -Identifies the path of a unix-domain socket used to communicate with the -agent. +Identifies the path of a +.Ux Ns -domain +socket used to communicate with the agent. .It Ev SSH_CONNECTION Identifies the client and server ends of the connection. The variable contains -four space-separated values: client ip-address, client port number, -server ip-address and server port number. +four space-separated values: client IP address, client port number, +server IP address, and server port number. .It Ev SSH_ORIGINAL_COMMAND -The variable contains the original command line if a forced command +This variable contains the original command line if a forced command is executed. It can be used to extract the original arguments. .It Ev SSH_TTY @@ -1042,7 +1046,7 @@ reads .Pa ~/.ssh/environment , and adds lines of the format .Dq VARNAME=value -to the environment if the file exists and if users are allowed to +to the environment if the file exists and users are allowed to change their environment. For more information, see the .Cm PermitUserEnvironment |