changeset 5205:cac489d5a8fa draft

privsep: Fix prior for non pledge systems
author Roy Marples <roy@marples.name>
date Sun, 10 May 2020 16:19:09 +0100
parents 47f18579daae
children ec0df63fd3fa
files src/if-bsd.c
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/if-bsd.c	Sun May 10 16:09:54 2020 +0100
+++ b/src/if-bsd.c	Sun May 10 16:19:09 2020 +0100
@@ -366,7 +366,7 @@
 #else
 	struct ifreq ifr = { .ifr_flags = 0 };
 
-	strlcpy(data, ifname, IFNAMSIZ);
+	strlcpy(ifr.ifr_name, ifname, IFNAMSIZ);
 	ifr.ifr_data = data;
 	UNUSED(len);
 	return ioctl(ctx->pf_inet_fd, cmd, &ifr);
@@ -448,9 +448,8 @@
 if_vimaster(struct dhcpcd_ctx *ctx, const char *ifname)
 {
 	int r;
-	struct ifmediareq ifmr;
+	struct ifmediareq ifmr = { .ifm_active = 0 };
 
-	memset(&ifmr, 0, sizeof(ifmr));
 	strlcpy(ifmr.ifm_name, ifname, sizeof(ifmr.ifm_name));
 	r = ioctl(ctx->pf_inet_fd, SIOCGIFMEDIA, &ifmr);
 	if (r == -1)