summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorguenther <guenther>2015-10-11 00:26:23 +0000
committerguenther <guenther>2015-10-11 00:26:23 +0000
commit241fd72f754388c140036eb1b826a07700f5be3b (patch)
tree741fc24a3bdd4b07ade21e464c3b68f8f0bd5120
parent7340d5adfdc8cc6d845a373f3e0d59bfd10a45d1 (diff)
Userspace doesn't need to use SUN_LEN(): connect() and bind() must accept
sizeof(struct sockaddr_un), so do the simple, portable thing ok beck@ deraadt@
-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 da7bb314..2eb48a49 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 045daead..fd77ff38 100644
--- a/server.c
+++ b/server.c
@@ -145,7 +145,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);