diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2010-02-08 18:25:04 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2010-02-08 18:25:04 +0000 |
| commit | 9b57743cca71a7b2313a8d4f41558e8ec0404d9b (patch) | |
| tree | c09bf235911cf2026c62b31fd7ed868d03c6c5f5 /server-client.c | |
| parent | ac8aa0bc0f80a2121a7d799a56a0d3ce4bf435b4 (diff) | |
| download | rtmux-9b57743cca71a7b2313a8d4f41558e8ec0404d9b.tar.gz rtmux-9b57743cca71a7b2313a8d4f41558e8ec0404d9b.tar.bz2 rtmux-9b57743cca71a7b2313a8d4f41558e8ec0404d9b.zip | |
Sync OpenBSD patchset 638:
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.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/server-client.c b/server-client.c index 883d47fc..ff633d0b 100644 --- a/server-client.c +++ b/server-client.c @@ -1,4 +1,4 @@ -/* $Id: server-client.c,v 1.29 2010-01-08 16:35:38 tcunha Exp $ */ +/* $Id: server-client.c,v 1.30 2010-02-08 18:25:04 tcunha Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -692,17 +692,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); |