[master] Merged trac3513 (-V extended version)

diff --cc ChangeLog
index 14eda4549475286ad5e5b8e8a6e1f28bbf54ee0d,9cb64e00188295b25f03433a82a87d3a50957248..09cba989c9c7fb310d869f1c5060a00b787e9912
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,119 -1,3 +1,128 @@@
++954.  [func]          fdupont
++      Enhance the versioning information printed by the executables and
++      make it more consistent across all of the executables. "-v" is for
++      basic Kea version information, "-V" provides more detailed
++      versioning and versions for external dynamic libraries, finally
++      "-W" provides the configure report from the configuration step
++      during the build of Kea.
++      (Trac #3513, git xxx)
++
 +953.  [bug]           fdupont
 +      Corrected the setting of string characters to values above 127
 +      in HMAC tests.
 +      (Trac #3829, git 54f4ec64e513fea1547631122dc1af8579fae3db)
 +
 +952.  [bug]           fdupont
 +      Made some loop indexes an unsigned type to avoid compiler warnings
 +      where the termination condition is comparison with an unsigned
 +      value.
 +      (Trac #3833, git 3db9f1d78f59856b982a1ff84c3b5a1ba7ea39df)
 +
 +951.  [build]         fdupont
 +      Removed BUNDY configuration backend.
 +      (Trac #3732, git 96364cbbb15318c8f55d5b287cda0990d3eaae32)
 +
 +950.  [doc]           marcin
 +      Updated section about logging in the User Guide. Also,
 +      updated Hooks Developer's Guide with the recommendations for
 +      the developers about use of logging in hooks libraries.
 +      (Trac #3805, git b403de1f335a2fb5098c9abc0858b8137892f868)
 +
 +949.  [func]          tmark
 +      kea-admin now supports dumping MySQL and PostgreSQL lease tables
 +      to CSV file, via a new command "lease-dump".  This is primarily
 +      intended for use as a diagnostic tool.
 +      (Trac #3802, git 6ec774e8523e7f8415d6cd18c34062489e127847)
 +
 +948.  [bug]           fdupont
 +      libdhcpsrv: check if new host reservation tries to use an already
 +      reserved address.
 +      (Trac #3652, git 4f10b78341b197bd321fbf2ec71db7420e40718d)
 +
 +947.  [func]          marcin
 +      DHCPv6 server now supports Rapid Commit option.
 +      (Trac #3070, git a6b6156aaa95ab74c69a537e90483f82e9fbe4a2)
 +
 +946.  [doc]           tmark
 +      Added doucmentation for kea-admin "lease-dump" command to the
 +      Kea Admininstrator's Guide and kea-admin man page.
 +      (Trac #3803, git 54b59b7ef02f6428405794066ea779e9bd4c0b6e)
 +
 +945.  [func]          marcin
 +      Improved log messages emitted by the DHCPv6 server. Also,
 +      the server is now using multiple distinct loggers for logging
 +      messages pertaining to different functional parts of the
 +      code, e.g. packet transmission, lease allocation, DDNS etc.
 +      (Trac #3807, git c95ebdaf39c3d8d78d83d53db15824c60078f566)
 +
 +944.    [func]      tmark
 +      kea-admin commands lease-init, lease-version, and lease-upgrade
 +      now support PostgreSQL. Note that at this time the PostgreSQL
 +      backend only supports Kea schema version 1.0, so there are no
 +      upgrades available.
 +      (Trac #3883, git 990a0d72fa247e4a12e2608994204c48274e4cd6)
 +
 +943.  [func]          sar
 +      Split the DHCP-DDNS logging messages amongst several loggers to
 +      allow the administrator finer control over debugging messages.
 +      Messages pertaining to the name change requests processing include
 +      an ID, currently the DHCID, to identify the transactions.
 +      (Trac #3808, git 4fbe08234049de6ef67bb5cdb244d180a7a4c3a9)
 +
 +942.  [func]          tomek
 +      18 new statistics added in DHCPv4 server: generic packet counters,
 +      per packet type counters, parsing failure and packet drops.
 +      (Trac #3794, git a61f40c44910a09699a9a566a5ec35ab758564ba)
 +
 +941.  [bug]           marcin
 +      Configuration parser for host reservations returns an error
 +      when an unsupported parameter is specified.
 +      (Trac 3810, git 54ee0f6328a303c366dd8239e768dfc4a23a5d9b)
 +
 +940.  [bug]           fdupont
 +      DHCPv4 server drops DHCPRELEASE messages sent from a bad
 +      location (i.e., no subnet can be selected)
 +      (Trac 3504, git f0f13ac74779f76ed7af91bd5dab3d11ba00be79)
 +
 +939.  [bug]           fdupont
 +      Small fix in HooksDhcpv4SrvTest.subnet4SelectSimple unit-test.
 +      (Trac 3881, git a21afdffec41fceb61e6760d4108d670b2eabe75)
 +
 +938.  [build]         fdupont
 +      Removed Python from the log library (code, message compiler and
 +      documentation)
 +      (Trac #3734, git d24b7c9716c6eb7a3e9dd2cb3fd2d1bfe4e1201f)
 +
 +937.  [bug]           fdupont
 +      The log ID LOG_UNRECOGNISED_DIRECTIVE was changed to
 +      LOG_UNRECOGNIZED_DIRECTIVE to follow US English spelling.
 +      (Trac #3762, git 235e3304746352e9341008225f9f2392586a9f66)
 +
 +936.  [bug]           fdupont
 +      Added an ASSERT to avoid a crash in HooksDhcpv4SrvTest
 +      subnet4SelectSimple unit test. Fixed out of bounds vector accesses
 +      in perfdhcp (which should not be able to handle links
 +      with long (i.e., more than 6 bytes) link-layer addresses).
 +      (Trac #3868, git c20f47e19d6060605c0611754db7b66b08553caa)
 +
 +935.  [bug]           fdupont
 +      Fixed 3 out of bounds accesses on vectors in DHCP++ code.
 +      (Trac #3854, git de263ad0008f3494a85592f78db1ec662b68e689)
 +
 +934.  [bug]           fdupont
 +      Renamed the DHCP-DDNS constant INVALID_SOCKET to SOCKET_NOT_VALID
 +      to avoid conflicting with a constant of that name defined on some
 +      operating systems.
 +      (Trac #3861, git 28205225ceed03ff3126e43cd06cedbaa7d8d657)
 +
 +933.  [func]*         marcin
 +      DHCPv4 server by default identifies a client using the
 +      client-identifier, if present. The new configuration
 +      parameter 'match-client-id' allows for disabling this
 +      behavior, i.e. 'chaddr' field is used to identify the
 +      client instead.
 +      (Trac #3747, git b9dc6ffd0f3396e9da8e0c83fd82164b8b8af011)
 +
  932.  [func]          kalmus
        MySQL schema has been extended with tables that can store
        host reservation. This ticket updates database schema only,

diff --cc configure.ac
Simple merge

diff --cc doc/guide/dhcp4-srv.xml
Simple merge

diff --cc doc/guide/dhcp6-srv.xml
Simple merge

diff --cc doc/guide/install.xml
Simple merge

diff --cc src/bin/Makefile.am
index f1013e3fa6c9deee76bfb920e4ab0d47ce94f7f4,220f7755ea669b747e3e6413033d8e18635745fe..8307244498b5732f617379a73af7f210c3452a8f
--- 1/src/bin/Makefile.am
--- 2/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@@ -1,4 -1,8 +1,4 @@@
  # The following build order must be maintained.
- SUBDIRS = dhcp4 dhcp6 d2 perfdhcp admin lfc keactrl
 -SUBDIRS = cfgrpt dhcp4 dhcp6 d2 perfdhcp admin lfc
 -
 -if CONFIG_BACKEND_JSON
 -SUBDIRS += keactrl
 -endif
++SUBDIRS = cfgrpt dhcp4 dhcp6 d2 perfdhcp admin lfc keactrl
  
  check-recursive: all-recursive

diff --cc src/bin/d2/Makefile.am
Simple merge

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

diff --cc src/bin/d2/tests/Makefile.am
Simple merge

diff --cc src/bin/dhcp4/Makefile.am
index 8d916183461549926405ed1145491df61daee812,e3560beae841aea9317cfc384ebaed29d55cd1ff..a4bf19e8c0905e5a005940be7050337d4498ef38
--- 1/src/bin/dhcp4/Makefile.am
--- 2/src/bin/dhcp4/Makefile.am
+++ b/src/bin/dhcp4/Makefile.am
@@@ -76,7 -82,8 +76,9 @@@ kea_dhcp4_LDADD += $(top_builddir)/src/
  kea_dhcp4_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
  kea_dhcp4_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
  kea_dhcp4_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 +kea_dhcp4_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
+ kea_dhcp4_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la
+ kea_dhcp4_LDADD += $(top_builddir)/src/bin/cfgrpt/libcfgrpt.la
  
  kea_dhcp4dir = $(pkgdatadir)
  kea_dhcp4_DATA = dhcp4.spec

diff --cc src/bin/dhcp4/dhcp4_srv.cc
index 41c562f0a359823834f1dfafa87caeba11d18a85,3f7a2d89378eb72a2f554b4dfe29374be21b3a30..e1b057560f56bd964cd4e9387b62f419077e7069
--- 1/src/bin/dhcp4/dhcp4_srv.cc
--- 2/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@@ -41,7 -41,9 +41,10 @@@
  #include <hooks/hooks_log.h>
  #include <hooks/hooks_manager.h>
  #include <util/strutil.h>
 +#include <stats/stats_mgr.h>
+ #include <log/logger.h>
+ #include <cryptolink/cryptolink.h>
+ #include <cfgrpt/config_report.h>
  
  #include <asio.hpp>
  #include <boost/bind.hpp>

diff --cc src/bin/dhcp4/tests/Makefile.am
index 0eb8d3b9f9df67a84872f8cb8903079ee3eb5cbb,783802ac5ab69c3961f5a7db83757b2de6984e6b..699456f1c0f36b02d4aa43cafbe21c1ca09ac44c
--- 1/src/bin/dhcp4/tests/Makefile.am
--- 2/src/bin/dhcp4/tests/Makefile.am
+++ b/src/bin/dhcp4/tests/Makefile.am
@@@ -105,9 -115,9 +105,10 @@@ dhcp4_unittests_LDADD += $(top_builddir
  dhcp4_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
  dhcp4_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
  dhcp4_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
 +dhcp4_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
  dhcp4_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/testutils/libdhcpsrvtest.la
  dhcp4_unittests_LDADD += $(top_builddir)/src/lib/util/io/libkea-util-io.la
+ dhcp4_unittests_LDADD += $(top_builddir)/src/bin/cfgrpt/libcfgrpt.la
  endif
  
  noinst_EXTRA_DIST = configs-list.txt

diff --cc src/bin/dhcp6/Makefile.am
Simple merge

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

diff --cc src/bin/dhcp6/main.cc
Simple merge

diff --cc src/bin/dhcp6/tests/Makefile.am
Simple merge

diff --cc src/bin/perfdhcp/command_options.cc
Simple merge