From: Marcin Siodelski Date: Thu, 27 Jun 2019 18:50:07 +0000 (+0200) Subject: [#642,!373] Adjusted exceptions' text in the mysql_cb. X-Git-Tag: Kea-1.6.0-beta2~161 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24e9c24f24e65be8e598794b1dec204d5cbc184d;p=thirdparty%2Fkea.git [#642,!373] Adjusted exceptions' text in the mysql_cb. Per review comments. --- diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc index cd4f931941..3f7c0b0b8c 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc @@ -1905,7 +1905,7 @@ public: if (server_tag.amAll()) { isc_throw(InvalidOperation, "'all' is a name reserved for the server tag which" " associates the configuration elements with all servers connecting" - " to the database and can't be deleted"); + " to the database and may not be deleted"); } MySqlTransaction transaction(conn_); diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc index 2acacb0bf2..8f3e016660 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc @@ -2219,7 +2219,7 @@ public: if (server_tag.amAll()) { isc_throw(InvalidOperation, "'all' is a name reserved for the server tag which" " associates the configuration elements with all servers connecting" - " to the database and can't be deleted"); + " to the database and may not be deleted"); } MySqlTransaction transaction(conn_); diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_impl.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_impl.cc index ae69445b85..7a7ce444f2 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_impl.cc +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_impl.cc @@ -938,7 +938,7 @@ MySqlConfigBackendImpl::createUpdateServer(const int& create_audit_revision, if (server->getServerTag().amAll()) { isc_throw(InvalidOperation, "'all' is a name reserved for the server tag which" " associates the configuration elements with all servers connecting" - " to the database and a server with this name can't be created"); + " to the database and a server with this name nay not be created"); } // Create scoped audit revision. As long as this instance exists