From a44241971e8c72e5eac78a80244e5cefaab58091 Mon Sep 17 00:00:00 2001
From: Dmitry Maksyoma <ledestin@gmail.com>
Date: Mon, 9 Aug 2021 23:38:20 +1200
Subject: [PATCH] vncserver: extract PrepareDefaultsForPassingToXvnc()

---
 unix/vncserver | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/unix/vncserver b/unix/vncserver
index 963df59..c2f5d31 100755
--- a/unix/vncserver
+++ b/unix/vncserver
@@ -37,14 +37,7 @@ $desktopName = $opt{'-name'} || "$host:$displayNumber ($ENV{USER})";
 
 &CreateDotVncDir();
 
-my %default_opts;
-my %config;
-
-# We set some reasonable defaults. Config file settings
-# override these where present.
-&SetReasonabeDefaults();
-&LoadSystemThenUserThenMandatoryConfigs();
-
+&PrepareDefaultsForPassingToXvnc();
 &DisableVncAuth();
 
 $kasmAuthEnabled = 1;
@@ -1043,3 +1036,13 @@ sub ParseAndProcessCliOptions {
       &GetLowestAvailableDisplayNumber();
    &CheckCliOptionsForBeingValid();
 }
+
+sub PrepareDefaultsForPassingToXvnc {
+   # We set some reasonable defaults. Config file settings
+   # override these where present.
+   %default_opts;
+   %config;
+
+   &SetReasonabeDefaults();
+   &LoadSystemThenUserThenMandatoryConfigs();
+}