From: krw <krw@openbsd.org>
Date: Fri, 23 Jun 2017 16:18:02 +0000 (+0000)
Subject: Oops. Remove extraneous 'return' and some braces from
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=e85eb8c51eda35d10f7a7c76a7ee18698b320325;p=openbsd

Oops. Remove extraneous 'return' and some braces from
priv_write_resolv_conf() code that was moved into the
dispatch loop.
---

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 <henning@openbsd.org>
@@ -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;