diff options
| author | Thomas Adam <thomas@xteddy.org> | 2014-04-05 12:36:14 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2014-04-05 12:36:14 +0100 |
| commit | 0c99c7dbff21082a5f0774e6193b9c9b9a160882 (patch) | |
| tree | 852fa9fde3126091fa90ee6604097373076772b1 /server-client.c | |
| parent | 806d5dcb17c26d2abcbf4328a9ec419ada3d4a3f (diff) | |
| parent | acef311fe356f408690e9f94727ed63a934b742f (diff) | |
| download | rtmux-0c99c7dbff21082a5f0774e6193b9c9b9a160882.tar.gz rtmux-0c99c7dbff21082a5f0774e6193b9c9b9a160882.tar.bz2 rtmux-0c99c7dbff21082a5f0774e6193b9c9b9a160882.zip | |
Merge branch 'obsd-master'
Conflicts:
Makefile
tty-keys.c
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/server-client.c b/server-client.c index 98d1e043..2c407b8c 100644 --- a/server-client.c +++ b/server-client.c @@ -113,11 +113,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); @@ -126,8 +123,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); |