Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2018-04-23 17:02:32 +01:00
4 changed files with 15 additions and 14 deletions

View File

@ -513,8 +513,8 @@ const struct options_table_entry options_table[] = {
{ .name = "update-environment",
.type = OPTIONS_TABLE_ARRAY,
.scope = OPTIONS_TABLE_SESSION,
.default_str = "DISPLAY SSH_ASKPASS SSH_AUTH_SOCK SSH_AGENT_PID "
"SSH_CONNECTION WINDOWID XAUTHORITY"
.default_str = "DISPLAY KRB5CCNAME SSH_ASKPASS SSH_AUTH_SOCK "
"SSH_AGENT_PID SSH_CONNECTION WINDOWID XAUTHORITY"
},
{ .name = "visual-activity",