[master] Finished merge of trac3920 (data_ defined twice)

diff --cc ChangeLog
index 185b1b951b4f6be445845ceb368e08ae1e6a72b6,0e179ff4cb2d0ae30405293eb269a1e36caf941a..696a132818f06cea9ee113de5fd6c8db8d3db6db
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,62 -1,3 +1,67 @@@
++979.  [bug]           fdupont
++      Fixed two cases of public variables in a base class being
++      hidden by variables in a derived class.
++      (Trac #3920, git xxx)
++
 +978.  [func]          tmark
 +      DHCPv4, DHCPv6, and DHCP_DDNS now all create PID files upon
 +      startup.  The PID file pathname is formed from:
 +              <localstatedir>/<conf name>.<binary-name>.pid
 +      If a server's PID file exists and contains the PID of a
 +      live process, it will emit a log message and exit.
 +      (Trac #3769, git cdce632add025aaadbcdc89078f5bd3e19cfb5ca)
 +
 +977.  [doc]           tomek
 +      Frequently Asked Questions section added to the Kea User's Guide.
 +      (Trac #3873, #3847, git 95683c9d3c3dd7024269df1904b6cbe5817741a2)
 +
 +976.  [build]         tomek
 +      Included missing Doxygen documentation images in the tarball.
 +      (Trac #3928, git 2fb63a18897b93b12a5fc4635d4ac29e0bf82841)
 +
 +975.  [doc]           marcin
 +      Updated the list of standard DHCPv4 options in the User's Guide
 +      with the information of whether they are returned by the server
 +      even when they are not requested.
 +      (Trac #3578, git b361b28ce53729a5f2d59f79670a36cf1a4a0352)
 +
 +974.  [bug]*          marcin
 +      Corrected invalid format of the DHCPv4 option 5 (name-servers).
 +      The corrected format comprises a list of IPv4 addresses,
 +      rather than a single IPv4 address.
 +      (Trac #3887, git 54d1dbe6138e74c5efacfbaf85b77c87aea9ddf1)
 +
 +973.  [doc]           marcin
 +      Added new section to the User's Guide to describe the issues
 +      with unicast responses to the DHCPINFORM messages when ARP
 +      traffic is blocked.
 +      (Trac #3740, git 22bcb060ceca544dfa1779815321155668bf19dc)
 +
 +972.  [doc]           marcin
 +      Updated sections of User's Guide concerning creation of
 +      the option definitions and Vendor Specific Information
 +      options for both DHCPv4 and DHCPv6.
 +      (Trac #3846, git 6aebe0867ca9cf6fb09a289d80051125db7fa34b)
 +
 +971.  [bug]           marcin
 +      DHCPv6 server extends the lifetime of the client's lease
 +      in the database when the client sends the Request message.
 +      This prevents premature lease expiration before the client
 +      renews the lease, according to the timers and lifetimes
 +      returned by the server.
 +      (Trac #3913, git 1d64829a3f1a8288dc833ed388d9ffc9fe4cf491)
 +
 +970.  [bug]           fdupont
 +      Refactored some code to suppress cppcheck warnings.
 +      (Trac #3919, git 26be6ac4cefde012ca8ef12607b6beaadca13eed)
 +
 +969.  [func]          tomek
 +      KEA_SOCKET_TEST_DIR environment variable can be used to specify
 +      the directory for opening Unix sockets during tests. That may
 +      be used to avoid path length limitations when running unit-tests
 +      in deeply nested directories.
 +      (Trac #3918, git 9cfd502e8d4605eaf34f8744f90272dc3e8a3e34)
 +
  968.  [func]          fdupont
        Changed all occurrences of unlink() to the more portable remove()
        to avoid problems on operating systems where the former is not

diff --cc src/bin/d2/d_controller.cc
Simple merge

diff --cc src/bin/d2/d_controller.h
Simple merge

diff --cc src/lib/dhcp/pkt4.cc
index d88894463f6f7adb5a1bbc22325d7e8e387cd664,1a406f87c98f24f0965fe7c751e8a20e02af0598..44a96ca53cdfa551ce9ef1f72df6abfbad51bc56
--- 1/src/lib/dhcp/pkt4.cc
--- 2/src/lib/dhcp/pkt4.cc
+++ b/src/lib/dhcp/pkt4.cc
@@@ -74,16 -74,7 +74,9 @@@ Pkt4::Pkt4(const uint8_t* data, size_t 
          isc_throw(OutOfRange, "Truncated DHCPv4 packet (len=" << len
                    << ") received, at least " << DHCPV4_PKT_HDR_LEN
                    << " is expected.");
- 
-     } else if (data == NULL) {
-         isc_throw(InvalidParameter, "data buffer passed to Pkt4 is NULL");
      }
- 
-     data_.resize(len);
-     memcpy(&data_[0], data, len);
- 
 +    memset(sname_, 0, MAX_SNAME_LEN);
 +    memset(file_, 0, MAX_FILE_LEN);
  }
  
  size_t