From: Roy Marples <roy@marples.name>
Date: Sun, 4 May 2014 22:48:43 +0000 (+0000)
Subject: Fix writing interfaces to control socket.
X-Git-Tag: v6.4.0~66
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e61b2a429f4d54e184b8ac251b90af99da92e78c;p=thirdparty%2Fdhcpcd.git

Fix writing interfaces to control socket.
---

diff --git a/dhcpcd.c b/dhcpcd.c
index b318cc36..cc916ccf 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -998,8 +998,8 @@ dhcpcd_handleargs(struct dhcpcd_ctx *ctx, struct fd_list *fd,
 					if (ipv6nd_has_ra(ifp))
 						len++;
 				}
-				if (write(fd->fd, &len, sizeof(len) !=
-				    sizeof(len)))
+				if (write(fd->fd, &len, sizeof(len)) !=
+				    sizeof(len))
 					return -1;
 				TAILQ_FOREACH(ifp, ctx->ifaces, next) {
 					if (send_interface(fd->fd, ifp) == -1)
diff --git a/script.c b/script.c
index 4fefd63f..ca8a455c 100644
--- a/script.c
+++ b/script.c
@@ -506,7 +506,7 @@ send_interface1(int fd, const struct interface *iface, const char *reason)
 	if ((ssize_t)elen == -1)
 		return -1;
 	iov[0].iov_base = &elen;
-	iov[0].iov_len = sizeof(ssize_t);
+	iov[0].iov_len = sizeof(elen);
 	iov[1].iov_base = s;
 	iov[1].iov_len = elen;
 	retval = writev(fd, iov, 2);