v/tmate-ssh-server
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate-ssh-server.git synced 2020-11-18 19:53:51 -08:00
Code Issues Releases Wiki Activity

Sync OpenBSD patchset 292:

Browse Source 
Add some other obvious variables to update-environment (WINDOWID SSH_ASKPASS
SSH_AUTH_SOCK SSH_AGENT_PID SSH_CONNECTION) so they are updated in the session
environment on new/attach.
This commit is contained in:
Tiago Cunha 2009-08-24 16:35:24 +00:00
parent a3799e0350
commit d5bc78d98b
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tmux.1
View File

@ -1,4 +1,4 @@
.\" $Id: tmux.1,v 1.156 2009-08-20 11:53:27 tcunha Exp $ .\" $Id: tmux.1,v 1.157 2009-08-24 16:35:24 tcunha Exp $
.\" .\"
.\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
.\" .\"
@ -14,7 +14,7 @@
.\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING .\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\" .\"
.Dd $Mdocdate: August 19 2009 $ .Dd $Mdocdate: August 23 2009 $
.Dt TMUX 1 .Dt TMUX 1
.Os .Os
.Sh NAME .Sh NAME
@ -1343,7 +1343,7 @@ was given to the
.Ic set-environment .Ic set-environment
command). command).
The default is The default is
.Ev DISPLAY . "DISPLAY WINDOWID SSH_ASKPASS SSH_AUTH_SOCK SSH_AGENT_PID SSH_CONNECTION".
.It Xo Ic visual-activity .It Xo Ic visual-activity
.Op Ic on | off .Op Ic on | off
.Xc .Xc

5
tmux.c
View File

@ -1,4 +1,4 @@
/* $Id: tmux.c,v 1.163 2009-08-16 19:20:37 tcunha Exp $ */ /* $Id: tmux.c,v 1.164 2009-08-24 16:35:24 tcunha Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -390,7 +390,8 @@ main(int argc, char **argv)
options_set_number(&global_s_options, "status-utf8", 0); options_set_number(&global_s_options, "status-utf8", 0);
options_set_string(&global_s_options, options_set_string(&global_s_options,
"terminal-overrides", "*88col*:colors=88,*256col*:colors=256"); "terminal-overrides", "*88col*:colors=88,*256col*:colors=256");
options_set_string(&global_s_options, "update-environment", "DISPLAY"); options_set_string(&global_s_options, "update-environment", "DISPLAY "
"WINDOWID SSH_ASKPASS SSH_AUTH_SOCK SSH_AGENT_PID SSH_CONNECTION");
options_set_number(&global_s_options, "visual-activity", 0); options_set_number(&global_s_options, "visual-activity", 0);
options_set_number(&global_s_options, "visual-bell", 0); options_set_number(&global_s_options, "visual-bell", 0);
options_set_number(&global_s_options, "visual-content", 0); options_set_number(&global_s_options, "visual-content", 0);