From a89d88e2503368e0d662c57d7c0827d6d064b7b9 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Fri, 16 Oct 2015 04:56:43 +0000
Subject: Replace RRDP wired-in-URL kludge with proper support in OOB and
 left-right protocol and irdb and rpkidb models.

Not fully working yet, RRDP URI isn't yet showing up everywhere it
should, but this is probably more an indication that the previous hack
was incomplete than that the replacement broke something.

svn path=/branches/tk705/; revision=6120
---
 schemas/relaxng/left-right.rnc | 5 +++--
 schemas/relaxng/left-right.rng | 9 +++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'schemas/relaxng')

diff --git a/schemas/relaxng/left-right.rnc b/schemas/relaxng/left-right.rnc
index 22d971f0..b5ab56a7 100644
--- a/schemas/relaxng/left-right.rnc
+++ b/schemas/relaxng/left-right.rnc
@@ -162,8 +162,8 @@ parent_payload = (attribute peer_contact_uri { uri }?,
                   repository_handle?,
                   attribute sender_name { up_down_name }?,
                   attribute recipient_name { up_down_name }?,
-                  element bpki_cms_cert { base64 }?,
-                  element bpki_cms_glue { base64 }?)
+                  element bpki_cert { base64 }?,
+                  element bpki_glue { base64 }?)
 
 parent_query |= element parent { ctl_create,  self_handle, parent_handle, parent_bool, parent_payload }
 parent_reply |= element parent { ctl_create,  self_handle, parent_handle }
@@ -206,6 +206,7 @@ repository_bool = attribute clear_replay_protection { "yes" }?
 
 repository_payload = (attribute peer_contact_uri { uri }?,
                       bsc_handle?,
+                      attribute rrdp_notification_uri { uri }?,
                       element bpki_cert { base64 }?,
                       element bpki_glue { base64 }?)
 
diff --git a/schemas/relaxng/left-right.rng b/schemas/relaxng/left-right.rng
index bd63410e..24804af2 100644
--- a/schemas/relaxng/left-right.rng
+++ b/schemas/relaxng/left-right.rng
@@ -546,12 +546,12 @@
       </attribute>
     </optional>
     <optional>
-      <element name="bpki_cms_cert">
+      <element name="bpki_cert">
         <ref name="base64"/>
       </element>
     </optional>
     <optional>
-      <element name="bpki_cms_glue">
+      <element name="bpki_glue">
         <ref name="base64"/>
       </element>
     </optional>
@@ -761,6 +761,11 @@
     <optional>
       <ref name="bsc_handle"/>
     </optional>
+    <optional>
+      <attribute name="rrdp_notification_uri">
+        <ref name="uri"/>
+      </attribute>
+    </optional>
     <optional>
       <element name="bpki_cert">
         <ref name="base64"/>
-- 
cgit v1.2.3