RTM_PROTO3 messages should not trigger a resolv.conf check.
authorkrw <krw@openbsd.org>
Wed, 12 Apr 2017 14:08:15 +0000 (14:08 +0000)
committerkrw <krw@openbsd.org>
Wed, 12 Apr 2017 14:08:15 +0000 (14:08 +0000)
sbin/dhclient/dhclient.c

index 8589f23..4013624 100644 (file)
@@ -1,4 +1,4 @@
-/*     $OpenBSD: dhclient.c,v 1.414 2017/04/11 13:59:27 krw Exp $      */
+/*     $OpenBSD: dhclient.c,v 1.415 2017/04/12 14:08:15 krw Exp $      */
 
 /*
  * Copyright 2004 Henning Brauer <henning@openbsd.org>
@@ -260,13 +260,13 @@ routehandler(struct interface_info *ifi)
                if ((rtm->rtm_flags & RTF_PROTO3) != 0) {
                        if (rtm->rtm_seq == (int32_t)client->xid) {
                                client->flags |= IN_CHARGE;
-                               goto done;
                        } else if ((client->flags & IN_CHARGE) != 0) {
                                rslt = asprintf(&errmsg, "yielding "
                                    "responsibility for %s",
                                    ifi->name);
                                goto die;
                        }
+                       goto done;
                }
                break;
        case RTM_NEWADDR: