From aaaa0e6aeae7c8a5d34c8ee07a6476a3532fb082 Mon Sep 17 00:00:00 2001
From: David Sparer <David.Sparer@pearson.com>
Date: Mon, 10 Oct 2016 11:39:13 -0600
Subject: [PATCH] Little simplification of the v2.6 schema

---
 mRemoteV1/Schemas/mremoteng_confcons_v2_6.xsd | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/mRemoteV1/Schemas/mremoteng_confcons_v2_6.xsd b/mRemoteV1/Schemas/mremoteng_confcons_v2_6.xsd
index dabce6895..d09616e63 100644
--- a/mRemoteV1/Schemas/mremoteng_confcons_v2_6.xsd
+++ b/mRemoteV1/Schemas/mremoteng_confcons_v2_6.xsd
@@ -8,14 +8,24 @@
 >
   <xs:include id="encryption" schemaLocation="mremoteng_encryption_v1_0.xsd" />
 
-  <xs:element name="EncryptionInfo" type="encryptionInfo"/>
+  
+  <xs:element name="EncryptionInfo">
+    <xs:complexType>
+      <xs:choice>
+        <xs:element ref="mrng:Connections" />
+        <xs:element ref="mrng:EncryptedData" />
+      </xs:choice>
+      <xs:attribute name="EncryptionEngine" type="xs:string" use="required" />
+      <xs:attribute name="BlockCipherMode" type="xs:string" use="required" />
+    </xs:complexType>
+  </xs:element>
 
+  
   <xs:element name="Connections">
     <xs:complexType>
       <xs:sequence>
         <xs:element name="Node" type="mrng:connectioninfo" />
       </xs:sequence>
-
       <xs:attribute name="Name" type="xs:string" use="required" />
       <xs:attribute name="Export" type="xs:boolean" use="required" />
       <xs:attribute name="Protected" type="xs:string" use="required" />
@@ -23,17 +33,7 @@
     </xs:complexType>
   </xs:element>
 
-  
-  <xs:complexType name="encryptionInfo">
-    <xs:choice>
-      <xs:element ref="mrng:Connections" />
-      <xs:element ref="mrng:EncryptedData" />
-    </xs:choice>
-    <xs:attribute name="EncryptionEngine" type="xs:string" use="required" />
-    <xs:attribute name="BlockCipherMode" type="xs:string" use="required" />
-  </xs:complexType>
 
-  
   <xs:complexType name="connectioninfo">
     <xs:sequence minOccurs="0" maxOccurs="unbounded">
       <xs:element name="Node" type="mrng:connectioninfo" />