From: Razvan Becheriu <razvan@isc.org>
Date: Thu, 23 May 2024 20:45:06 +0000 (+0300)
Subject: [#2959] use 0 and 1 instead of false and true
X-Git-Tag: Kea-2.6.0~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfc28070c0dbbe85a9e7872157811e137082e898;p=thirdparty%2Fkea.git

[#2959] use 0 and 1 instead of false and true
---

diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql
index 2c4a43ccbc..153ba099d3 100644
--- a/src/share/database/scripts/mysql/dhcpdb_create.mysql
+++ b/src/share/database/scripts/mysql/dhcpdb_create.mysql
@@ -5820,19 +5820,19 @@ UPDATE schema_version
 SET @disable_audit = 1;
 UPDATE dhcp4_global_parameter
 SET name = 'ddns-conflict-resolution-mode', value = 'check-with-dhcid', parameter_type = 4
-WHERE name = 'ddns-use-conflict-resolution' and value = 'true';
+WHERE name = 'ddns-use-conflict-resolution' and value = '1';
 
 UPDATE dhcp4_global_parameter
 SET name = 'ddns-conflict-resolution-mode', value = 'no-check-with-dhcid', parameter_type = 4
-WHERE name = 'ddns-use-conflict-resolution' and value = 'false';
+WHERE name = 'ddns-use-conflict-resolution' and value = '0';
 
 UPDATE dhcp6_global_parameter
 SET name = 'ddns-conflict-resolution-mode', value = 'check-with-dhcid', parameter_type = 4
-WHERE name = 'ddns-use-conflict-resolution' and value = 'true';
+WHERE name = 'ddns-use-conflict-resolution' and value = '1';
 
 UPDATE dhcp6_global_parameter
 SET name = 'ddns-conflict-resolution-mode', value = 'no-check-with-dhcid', parameter_type = 4
-WHERE name = 'ddns-use-conflict-resolution' and value = 'false';
+WHERE name = 'ddns-use-conflict-resolution' and value = '0';
 
 -- Add a constraint on lease6_relay_id that any lease_addr must map to
 -- a lease6 address.
@@ -5883,17 +5883,17 @@ DELETE FROM dhcp6_global_parameter WHERE name='dhcp-ddns.qualifying-suffix';
 DELETE FROM dhcp6_global_parameter WHERE name='dhcp-ddns.hostname-char-set';
 DELETE FROM dhcp6_global_parameter WHERE name='dhcp-ddns.hostname-char-replacement';
 
-UPDATE dhcp4_global_parameter SET name='reservations-global', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='global';
-UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='all';
-UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='false', parameter_type=2 WHERE name='reservation-mode' AND value='disabled';
-UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='false', parameter_type=2 WHERE name='reservation-mode' AND value='off';
-UPDATE dhcp4_global_parameter SET name='reservations-out-of-pool', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='out-of-pool';
-
-UPDATE dhcp6_global_parameter SET name='reservations-global', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='global';
-UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='all';
-UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='false', parameter_type=2 WHERE name='reservation-mode' AND value='disabled';
-UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='false', parameter_type=2 WHERE name='reservation-mode' AND value='off';
-UPDATE dhcp6_global_parameter SET name='reservations-out-of-pool', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='out-of-pool';
+UPDATE dhcp4_global_parameter SET name='reservations-global', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='global';
+UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='all';
+UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='0', parameter_type=2 WHERE name='reservation-mode' AND value='disabled';
+UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='0', parameter_type=2 WHERE name='reservation-mode' AND value='off';
+UPDATE dhcp4_global_parameter SET name='reservations-out-of-pool', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='out-of-pool';
+
+UPDATE dhcp6_global_parameter SET name='reservations-global', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='global';
+UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='all';
+UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='0', parameter_type=2 WHERE name='reservation-mode' AND value='disabled';
+UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='0', parameter_type=2 WHERE name='reservation-mode' AND value='off';
+UPDATE dhcp6_global_parameter SET name='reservations-out-of-pool', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='out-of-pool';
 
 SET @disable_audit = 0;
 
diff --git a/src/share/database/scripts/mysql/upgrade_019_to_020.sh.in b/src/share/database/scripts/mysql/upgrade_019_to_020.sh.in
index 52bd0eccbb..49fb4534db 100644
--- a/src/share/database/scripts/mysql/upgrade_019_to_020.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_019_to_020.sh.in
@@ -60,19 +60,19 @@ mysql "$@" <<EOF
 SET @disable_audit = 1;
 UPDATE dhcp4_global_parameter
 SET name = 'ddns-conflict-resolution-mode', value = 'check-with-dhcid', parameter_type = 4
-WHERE name = 'ddns-use-conflict-resolution' and value = 'true';
+WHERE name = 'ddns-use-conflict-resolution' and value = '1';
 
 UPDATE dhcp4_global_parameter
 SET name = 'ddns-conflict-resolution-mode', value = 'no-check-with-dhcid', parameter_type = 4
-WHERE name = 'ddns-use-conflict-resolution' and value = 'false';
+WHERE name = 'ddns-use-conflict-resolution' and value = '0';
 
 UPDATE dhcp6_global_parameter
 SET name = 'ddns-conflict-resolution-mode', value = 'check-with-dhcid', parameter_type = 4
-WHERE name = 'ddns-use-conflict-resolution' and value = 'true';
+WHERE name = 'ddns-use-conflict-resolution' and value = '1';
 
 UPDATE dhcp6_global_parameter
 SET name = 'ddns-conflict-resolution-mode', value = 'no-check-with-dhcid', parameter_type = 4
-WHERE name = 'ddns-use-conflict-resolution' and value = 'false';
+WHERE name = 'ddns-use-conflict-resolution' and value = '0';
 
 -- Add a constraint on lease6_relay_id that any lease_addr must map to
 -- a lease6 address.
diff --git a/src/share/database/scripts/mysql/upgrade_021_to_022.sh.in b/src/share/database/scripts/mysql/upgrade_021_to_022.sh.in
index a986c0e574..6b488d40a0 100644
--- a/src/share/database/scripts/mysql/upgrade_021_to_022.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_021_to_022.sh.in
@@ -78,17 +78,17 @@ DELETE FROM dhcp6_global_parameter WHERE name='dhcp-ddns.qualifying-suffix';
 DELETE FROM dhcp6_global_parameter WHERE name='dhcp-ddns.hostname-char-set';
 DELETE FROM dhcp6_global_parameter WHERE name='dhcp-ddns.hostname-char-replacement';
 
-UPDATE dhcp4_global_parameter SET name='reservations-global', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='global';
-UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='all';
-UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='false', parameter_type=2 WHERE name='reservation-mode' AND value='disabled';
-UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='false', parameter_type=2 WHERE name='reservation-mode' AND value='off';
-UPDATE dhcp4_global_parameter SET name='reservations-out-of-pool', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='out-of-pool';
-
-UPDATE dhcp6_global_parameter SET name='reservations-global', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='global';
-UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='all';
-UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='false', parameter_type=2 WHERE name='reservation-mode' AND value='disabled';
-UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='false', parameter_type=2 WHERE name='reservation-mode' AND value='off';
-UPDATE dhcp6_global_parameter SET name='reservations-out-of-pool', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='out-of-pool';
+UPDATE dhcp4_global_parameter SET name='reservations-global', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='global';
+UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='all';
+UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='0', parameter_type=2 WHERE name='reservation-mode' AND value='disabled';
+UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='0', parameter_type=2 WHERE name='reservation-mode' AND value='off';
+UPDATE dhcp4_global_parameter SET name='reservations-out-of-pool', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='out-of-pool';
+
+UPDATE dhcp6_global_parameter SET name='reservations-global', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='global';
+UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='all';
+UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='0', parameter_type=2 WHERE name='reservation-mode' AND value='disabled';
+UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='0', parameter_type=2 WHERE name='reservation-mode' AND value='off';
+UPDATE dhcp6_global_parameter SET name='reservations-out-of-pool', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='out-of-pool';
 
 SET @disable_audit = 0;
 
diff --git a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
index 19567e3a2b..79fee4f5a5 100644
--- a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
+++ b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
@@ -6270,19 +6270,19 @@ UPDATE schema_version
 SELECT set_config('kea.disable_audit', 'true', false);
 UPDATE dhcp4_global_parameter
 SET name = 'ddns-conflict-resolution-mode', value = 'check-with-dhcid', parameter_type = 4
-WHERE name = 'ddns-use-conflict-resolution' and value = 'true';
+WHERE name = 'ddns-use-conflict-resolution' and value = '1';
 
 UPDATE dhcp4_global_parameter
 SET name = 'ddns-conflict-resolution-mode', value = 'no-check-with-dhcid', parameter_type = 4
-WHERE name = 'ddns-use-conflict-resolution' and value = 'false';
+WHERE name = 'ddns-use-conflict-resolution' and value = '0';
 
 UPDATE dhcp6_global_parameter
 SET name = 'ddns-conflict-resolution-mode', value = 'check-with-dhcid', parameter_type = 4
-WHERE name = 'ddns-use-conflict-resolution' and value = 'true';
+WHERE name = 'ddns-use-conflict-resolution' and value = '1';
 
 UPDATE dhcp6_global_parameter
 SET name = 'ddns-conflict-resolution-mode', value = 'no-check-with-dhcid', parameter_type = 4
-WHERE name = 'ddns-use-conflict-resolution' and value = 'false';
+WHERE name = 'ddns-use-conflict-resolution' and value = '0';
 
 -- Clear lease6_relay_id table.
 DELETE FROM lease6_relay_id;
@@ -6357,17 +6357,17 @@ DELETE FROM dhcp6_global_parameter WHERE name='dhcp-ddns.qualifying-suffix';
 DELETE FROM dhcp6_global_parameter WHERE name='dhcp-ddns.hostname-char-set';
 DELETE FROM dhcp6_global_parameter WHERE name='dhcp-ddns.hostname-char-replacement';
 
-UPDATE dhcp4_global_parameter SET name='reservations-global', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='global';
-UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='all';
-UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='false', parameter_type=2 WHERE name='reservation-mode' AND value='disabled';
-UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='false', parameter_type=2 WHERE name='reservation-mode' AND value='off';
-UPDATE dhcp4_global_parameter SET name='reservations-out-of-pool', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='out-of-pool';
-
-UPDATE dhcp6_global_parameter SET name='reservations-global', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='global';
-UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='all';
-UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='false', parameter_type=2 WHERE name='reservation-mode' AND value='disabled';
-UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='false', parameter_type=2 WHERE name='reservation-mode' AND value='off';
-UPDATE dhcp6_global_parameter SET name='reservations-out-of-pool', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='out-of-pool';
+UPDATE dhcp4_global_parameter SET name='reservations-global', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='global';
+UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='all';
+UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='0', parameter_type=2 WHERE name='reservation-mode' AND value='disabled';
+UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='0', parameter_type=2 WHERE name='reservation-mode' AND value='off';
+UPDATE dhcp4_global_parameter SET name='reservations-out-of-pool', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='out-of-pool';
+
+UPDATE dhcp6_global_parameter SET name='reservations-global', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='global';
+UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='all';
+UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='0', parameter_type=2 WHERE name='reservation-mode' AND value='disabled';
+UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='0', parameter_type=2 WHERE name='reservation-mode' AND value='off';
+UPDATE dhcp6_global_parameter SET name='reservations-out-of-pool', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='out-of-pool';
 
 SELECT set_config('kea.disable_audit', 'false', false);
 
diff --git a/src/share/database/scripts/pgsql/upgrade_018_to_019.sh.in b/src/share/database/scripts/pgsql/upgrade_018_to_019.sh.in
index b4983416a2..ff150f5552 100644
--- a/src/share/database/scripts/pgsql/upgrade_018_to_019.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_018_to_019.sh.in
@@ -43,19 +43,19 @@ START TRANSACTION;
 SELECT set_config('kea.disable_audit', 'true', false);
 UPDATE dhcp4_global_parameter
 SET name = 'ddns-conflict-resolution-mode', value = 'check-with-dhcid', parameter_type = 4
-WHERE name = 'ddns-use-conflict-resolution' and value = 'true';
+WHERE name = 'ddns-use-conflict-resolution' and value = '1';
 
 UPDATE dhcp4_global_parameter
 SET name = 'ddns-conflict-resolution-mode', value = 'no-check-with-dhcid', parameter_type = 4
-WHERE name = 'ddns-use-conflict-resolution' and value = 'false';
+WHERE name = 'ddns-use-conflict-resolution' and value = '0';
 
 UPDATE dhcp6_global_parameter
 SET name = 'ddns-conflict-resolution-mode', value = 'check-with-dhcid', parameter_type = 4
-WHERE name = 'ddns-use-conflict-resolution' and value = 'true';
+WHERE name = 'ddns-use-conflict-resolution' and value = '1';
 
 UPDATE dhcp6_global_parameter
 SET name = 'ddns-conflict-resolution-mode', value = 'no-check-with-dhcid', parameter_type = 4
-WHERE name = 'ddns-use-conflict-resolution' and value = 'false';
+WHERE name = 'ddns-use-conflict-resolution' and value = '0';
 
 -- Clear lease6_relay_id table.
 DELETE FROM lease6_relay_id;
diff --git a/src/share/database/scripts/pgsql/upgrade_021_to_022.sh.in b/src/share/database/scripts/pgsql/upgrade_021_to_022.sh.in
index 76d6f7a107..6d61a0081a 100644
--- a/src/share/database/scripts/pgsql/upgrade_021_to_022.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_021_to_022.sh.in
@@ -57,17 +57,17 @@ DELETE FROM dhcp6_global_parameter WHERE name='dhcp-ddns.qualifying-suffix';
 DELETE FROM dhcp6_global_parameter WHERE name='dhcp-ddns.hostname-char-set';
 DELETE FROM dhcp6_global_parameter WHERE name='dhcp-ddns.hostname-char-replacement';
 
-UPDATE dhcp4_global_parameter SET name='reservations-global', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='global';
-UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='all';
-UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='false', parameter_type=2 WHERE name='reservation-mode' AND value='disabled';
-UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='false', parameter_type=2 WHERE name='reservation-mode' AND value='off';
-UPDATE dhcp4_global_parameter SET name='reservations-out-of-pool', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='out-of-pool';
-
-UPDATE dhcp6_global_parameter SET name='reservations-global', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='global';
-UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='all';
-UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='false', parameter_type=2 WHERE name='reservation-mode' AND value='disabled';
-UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='false', parameter_type=2 WHERE name='reservation-mode' AND value='off';
-UPDATE dhcp6_global_parameter SET name='reservations-out-of-pool', value='true', parameter_type=2 WHERE name='reservation-mode' AND value='out-of-pool';
+UPDATE dhcp4_global_parameter SET name='reservations-global', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='global';
+UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='all';
+UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='0', parameter_type=2 WHERE name='reservation-mode' AND value='disabled';
+UPDATE dhcp4_global_parameter SET name='reservations-in-subnet', value='0', parameter_type=2 WHERE name='reservation-mode' AND value='off';
+UPDATE dhcp4_global_parameter SET name='reservations-out-of-pool', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='out-of-pool';
+
+UPDATE dhcp6_global_parameter SET name='reservations-global', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='global';
+UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='all';
+UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='0', parameter_type=2 WHERE name='reservation-mode' AND value='disabled';
+UPDATE dhcp6_global_parameter SET name='reservations-in-subnet', value='0', parameter_type=2 WHERE name='reservation-mode' AND value='off';
+UPDATE dhcp6_global_parameter SET name='reservations-out-of-pool', value='1', parameter_type=2 WHERE name='reservation-mode' AND value='out-of-pool';
 
 SELECT set_config('kea.disable_audit', 'false', false);