From 6aa2f2e17dfa661da54bf1565a3a7141ba5ae0dc Mon Sep 17 00:00:00 2001
From: "david.henne" <david.henne@wildcardcorp.com>
Date: Fri, 14 Apr 2023 12:56:14 -0500
Subject: [PATCH 1/2] change 'plone' prefix to 'castle' for
 disable_country_restriction setting

---
 castle/cms/authentication.py          | 2 +-
 castle/cms/profiles/3006/registry.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/castle/cms/authentication.py b/castle/cms/authentication.py
index 3ffaa2cc7..34716933d 100644
--- a/castle/cms/authentication.py
+++ b/castle/cms/authentication.py
@@ -218,7 +218,7 @@ def authenticate(self, username=None, password=None,
 
         if self.registry:
             disable_country_restriction = self.registry.get(
-                'plone.disable_country_restriction'
+                'castle.disable_country_restriction'
             )
             if not disable_country_restriction:
                 allowed_countries = self.registry.get(
diff --git a/castle/cms/profiles/3006/registry.xml b/castle/cms/profiles/3006/registry.xml
index 6f015658c..9ff6a2526 100644
--- a/castle/cms/profiles/3006/registry.xml
+++ b/castle/cms/profiles/3006/registry.xml
@@ -24,7 +24,7 @@
     </field>
   </record>
 
-  <record name="plone.disable_country_restriction"
+  <record name="castle.disable_country_restriction"
           interface="castle.cms.interfaces.ISecuritySchema"
           field="disable_country_restriction">
     <value>False</value>

From 57d5fc88332f4f1fc898872c813f9d105806c247 Mon Sep 17 00:00:00 2001
From: "david.henne" <david.henne@wildcardcorp.com>
Date: Sun, 16 Apr 2023 14:24:24 -0500
Subject: [PATCH 2/2] remove castle def for country restriction registry

---
 castle/cms/authentication.py          | 2 +-
 castle/cms/profiles/3006/registry.xml | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/castle/cms/authentication.py b/castle/cms/authentication.py
index 34716933d..3ffaa2cc7 100644
--- a/castle/cms/authentication.py
+++ b/castle/cms/authentication.py
@@ -218,7 +218,7 @@ def authenticate(self, username=None, password=None,
 
         if self.registry:
             disable_country_restriction = self.registry.get(
-                'castle.disable_country_restriction'
+                'plone.disable_country_restriction'
             )
             if not disable_country_restriction:
                 allowed_countries = self.registry.get(
diff --git a/castle/cms/profiles/3006/registry.xml b/castle/cms/profiles/3006/registry.xml
index 9ff6a2526..c8174219a 100644
--- a/castle/cms/profiles/3006/registry.xml
+++ b/castle/cms/profiles/3006/registry.xml
@@ -23,11 +23,4 @@
       <required>False</required>
     </field>
   </record>
-
-  <record name="castle.disable_country_restriction"
-          interface="castle.cms.interfaces.ISecuritySchema"
-          field="disable_country_restriction">
-    <value>False</value>
-  </record>
-
 </registry>