]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
Fix writing interfaces to control socket.
authorRoy Marples <roy@marples.name>
Sun, 4 May 2014 22:48:43 +0000 (22:48 +0000)
committerRoy Marples <roy@marples.name>
Sun, 4 May 2014 22:48:43 +0000 (22:48 +0000)
dhcpcd.c
script.c

index b318cc3666aa07ccba9c61d67fdab9ca4a6d5119..cc916ccf3e641a7c0231682c065ca8140877652c 100644 (file)
--- 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)
index 4fefd63f635a0878b752a6004c00a62c9587e5c3..ca8a455cc8548747bca86a32a7b54c4acf1c2a32 100644 (file)
--- 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);