[master] Merge branch 'trac3034'

b10-dhcp6 parses and uses ddns-dhcp configuration

diff --cc src/bin/dhcp6/dhcp6_srv.cc
index 523305a2c85569d64246217210393737983ed3c5,0b8e9c4b063dcf156f00f2f2549407c50982f3ba..aed4db4b14c6387c6e804e8abcd14f82ab2ba25d
--- 1/src/bin/dhcp6/dhcp6_srv.cc
--- 2/src/bin/dhcp6/dhcp6_srv.cc
+++ b/src/bin/dhcp6/dhcp6_srv.cc
@@@ -100,33 -98,6 +100,8 @@@ Dhcp6Hooks Hooks
  namespace isc {
  namespace dhcp {
  
- namespace {
- 
- // The following constants describe server's behavior with respect to the
- // DHCPv6 Client FQDN Option sent by a client. They will be removed
- // when DDNS parameters for DHCPv6 are implemented with the ticket #3034.
- 
- // Enable AAAA RR update delegation to the client (Disabled).
- const bool FQDN_ALLOW_CLIENT_UPDATE = false;
- // Globally enable updates (Enabled).
- const bool FQDN_ENABLE_UPDATE = true;
- // The partial name generated for the client if empty name has been
- // supplied.
- const char* FQDN_GENERATED_PARTIAL_NAME = "myhost";
- // Do update, even if client requested no updates with N flag (Disabled).
- const bool FQDN_OVERRIDE_NO_UPDATE = false;
- // Server performs an update when client requested delegation (Enabled).
- const bool FQDN_OVERRIDE_CLIENT_UPDATE = true;
- // The fully qualified domain-name suffix if partial name provided by
- // a client.
- const char* FQDN_PARTIAL_SUFFIX = "example.com";
- // Should server replace the domain-name supplied by the client (Disabled).
- const bool FQDN_REPLACE_CLIENT_NAME = false;
- 
- }
- 
 +const std::string Dhcpv6Srv::VENDOR_CLASS_PREFIX("VENDOR_CLASS_");
 +
  /// @brief file name of a server-id file
  ///
  /// Server must store its duid in persistent storage that must not change

diff --cc src/bin/dhcp6/dhcp6_srv.h
Simple merge