circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-24 10:08:48 +00:00
Code Issues Projects Releases Wiki Activity

Do not attempt to connect to the socket as a client if systemd is active, from

Browse Source 
Julien Moutinho in GitHub issue 3345.
This commit is contained in:
Nicholas Marriott 2022-10-18 15:58:06 +01:00
parent 934f357149
commit 5ce34add77
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client.c
View File

@ -284,6 +284,12 @@ client_main(struct event_base *base, int argc, char **argv, uint64_t flags,
log_debug("flags are %#llx", (unsigned long long)client_flags); log_debug("flags are %#llx", (unsigned long long)client_flags);
/* Initialize the client socket and start the server. */ /* Initialize the client socket and start the server. */
#ifdef HAVE_SYSTEMD
if (systemd_activated()) {
/* socket-based activation, do not even try to be a client. */
fd = server_start(client_proc, flags, base, 0, NULL);
} else
#endif
fd = client_connect(base, socket_path, client_flags); fd = client_connect(base, socket_path, client_flags);
if (fd == -1) { if (fd == -1) {
if (errno == ECONNREFUSED) { if (errno == ECONNREFUSED) {

1
compat.h
View File

@ -423,6 +423,7 @@ void *recallocarray(void *, size_t, size_t, size_t);
#ifdef HAVE_SYSTEMD #ifdef HAVE_SYSTEMD
/* systemd.c */ /* systemd.c */
int systemd_activated(void);
int systemd_create_socket(int, char **); int systemd_create_socket(int, char **);
#endif #endif

6
compat/systemd.c
View File

@ -25,6 +25,12 @@
#include "tmux.h" #include "tmux.h"
int
systemd_activated(void)
{
return (sd_listen_fds(0) >= 1);
}
int int
systemd_create_socket(int flags, char **cause) systemd_create_socket(int flags, char **cause)
{ {