Replace the session-keyring option with a configure option

Join the new session keyring when the server starts rather than once the
configuration file has been loaded, and control it at build time with
--enable-keyring, on by default if linux/keyctl.h is found.

Rename keyring_join and keyring_revoke to new_session_keyring and
revoke_session_keyring.
This commit is contained in:
Ilya Priven
2026-10-12 11:26:28 +00:00
parent 3d0839b7a3
commit 90cc41de32
8 changed files with 34 additions and 60 deletions

View File

@@ -220,6 +220,10 @@ server_start(struct tmuxproc *client, uint64_t flags, struct event_base *base,
TAILQ_INIT(&message_log);
gettimeofday(&start_time, NULL);
#ifdef HAVE_KEYCTL
new_session_keyring();
#endif
#ifdef HAVE_SYSTEMD
server_fd = systemd_create_socket(flags, &cause);
#else
@@ -260,7 +264,7 @@ server_start(struct tmuxproc *client, uint64_t flags, struct event_base *base,
job_kill_all();
prompt_save_history();
#ifdef HAVE_KEYCTL
keyring_revoke();
revoke_session_keyring();
#endif
exit(0);