From 9916a7abddfc442c603d112f06f6ab70b3b8d445 Mon Sep 17 00:00:00 2001
From: Daniel Compton <daniel.compton@nist.gov>
Date: Thu, 15 Sep 2022 10:39:09 -0500
Subject: [PATCH 1/2] Support additional control-origination props #784

---
 src/metaschema/oscal_ssp_metaschema.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/metaschema/oscal_ssp_metaschema.xml b/src/metaschema/oscal_ssp_metaschema.xml
index 216190339e..f4870736d9 100644
--- a/src/metaschema/oscal_ssp_metaschema.xml
+++ b/src/metaschema/oscal_ssp_metaschema.xml
@@ -705,8 +705,8 @@
       <field ref="remarks" in-xml="WITH_WRAPPER"/>
     </model>
     <constraint>
-      <allowed-values target="prop/@name" allow-other="yes">
-        <enum value="control-origination">Identifies the source of the implemented control.</enum>
+      <allowed-values target="(.|statement|.//by-component)/prop/@name" allow-other="yes">
+        <enum value="control-origination">Identifies the source of the implemented control.  Any <code>control-origination</code> prop defined in a child context will override the parent value.</enum>
       </allowed-values>
       <allowed-values target="prop[@name='control-origination']/@value">
         <enum value="organization">The control is implemented by the organization owning the system, but is not specific to the system itself.</enum>

From e4f441fb8cee67e659bbfb96fb01dbde95fd9471 Mon Sep 17 00:00:00 2001
From: Chris Compton <daniel.compton@nist.gov>
Date: Thu, 29 Sep 2022 14:37:38 -0500
Subject: [PATCH 2/2] Update recommended path to target additional nodes.

Co-authored-by: David Waltermire <david.waltermire@nist.gov>
---
 src/metaschema/oscal_ssp_metaschema.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/metaschema/oscal_ssp_metaschema.xml b/src/metaschema/oscal_ssp_metaschema.xml
index f4870736d9..b1de35600b 100644
--- a/src/metaschema/oscal_ssp_metaschema.xml
+++ b/src/metaschema/oscal_ssp_metaschema.xml
@@ -708,7 +708,7 @@
       <allowed-values target="(.|statement|.//by-component)/prop/@name" allow-other="yes">
         <enum value="control-origination">Identifies the source of the implemented control.  Any <code>control-origination</code> prop defined in a child context will override the parent value.</enum>
       </allowed-values>
-      <allowed-values target="prop[@name='control-origination']/@value">
+      <allowed-values target="(.|statement|.//by-component)/prop[@name='control-origination']/@value">
         <enum value="organization">The control is implemented by the organization owning the system, but is not specific to the system itself.</enum>
         <enum value="system-specific">The control is implemented specifically to this system.</enum>
         <enum value="customer-configured">The control is provided by the system, but must be configured by the customer.</enum>