diff options
| author |   krw <krw@openbsd.org> | 2017-06-23 16:18:02 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2017-06-23 16:18:02 +0000 |
| commit | e85eb8c51eda35d10f7a7c76a7ee18698b320325 (patch) | |
| tree | 51000b194415b1101f8439ae7e7e0dda6911d882 | |
| parent | Use a const char * for "/etc/resolv.conf.tail" instead of repeating the (diff) | |
| download | wireguard-openbsd-e85eb8c51eda35d10f7a7c76a7ee18698b320325.tar.xz wireguard-openbsd-e85eb8c51eda35d10f7a7c76a7ee18698b320325.zip | |
Oops. Remove extraneous 'return' and some braces from
priv_write_resolv_conf() code that was moved into the
dispatch loop.
| -rw-r--r-- | sbin/dhclient/privsep.c | 7 |
1 files 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 <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; |