From: Francis Dupont Date: Sat, 30 May 2026 14:53:04 +0000 (+0200) Subject: [#4582] Applied Andrei's patch X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=4600dc0c0ff21ed602eff5c0717950cfdaf040b2;p=thirdparty%2Fkea.git [#4582] Applied Andrei's patch --- diff --git a/.clang-format b/.clang-format index de3a8968ba..ddd2e26d12 100644 --- a/.clang-format +++ b/.clang-format @@ -50,7 +50,7 @@ IncludeCategories: - Regex: '^$' 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 26c86bc243..3cc3bc52f3 100644 --- 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 ab3ef76a10..1625afd7db 100644 --- 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 894aa8344a..1f33d349be 100755 --- 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