From e129d7f0d1ca8c2938283af66cafedb9f5363da1 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 8 Mar 2020 17:45:02 +0100
Subject: radius: T2110: move timeout back to system-login

... as e.g. wireless interfaces can not have a timeout specified.
---
 interface-definitions/include/radius-server.xml.i | 13 -------------
 interface-definitions/system-login.xml.in         | 21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/interface-definitions/include/radius-server.xml.i b/interface-definitions/include/radius-server.xml.i
index 9d0633801..d1068b0e4 100644
--- a/interface-definitions/include/radius-server.xml.i
+++ b/interface-definitions/include/radius-server.xml.i
@@ -50,19 +50,6 @@
             </constraint>
           </properties>
         </leafNode>
-        <leafNode name="timeout">
-          <properties>
-            <help>Session timeout</help>
-            <valueHelp>
-              <format>1-30</format>
-              <description>Session timeout in seconds (default: 2)</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 1-30"/>
-            </constraint>
-            <constraintErrorMessage>Timeout must be between 1 and 30 seconds</constraintErrorMessage>
-          </properties>
-        </leafNode>
       </children>
     </tagNode>
   </children>
diff --git a/interface-definitions/system-login.xml.in b/interface-definitions/system-login.xml.in
index 1d217caba..2499a192c 100644
--- a/interface-definitions/system-login.xml.in
+++ b/interface-definitions/system-login.xml.in
@@ -111,6 +111,27 @@
             </children>
           </tagNode>
           #include <include/radius-server.xml.i>
+          <node name="radius">
+            <children>
+              <tagNode name="server">
+                <children>
+                  <leafNode name="timeout">
+                    <properties>
+                      <help>Session timeout</help>
+                      <valueHelp>
+                        <format>1-30</format>
+                        <description>Session timeout in seconds (default: 2)</description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="numeric" argument="--range 1-30"/>
+                      </constraint>
+                      <constraintErrorMessage>Timeout must be between 1 and 30 seconds</constraintErrorMessage>
+                    </properties>
+                  </leafNode>
+                </children>
+              </tagNode>
+            </children>
+          </node>
         </children>
       </node>
     </children>
-- 
cgit v1.2.3