From a72aae7cd840fb353f0e08054a0336100395aacc Mon Sep 17 00:00:00 2001 From: Florian Obser Date: Thu, 21 Nov 2019 19:27:34 +0000 Subject: We do not send lifetimes or source in DNS proposals. Do not copy them to the main process. --- sbin/slaacd/engine.c | 4 +--- sbin/slaacd/slaacd.h | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'sbin') diff --git a/sbin/slaacd/engine.c b/sbin/slaacd/engine.c index e082a80eb00..a9f38ecb877 100644 --- a/sbin/slaacd/engine.c +++ b/sbin/slaacd/engine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: engine.c,v 1.45 2019/11/20 18:10:12 florian Exp $ */ +/* $OpenBSD: engine.c,v 1.46 2019/11/21 19:27:33 florian Exp $ */ /* * Copyright (c) 2017 Florian Obser @@ -2276,8 +2276,6 @@ compose_rdns_proposal(enum imsg_type type, struct rdns_proposal *rdns_proposal) struct imsg_propose_rdns rdns; rdns.if_index = rdns_proposal->if_index; - memcpy(&rdns.from, &rdns_proposal->from, sizeof(rdns.from)); - rdns.rdns_lifetime = rdns_proposal->rdns_lifetime; rdns.rdns_count = rdns_proposal->rdns_count; memcpy(&rdns.rdns, &rdns_proposal->rdns, sizeof(rdns.rdns)); diff --git a/sbin/slaacd/slaacd.h b/sbin/slaacd/slaacd.h index 3193f1a4f00..78b36aca32d 100644 --- a/sbin/slaacd/slaacd.h +++ b/sbin/slaacd/slaacd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: slaacd.h,v 1.24 2019/11/11 05:48:46 florian Exp $ */ +/* $OpenBSD: slaacd.h,v 1.25 2019/11/21 19:27:33 florian Exp $ */ /* * Copyright (c) 2017 Florian Obser @@ -198,8 +198,6 @@ struct imsg_link_state { struct imsg_propose_rdns { uint32_t if_index; - struct sockaddr_in6 from; - uint32_t rdns_lifetime; int rdns_count; struct sockaddr_in6 rdns[MAX_RDNS_COUNT]; }; -- cgit v1.2.3