publicWagsHome/KasmVNC
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vncserver: extract PrepareDefaultsForPassingToXvnc()

Browse Source
This commit is contained in:
Dmitry Maksyoma
2021-08-09 23:38:20 +12:00
parent b26a20d44d
commit a44241971e
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
unix/vncserver
View File

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