circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity

Userspace doesn't need to use SUN_LEN(): connect() and bind() must accept

Browse Source 
sizeof(struct sockaddr_un), so do the simple, portable thing

ok beck@ deraadt@
This commit is contained in:
guenther
2015-10-11 00:26:23 +00:00
parent 7340d5adfd
commit 241fd72f75
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client.c
View File

@@ -119,7 +119,7 @@ retry:
fatal("socket failed"); fatal("socket failed");
log_debug("trying connect"); log_debug("trying connect");
if (connect(fd, (struct sockaddr *) &sa, SUN_LEN(&sa)) == -1) { if (connect(fd, (struct sockaddr *) &sa, sizeof(sa)) == -1) {
log_debug("connect failed: %s", strerror(errno)); log_debug("connect failed: %s", strerror(errno));
if (errno != ECONNREFUSED && errno != ENOENT) if (errno != ECONNREFUSED && errno != ENOENT)
goto failed; goto failed;

2
server.c
View File

@@ -145,7 +145,7 @@ server_create_socket(void)
return (-1); return (-1);
mask = umask(S_IXUSR|S_IXGRP|S_IRWXO); mask = umask(S_IXUSR|S_IXGRP|S_IRWXO);
if (bind(fd, (struct sockaddr *) &sa, SUN_LEN(&sa)) == -1) if (bind(fd, (struct sockaddr *) &sa, sizeof(sa)) == -1)
return (-1); return (-1);
umask(mask); umask(mask);