From: Roy Marples <roy@marples.name>
Date: Tue, 5 Mar 2019 00:36:48 +0000 (+0000)
Subject: Linux: Fix compile
X-Git-Tag: v8.0.0~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fd0f7f6327f12d8ef934ab8e0914dd1453ee3ab;p=thirdparty%2Fdhcpcd.git

Linux: Fix compile
---

diff --git a/src/if-linux.c b/src/if-linux.c
index 13f58c9b..b912c171 100644
--- a/src/if-linux.c
+++ b/src/if-linux.c
@@ -1314,7 +1314,6 @@ if_initrt(struct dhcpcd_ctx *ctx, rb_tree_t *kroutes, int af)
 	    .rt.rtm_family = (unsigned char)af,
 	};
 
-	rt_headclear(&ctx->kroutes, af);
 	return send_netlink(ctx, kroutes, NETLINK_ROUTE, &nlm.hdr, &_if_initrt);
 }
 
diff --git a/src/route.c b/src/route.c
index 4d924f4b..c6f42e63 100644
--- a/src/route.c
+++ b/src/route.c
@@ -444,7 +444,7 @@ rt_add(rb_tree_t *kroutes, struct rt *nrt, struct rt *ort)
 		if (ort != NULL) {
 			if (if_route(RTM_DELETE, ort) == -1 && errno != ESRCH)
 				logerr("if_route (DEL)");
-			rt_kfree(ort);
+			memcpy(ort, nrt, sizeof(*ort));
 		}
 		return true;
 	}