From 2102a26a5e96b5c83a79de08e6f3fd5ec5f99e79 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 9 Feb 2021 22:28:31 +0100
Subject: xml: cleanup wrong include file extensions

(cherry picked from commit f89969c1729a94901a817bd97da6f5b2a3712af0)
---
 .../accel-radius-additions-disable-accounting.xlm.in      |  7 -------
 .../accel-radius-additions-disable-accounting.xml.i       |  8 ++++++++
 .../include/accel-radius-additions.xml.i                  |  2 +-
 .../include/radius-server-ipv4-ipv6.xml.i                 |  4 ++--
 interface-definitions/include/radius-server-ipv4.xml.i    |  4 ++--
 interface-definitions/include/radius-server-key.xml.i     |  7 +++++++
 interface-definitions/include/radius-server-key.xml.in    |  7 -------
 interface-definitions/include/radius-server-port.xml.i    | 15 +++++++++++++++
 interface-definitions/include/radius-server-port.xml.in   | 15 ---------------
 9 files changed, 35 insertions(+), 34 deletions(-)
 delete mode 100644 interface-definitions/include/accel-radius-additions-disable-accounting.xlm.in
 create mode 100644 interface-definitions/include/accel-radius-additions-disable-accounting.xml.i
 create mode 100644 interface-definitions/include/radius-server-key.xml.i
 delete mode 100644 interface-definitions/include/radius-server-key.xml.in
 create mode 100644 interface-definitions/include/radius-server-port.xml.i
 delete mode 100644 interface-definitions/include/radius-server-port.xml.in

(limited to 'interface-definitions/include')

diff --git a/interface-definitions/include/accel-radius-additions-disable-accounting.xlm.in b/interface-definitions/include/accel-radius-additions-disable-accounting.xlm.in
deleted file mode 100644
index 026f67453..000000000
--- a/interface-definitions/include/accel-radius-additions-disable-accounting.xlm.in
+++ /dev/null
@@ -1,7 +0,0 @@
-<leafNode name="disable-accounting">
-  <properties>
-    <help>Disable accounting</help>
-    <valueless/>
-  </properties>
-</leafNode>
-
diff --git a/interface-definitions/include/accel-radius-additions-disable-accounting.xml.i b/interface-definitions/include/accel-radius-additions-disable-accounting.xml.i
new file mode 100644
index 000000000..dc5b9dd96
--- /dev/null
+++ b/interface-definitions/include/accel-radius-additions-disable-accounting.xml.i
@@ -0,0 +1,8 @@
+<!-- included start from accel-radius-additions-disable-accounting.xml.i -->
+<leafNode name="disable-accounting">
+  <properties>
+    <help>Disable accounting</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/accel-radius-additions.xml.i b/interface-definitions/include/accel-radius-additions.xml.i
index 3ec0d587e..0067b6d1c 100644
--- a/interface-definitions/include/accel-radius-additions.xml.i
+++ b/interface-definitions/include/accel-radius-additions.xml.i
@@ -29,7 +29,7 @@
           </properties>
           <defaultValue>1813</defaultValue>
         </leafNode>
-        #include <include/accel-radius-additions-disable-accounting.xlm.in>
+        #include <include/accel-radius-additions-disable-accounting.xml.i>
         <leafNode name="fail-time">
           <properties>
             <help>Mark server unavailable for &lt;n&gt; seconds on failure</help>
diff --git a/interface-definitions/include/radius-server-ipv4-ipv6.xml.i b/interface-definitions/include/radius-server-ipv4-ipv6.xml.i
index e4919d86a..ab3c6d72a 100644
--- a/interface-definitions/include/radius-server-ipv4-ipv6.xml.i
+++ b/interface-definitions/include/radius-server-ipv4-ipv6.xml.i
@@ -22,8 +22,8 @@
       </properties>
       <children>
         #include <include/generic-disable-node.xml.i>
-        #include <include/radius-server-key.xml.in>
-        #include <include/radius-server-port.xml.in>
+        #include <include/radius-server-key.xml.i>
+        #include <include/radius-server-port.xml.i>
       </children>
     </tagNode>
     #include <include/source-address-ipv4-ipv6.xml.i>
diff --git a/interface-definitions/include/radius-server-ipv4.xml.i b/interface-definitions/include/radius-server-ipv4.xml.i
index 9c73c4c49..15a421b9a 100644
--- a/interface-definitions/include/radius-server-ipv4.xml.i
+++ b/interface-definitions/include/radius-server-ipv4.xml.i
@@ -18,8 +18,8 @@
       </properties>
       <children>
         #include <include/generic-disable-node.xml.i>
-        #include <include/radius-server-key.xml.in>
-        #include <include/radius-server-port.xml.in>
+        #include <include/radius-server-key.xml.i>
+        #include <include/radius-server-port.xml.i>
       </children>
     </tagNode>
   </children>
diff --git a/interface-definitions/include/radius-server-key.xml.i b/interface-definitions/include/radius-server-key.xml.i
new file mode 100644
index 000000000..32a01b402
--- /dev/null
+++ b/interface-definitions/include/radius-server-key.xml.i
@@ -0,0 +1,7 @@
+<!-- included start from radius-server-key.xml.i -->
+<leafNode name="key">
+  <properties>
+    <help>Shared secret key</help>
+  </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/radius-server-key.xml.in b/interface-definitions/include/radius-server-key.xml.in
deleted file mode 100644
index 32a01b402..000000000
--- a/interface-definitions/include/radius-server-key.xml.in
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- included start from radius-server-key.xml.i -->
-<leafNode name="key">
-  <properties>
-    <help>Shared secret key</help>
-  </properties>
-</leafNode>
-<!-- included end -->
diff --git a/interface-definitions/include/radius-server-port.xml.i b/interface-definitions/include/radius-server-port.xml.i
new file mode 100644
index 000000000..71b6bddb7
--- /dev/null
+++ b/interface-definitions/include/radius-server-port.xml.i
@@ -0,0 +1,15 @@
+<!-- included start from radius-server-port.xml.i -->
+<leafNode name="port">
+  <properties>
+    <help>Authentication port</help>
+    <valueHelp>
+      <format>u32:1-65535</format>
+      <description>Numeric IP port (default: 1812)</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-65535"/>
+    </constraint>
+  </properties>
+  <defaultValue>1812</defaultValue>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/radius-server-port.xml.in b/interface-definitions/include/radius-server-port.xml.in
deleted file mode 100644
index 71b6bddb7..000000000
--- a/interface-definitions/include/radius-server-port.xml.in
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- included start from radius-server-port.xml.i -->
-<leafNode name="port">
-  <properties>
-    <help>Authentication port</help>
-    <valueHelp>
-      <format>u32:1-65535</format>
-      <description>Numeric IP port (default: 1812)</description>
-    </valueHelp>
-    <constraint>
-      <validator name="numeric" argument="--range 1-65535"/>
-    </constraint>
-  </properties>
-  <defaultValue>1812</defaultValue>
-</leafNode>
-<!-- included end -->
-- 
cgit v1.2.3