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@

diff --git a/ssh_config.5 b/ssh_config.5
index 22082049a3e260fc4009432c43d891bdf8f9d712..3048119151eadd516d4046cd4100d7186a01b4f4 100644 (file)
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,8 +33,8 @@
 .\" (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_config.5,v 1.206 2015/03/30 18:28:37 jmc Exp $
-.Dd $Mdocdate: March 30 2015 $
+.\" $OpenBSD: ssh_config.5,v 1.207 2015/04/28 10:17:58 dtucker Exp $
+.Dd $Mdocdate: April 28 2015 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -1333,6 +1333,10 @@ should be sent to the server.
 Note that environment passing is only supported for protocol 2.
 The server must also support it, and the server must be configured to
 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
 .Cm AcceptEnv
 in

diff --git a/sshd_config.5 b/sshd_config.5
index d3148c2c945edf445fa1af5b217f80d46db7792e..9d7a8e8071a0e3dd668bee25b01fadb5a3188f2e 100644 (file)
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -33,8 +33,8 @@
 .\" (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_config.5,v 1.196 2015/04/27 21:42:48 djm Exp $
-.Dd $Mdocdate: April 27 2015 $
+.\" $OpenBSD: sshd_config.5,v 1.197 2015/04/28 10:17:58 dtucker Exp $
+.Dd $Mdocdate: April 28 2015 $
 .Dt SSHD_CONFIG 5
 .Os
 .Sh NAME
@@ -70,7 +70,11 @@ See
 in
 .Xr ssh_config 5
 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
 .Ql *
 and