diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2009-09-23 15:00:09 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2009-09-23 15:00:09 +0000 |
| commit | 1310ea2729c4f51b9de29c10fb7ea176345cfd44 (patch) | |
| tree | 1208cd7be9b03ee7b14cb3bf5a28273089cc97b7 /tmux.h | |
| parent | 2acf349d4e855eeb8b5d8303cc89aec016210e30 (diff) | |
| download | rtmux-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 'tmux.h')
| -rw-r--r-- | tmux.h | 20 |
1 files changed, 8 insertions, 12 deletions
@@ -1,4 +1,4 @@ -/* $Id: tmux.h,v 1.452 2009-09-23 14:44:02 tcunha Exp $ */ +/* $Id: tmux.h,v 1.453 2009-09-23 15:00:09 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -21,7 +21,7 @@ #include "config.h" -#define PROTOCOL_VERSION 3 +#define PROTOCOL_VERSION 4 #include <sys/param.h> #include <sys/time.h> @@ -302,10 +302,11 @@ enum msgtype { MSG_RESIZE, MSG_SHUTDOWN, MSG_SUSPEND, - MSG_UNLOCK, MSG_VERSION, MSG_WAKEUP, - MSG_ENVIRON + MSG_ENVIRON, + MSG_UNLOCK, + MSG_LOCK }; /* @@ -337,8 +338,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 { @@ -1106,11 +1107,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; @@ -1177,6 +1173,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 *); @@ -1350,7 +1347,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; |