upstream commit

Document that the TERM environment variable is not
 subject to SendEnv and AcceptEnv.  bz#2386, based loosely on a patch from
 jjelen at redhat, help and ok jmc@
This commit is contained in:
dtucker@openbsd.org 2015-04-28 10:17:58 +00:00 committed by Damien Miller
parent 88a7c598a9
commit 85b96ef413
2 changed files with 13 additions and 5 deletions

View File

@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: ssh_config.5,v 1.206 2015/03/30 18:28:37 jmc Exp $ .\" $OpenBSD: ssh_config.5,v 1.207 2015/04/28 10:17:58 dtucker Exp $
.Dd $Mdocdate: March 30 2015 $ .Dd $Mdocdate: April 28 2015 $
.Dt SSH_CONFIG 5 .Dt SSH_CONFIG 5
.Os .Os
.Sh NAME .Sh NAME
@ -1333,6 +1333,10 @@ should be sent to the server.
Note that environment passing is only supported for protocol 2. Note that environment passing is only supported for protocol 2.
The server must also support it, and the server must be configured to The server must also support it, and the server must be configured to
accept these environment variables. accept these environment variables.
Note that the
.Ev TERM
enviroment variable is always sent whenever a
pseudo-terminal is requested as it is required by the protocol.
Refer to Refer to
.Cm AcceptEnv .Cm AcceptEnv
in in

View File

@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: sshd_config.5,v 1.196 2015/04/27 21:42:48 djm Exp $ .\" $OpenBSD: sshd_config.5,v 1.197 2015/04/28 10:17:58 dtucker Exp $
.Dd $Mdocdate: April 27 2015 $ .Dd $Mdocdate: April 28 2015 $
.Dt SSHD_CONFIG 5 .Dt SSHD_CONFIG 5
.Os .Os
.Sh NAME .Sh NAME
@ -70,7 +70,11 @@ See
in in
.Xr ssh_config 5 .Xr ssh_config 5
for how to configure the client. for how to configure the client.
Note that environment passing is only supported for protocol 2. Note that environment passing is only supported for protocol 2, and
that the
.Ev TERM
enviroment variable is always sent whenever the client
requests apseudo-terminal is requested as it is required by the protocol.
Variables are specified by name, which may contain the wildcard characters Variables are specified by name, which may contain the wildcard characters
.Ql * .Ql *
and and