From: Tomek Mrugalski <tomasz@isc.org>
Date: Sun, 1 Nov 2015 03:36:26 +0000 (+0900)
Subject: Merge remote-tracking branch 'origin/trac4110' into hackathon94
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=140a95d4c0eb21e826297dbbc7bbe0ffe0f8b41e;p=thirdparty%2Fkea.git

Merge remote-tracking branch 'origin/trac4110' into hackathon94
---

140a95d4c0eb21e826297dbbc7bbe0ffe0f8b41e
diff --cc src/lib/dhcpsrv/subnet_selector.h
index b848f360ba,81d6687864..368aa4ce92
--- a/src/lib/dhcpsrv/subnet_selector.h
+++ b/src/lib/dhcpsrv/subnet_selector.h
@@@ -68,10 -68,10 +71,11 @@@ struct SubnetSelector 
            option_select_(asiolink::IOAddress("0.0.0.0")),
            interface_id_(),
            first_relay_linkaddr_(asiolink::IOAddress("::")),
+           dhcp4o6_(false),
            local_address_(asiolink::IOAddress("0.0.0.0")),
            remote_address_(asiolink::IOAddress("0.0.0.0")),
 -          client_classes_(), iface_name_(std::string()) {
 +          client_classes_(), iface_name_(std::string()),
 +          dhcp4o6_(false) {
      }
  };