CA-16217: Allow access to shell timeout using --shelltimeout

XSConsole.py

@@ -9,13 +9,21 @@
 
 import sys
 
+from XSConsoleConfig import *
 from XSConsoleTerm import *
 from XSConsoleLang import *
 
 def main():
-    app = App()
-    app.Build( ['plugins-base', 'plugins-oem', 'plugins-extras'] )
-    app.Enter()
+    if '--shelltimeout' in sys.argv:
+        # Print a shell timeout value, suitable for TMOUT=`xsconsole --shelltimeout`
+        if Config.Inst().AllShellsTimeout():
+            print State.Inst().AuthTimeoutSeconds()
+        else:
+            print
+    else:
+        app = App()
+        app.Build( ['plugins-base', 'plugins-oem', 'plugins-extras'] )
+        app.Enter()
 
 if __name__ == "__main__":
     try:

XSConsoleConfig.py

@@ -45,7 +45,9 @@ def FTPServer(self):
 
     def BrandingMap(self):
         return {}
-
+
+    def AllShellsTimeout(self):
+        return True
 
 # Import a more specific configuration if available
 if os.path.isfile(sys.path[0]+'/XSConsoleConfigOEM.py'):

plugins-base/XSFeatureChangeTimeout.py

@@ -38,7 +38,7 @@ def StatusUpdateHandler(cls, inPane):
         message += Language.Quantity("minute", timeout) + ".  "
         message += Lang("Users will be automatically logged out after there has been no keyboard "
             "activity for this time.  This timeout applies to this console and to "
-            "local shells started from this console.")
+            "local shells.")
 
         inPane.AddWrappedTextField(message)