summaryrefslogtreecommitdiffstats
path: root/server-client.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@openbsd.org>2010-02-06 18:47:41 +0000
committerNicholas Marriott <nicm@openbsd.org>2010-02-06 18:47:41 +0000
commit0a86d3579edb44ee559cfe6498f43d6637a08bd9 (patch)
tree366bac0c0ef0bb7c6cd15fcc8e9728027ea97a83 /server-client.c
parent4a5017d1d8a7a42b47433826747e01ba6867ba46 (diff)
Change nested check to compare server socket path rather than just assuming
that if $TMUX is set it is nested. From Micah Cowan.
Diffstat (limited to 'server-client.c')
-rw-r--r--server-client.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/server-client.c b/server-client.c
index 34b99514..03560c1c 100644
--- a/server-client.c
+++ b/server-client.c
@@ -693,17 +693,6 @@ server_client_msg_command(struct client *c, struct msg_command_data *data)
}
cmd_free_argv(argc, argv);
- if (data->pid != -1) {
- TAILQ_FOREACH(cmd, cmdlist, qentry) {
- if (cmd->entry->flags & CMD_CANTNEST) {
- server_client_msg_error(&ctx,
- "sessions should be nested with care. "
- "unset $TMUX to force");
- goto error;
- }
- }
- }
-
if (cmd_list_exec(cmdlist, &ctx) != 1)
server_write_client(c, MSG_EXIT, NULL, 0);
cmd_list_free(cmdlist);