diff options
| author | Thomas Adam <thomas@xteddy.org> | 2020-03-17 12:01:28 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2020-03-17 12:01:28 +0000 |
| commit | 0610f66fa9c8e5ac46e796a2dbc89bb1b369d84f (patch) | |
| tree | 5a1203bc453a07be05a2c652e635570adb8ee672 /server-client.c | |
| parent | 71eb965dd9ef1e511dfb6d2b24196cca550e1284 (diff) | |
| parent | 115bb33257ece9eec1c890cc04683227678a895f (diff) | |
| download | rtmux-0610f66fa9c8e5ac46e796a2dbc89bb1b369d84f.tar.gz rtmux-0610f66fa9c8e5ac46e796a2dbc89bb1b369d84f.tar.bz2 rtmux-0610f66fa9c8e5ac46e796a2dbc89bb1b369d84f.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/server-client.c b/server-client.c index 17a1c9de..fd31eeee 100644 --- a/server-client.c +++ b/server-client.c @@ -398,6 +398,8 @@ server_client_exec(struct client *c, const char *cmd) shell = options_get_string(s->options, "default-shell"); else shell = options_get_string(global_s_options, "default-shell"); + if (!checkshell(shell)) + shell = _PATH_BSHELL; shellsize = strlen(shell) + 1; msg = xmalloc(cmdsize + shellsize); @@ -2011,7 +2013,7 @@ server_client_dispatch_shell(struct client *c) const char *shell; shell = options_get_string(global_s_options, "default-shell"); - if (*shell == '\0' || areshell(shell)) + if (!checkshell(shell)) shell = _PATH_BSHELL; proc_send(c->peer, MSG_SHELL, -1, shell, strlen(shell) + 1); |