aboutsummaryrefslogtreecommitdiff
path: root/cmd.c
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2009-09-23 15:00:09 +0000
committerTiago Cunha <tcunha@gmx.com>2009-09-23 15:00:09 +0000
commit1310ea2729c4f51b9de29c10fb7ea176345cfd44 (patch)
tree1208cd7be9b03ee7b14cb3bf5a28273089cc97b7 /cmd.c
parent2acf349d4e855eeb8b5d8303cc89aec016210e30 (diff)
downloadrtmux-1310ea2729c4f51b9de29c10fb7ea176345cfd44.tar.gz
rtmux-1310ea2729c4f51b9de29c10fb7ea176345cfd44.tar.bz2
rtmux-1310ea2729c4f51b9de29c10fb7ea176345cfd44.zip
Sync OpenBSD patchset 347:
Remove the internal tmux locking and instead detach each client and run the command specified by a new option "lock-command" (by default "lock -np") in each client. This means each terminal has to be unlocked individually but simplifies the code and allows the system password to be used to unlock. Note that the set-password command is gone, so it will need to be removed from configuration files, and the -U command line flag has been removed. This is the third protocol version change so again it is best to stop the tmux server before upgrading.
Diffstat (limited to 'cmd.c')
-rw-r--r--cmd.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/cmd.c b/cmd.c
index f30919fe..4bbc0d51 100644
--- a/cmd.c
+++ b/cmd.c
@@ -1,4 +1,4 @@
-/* $Id: cmd.c,v 1.116 2009-09-20 22:20:10 tcunha Exp $ */
+/* $Id: cmd.c,v 1.117 2009-09-23 15:00:08 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -88,7 +88,6 @@ const struct cmd_entry *cmd_table[] = {
&cmd_set_buffer_entry,
&cmd_set_environment_entry,
&cmd_set_option_entry,
- &cmd_set_password_entry,
&cmd_set_window_option_entry,
&cmd_show_buffer_entry,
&cmd_show_environment_entry,
@@ -259,10 +258,6 @@ usage:
int
cmd_exec(struct cmd *cmd, struct cmd_ctx *ctx)
{
- if (server_locked) {
- ctx->error(ctx, "server is locked");
- return (-1);
- }
return (cmd->entry->exec(cmd, ctx));
}