[#4582] Applied Andrei's patch

diff --git a/.clang-format b/.clang-format
index de3a8968ba0c6ba57b284aa717a92f8a21cb28f5..ddd2e26d12679db5095f10215556f290d97f7bba 100644 (file)
--- a/.clang-format
+++ b/.clang-format
@@ -50,7 +50,7 @@ IncludeCategories:
   - Regex:           '^<config.h>$'
     Priority:        0
     # Kea's own files
-  - Regex:           '^<(asiodns|asiolink|cc|config|config_backend|cryptolink|database|dhcp|dhcpsrv|dhcp_ddns|dns|eval|exceptions|hooks|http|log|mysql|pgsql|process|stats|testutils|util|yang|admin|agent|d2|dhcp4|dhcp6|keactrl|lfc|netconf|perfdhcp|shell|limits)/'
+  - Regex:           '^<(asiodns|asiolink|cc|config|config_backend|cryptolink|d2srv|database|dhcp|dhcpsrv|dhcp_ddns|dns|eval|exceptions|hooks|http|log|mysql|pgsql|process|stats|tcp|testutils|util|yang|admin|d2|dhcp4|dhcp6|keactrl|lfc|netconf|perfdhcp|shell|limits)/'
     Priority:        1
     # C++ standard library headers
   - Regex:           '^<[_[:alnum:]]+>$'

diff --git a/doc/sphinx/arm/ctrl-channel.rst b/doc/sphinx/arm/ctrl-channel.rst
index 26c86bc243b7a155e90c83fbaf41e0db28fb61fe..3cc3bc52f398565c3b795f828c96130f9117106e 100644 (file)
--- a/doc/sphinx/arm/ctrl-channel.rst
+++ b/doc/sphinx/arm/ctrl-channel.rst
@@ -214,7 +214,7 @@ as a single entry (JSON map) as follows:
 
 
 These types of errors are possible on systems configured for either basic
-authentication or agents that load :ischooklib:`libdhcp_rbac.so`.
+authentication or servers that load :ischooklib:`libdhcp_rbac.so`.
 
 .. _ctrl-channel-client:
 

diff --git a/doc/sphinx/arm/database-connectivity.rst b/doc/sphinx/arm/database-connectivity.rst
index ab3ef76a10e6fe44160af39a780c5ee0f8ff5695..1625afd7db3e11ac6858110f810b2f71adae1adb 100644 (file)
--- a/doc/sphinx/arm/database-connectivity.rst
+++ b/doc/sphinx/arm/database-connectivity.rst
@@ -97,10 +97,6 @@ Corresponding database configuration parameters for Kea servers are:
    the content of this parameter is described in the OpenSSL ciphers
    manual).
 
-These parameters are similar to the parameters of the secure connections
-with the agent but are interpreted by different backends using database
-configurations too.
-
 Currently the support for each database is:
 
 -  MySQL supports the whole set, except ``ssl-mode``, additional configuration

diff --git a/tools/print-generated-files.sh b/tools/print-generated-files.sh
index 894aa8344a987cdc19a6baf55efde064f6bb2038..1f33d349bee6b24589a7f0568c73803c0c5d594b 100755 (executable)
--- a/tools/print-generated-files.sh
+++ b/tools/print-generated-files.sh
@@ -32,12 +32,6 @@ for prefix in '' 'premium/'; do
 done
 
 printf "\
-src/bin/agent/agent_lexer.cc
-src/bin/agent/agent_parser.cc
-src/bin/agent/agent_parser.h
-src/bin/agent/ca_messages.cc
-src/bin/agent/ca_messages.h
-src/bin/agent/location.hh
 src/bin/d2/d2_lexer.cc
 src/bin/d2/d2_parser.cc
 src/bin/d2/d2_parser.h