Change terminal-overrides to a server option (now that we have them), it

doesn't make much sense as a session option.
This commit is contained in:
nicm
2014-02-23 00:53:06 +00:00
parent 315d45a0eb
commit f1828921df
8 changed files with 58 additions and 59 deletions

View File

@@ -114,11 +114,8 @@ server_client_create(int fd)
/* Open client terminal if needed. */
int
server_client_open(struct client *c, struct session *s, char **cause)
server_client_open(struct client *c, char **cause)
{
struct options *oo = s != NULL ? &s->options : &global_s_options;
char *overrides;
if (c->flags & CLIENT_CONTROL)
return (0);
@@ -127,8 +124,7 @@ server_client_open(struct client *c, struct session *s, char **cause)
return (-1);
}
overrides = options_get_string(oo, "terminal-overrides");
if (tty_open(&c->tty, overrides, cause) != 0)
if (tty_open(&c->tty, cause) != 0)
return (-1);
return (0);