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

Sync OpenBSD patchset 765:

Browse Source 
Modify the permissions on the socket when adding or removing +x to show
attached sessions, rather than replacing them.
This commit is contained in:
Tiago Cunha 2010-10-09 14:26:29 +00:00
parent 6139fac10d
commit 7874b00d4c
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
server.c
View File

@ -1,4 +1,4 @@
/* $Id: server.c,v 1.243 2010-08-29 14:42:11 tcunha Exp $ */ /* $Id: server.c,v 1.244 2010-10-09 14:26:29 tcunha Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -300,7 +300,8 @@ server_update_socket(void)
struct session *s; struct session *s;
u_int i; u_int i;
static int last = -1; static int last = -1;
int n; int n, mode;
struct stat sb;
n = 0; n = 0;
for (i = 0; i < ARRAY_LENGTH(&sessions); i++) { for (i = 0; i < ARRAY_LENGTH(&sessions); i++) {
@ -313,10 +314,20 @@ server_update_socket(void)
if (n != last) { if (n != last) {
last = n; last = n;
if (n != 0)
chmod(socket_path, S_IRWXU|S_IRWXG); if (stat(socket_path, &sb) != 0)
else return;
chmod(socket_path, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP); mode = sb.st_mode;
if (n != 0) {
if (mode & S_IRUSR)
mode |= S_IXUSR;
if (mode & S_IRGRP)
mode |= S_IXGRP;
if (mode & S_IROTH)
mode |= S_IXOTH;
} else
mode &= ~(S_IXUSR|S_IXGRP|S_IXOTH);
chmod(socket_path, mode);
} }
} }