From e85eb8c51eda35d10f7a7c76a7ee18698b320325 Mon Sep 17 00:00:00 2001 From: krw Date: Fri, 23 Jun 2017 16:18:02 +0000 Subject: [PATCH] Oops. Remove extraneous 'return' and some braces from priv_write_resolv_conf() code that was moved into the dispatch loop. --- sbin/dhclient/privsep.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sbin/dhclient/privsep.c b/sbin/dhclient/privsep.c index 23e4ae96f4b..4e5b0ec95c1 100644 --- a/sbin/dhclient/privsep.c +++ b/sbin/dhclient/privsep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: privsep.c,v 1.47 2017/06/23 15:40:56 krw Exp $ */ +/* $OpenBSD: privsep.c,v 1.48 2017/06/23 16:18:02 krw Exp $ */ /* * Copyright (c) 2004 Henning Brauer @@ -90,10 +90,9 @@ dispatch_imsg(struct interface_info *ifi, struct imsgbuf *ibuf) break; case IMSG_WRITE_RESOLV_CONF: - if (imsg.hdr.len <= IMSG_HEADER_SIZE) { + if (imsg.hdr.len <= IMSG_HEADER_SIZE) log_warnx("short IMSG_WRITE_RESOLV_CONF"); - return; - } else + else priv_write_resolv_conf(ifi, imsg.data, imsg.hdr.len - IMSG_HEADER_SIZE); break; -- 2.20.1