summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2015-10-11 02:01:14 +0100
committerThomas Adam <thomas@xteddy.org>2015-10-11 02:01:14 +0100
commitf69e09a67eaecec96e53705d45c18a5f0639e308 (patch)
tree1a2f162a965ad55cd38eb2affd7a42666253ac96
parent5b13dafbab2bc6c3b2aac1af1198df018dd720a1 (diff)
parent241fd72f754388c140036eb1b826a07700f5be3b (diff)
Merge branch 'obsd-master'
-rw-r--r--client.c2
-rw-r--r--server.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/client.c b/client.c
index 970d132e..90e8941d 100644
--- a/client.c
+++ b/client.c
@@ -119,7 +119,7 @@ retry:
fatal("socket failed");
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));
if (errno != ECONNREFUSED && errno != ENOENT)
goto failed;
diff --git a/server.c b/server.c
index ed7c83ec..0d5f40f9 100644
--- a/server.c
+++ b/server.c
@@ -144,7 +144,7 @@ server_create_socket(void)
return (-1);
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);
umask(mask);