diff options
| author |   nicm <nicm@openbsd.org> | 2010-02-06 18:47:41 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2010-02-06 18:47:41 +0000 |
| commit | f0437465798acf335716712ebf09ad474f11b998 (patch) | |
| tree | 54328a8e6591b7c87a99bd062287a616ca3ef365 /usr.bin/tmux/server-client.c | |
| parent | Clean up $TMUX parsing, from Micah Cowan, tweaked by me. (diff) | |
| download | wireguard-openbsd-f0437465798acf335716712ebf09ad474f11b998.tar.xz wireguard-openbsd-f0437465798acf335716712ebf09ad474f11b998.zip | |
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 'usr.bin/tmux/server-client.c')
| -rw-r--r-- | usr.bin/tmux/server-client.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/usr.bin/tmux/server-client.c b/usr.bin/tmux/server-client.c index 988e511c8a8..331e4137211 100644 --- a/usr.bin/tmux/server-client.c +++ b/usr.bin/tmux/server-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server-client.c,v 1.28 2010/01/08 09:14:15 nicm Exp $ */ +/* $OpenBSD: server-client.c,v 1.29 2010/02/06 18:47:41 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -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); |