summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/cmd.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2009-09-23 06:18:47 +0000
committernicm <nicm@openbsd.org>2009-09-23 06:18:47 +0000
commit1c5425bdd24ac7c21379105499a9670138555d99 (patch)
tree3837fee2a7e136bdde425b4b70d80b34b49a11cb /usr.bin/tmux/cmd.c
parentTrim some code by moving the ioctl(TIOCGWINSZ) after SIGWINCH from the client (diff)
downloadwireguard-openbsd-1c5425bdd24ac7c21379105499a9670138555d99.tar.xz
wireguard-openbsd-1c5425bdd24ac7c21379105499a9670138555d99.zip
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 'usr.bin/tmux/cmd.c')
-rw-r--r--usr.bin/tmux/cmd.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/usr.bin/tmux/cmd.c b/usr.bin/tmux/cmd.c
index f4025d037d4..6c10d355729 100644
--- a/usr.bin/tmux/cmd.c
+++ b/usr.bin/tmux/cmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd.c,v 1.17 2009/09/20 19:15:01 nicm Exp $ */
+/* $OpenBSD: cmd.c,v 1.18 2009/09/23 06:18:47 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -89,7 +89,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,
@@ -260,10 +259,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));
}