diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2009-09-23 06:18:49 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2009-09-23 06:18:49 +0000 |
| commit | c5c58d8fcaaa66d223a253ba004b44f0a7006dff (patch) | |
| tree | 4498bb829e4ede704e7c1febd870b850686a3086 /usr.bin/tmux/tmux.h | |
| parent | f0935dc4d22d17994911925fa31450d1e56b9ed1 (diff) | |
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/tmux.h')
| -rw-r--r-- | usr.bin/tmux/tmux.h | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h index acdbffaeada..0fef42c52b9 100644 --- a/usr.bin/tmux/tmux.h +++ b/usr.bin/tmux/tmux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.h,v 1.114 2009/09/23 06:12:58 nicm Exp $ */ +/* $OpenBSD: tmux.h,v 1.115 2009/09/23 06:18:48 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -19,7 +19,7 @@ #ifndef TMUX_H #define TMUX_H -#define PROTOCOL_VERSION 3 +#define PROTOCOL_VERSION 4 #include <sys/param.h> #include <sys/time.h> @@ -304,10 +304,11 @@ enum msgtype { MSG_RESIZE, MSG_SHUTDOWN, MSG_SUSPEND, - MSG_UNLOCK, MSG_VERSION, MSG_WAKEUP, - MSG_ENVIRON + MSG_ENVIRON, + MSG_UNLOCK, + MSG_LOCK }; /* @@ -339,8 +340,8 @@ struct msg_identify_data { int flags; }; -struct msg_unlock_data { - char pass[PASS_MAX]; +struct msg_lock_data { + char cmd[COMMAND_LENGTH]; }; struct msg_environ_data { @@ -1108,11 +1109,6 @@ extern struct options global_s_options; extern struct options global_w_options; extern struct environ global_environ; extern char *cfg_file; -extern int server_locked; -extern struct passwd *server_locked_pw; -extern u_int password_failures; -extern time_t password_backoff; -extern char *server_password; extern time_t server_activity; extern int debug_level; extern int be_quiet; @@ -1179,6 +1175,7 @@ void environ_unset(struct environ *, const char *); void environ_update(const char *, struct environ *, struct environ *); /* tty.c */ +void tty_raw(struct tty *, const char *); u_char tty_get_acs(struct tty *, u_char); void tty_attributes(struct tty *, const struct grid_cell *); void tty_reset(struct tty *); @@ -1352,7 +1349,6 @@ extern const struct cmd_entry cmd_server_info_entry; extern const struct cmd_entry cmd_set_buffer_entry; extern const struct cmd_entry cmd_set_environment_entry; extern const struct cmd_entry cmd_set_option_entry; -extern const struct cmd_entry cmd_set_password_entry; extern const struct cmd_entry cmd_set_window_option_entry; extern const struct cmd_entry cmd_show_buffer_entry; extern const struct cmd_entry cmd_show_environment_entry; |