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

vncserver: extract EnsureAtLeastOneKasmUserExists()

Browse Source
This commit is contained in:
Dmitry Maksyoma
2021-08-10 21:45:41 +12:00
parent 65f957695e
commit 2b4f01f5ae
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
unix/vncserver
View File

@@ -42,10 +42,8 @@ $pidFile = "$vncUserDir/$host:$displayNumber.pid";
$kasmAuthEnabled = 1; $kasmAuthEnabled = 1;
&DisableVncAuth(); &DisableVncAuth();
@kasmPasswdUsers = &LoadKasmPasswdUsers(); if ($kasmAuthEnabled) {
if ($kasmAuthEnabled && !&AtLeastOneUserConfigured()) { &EnsureAtLeastOneKasmUserExists();
&GuideUserToSetupKasmPasswdUser();
@kasmPasswdUsers = &LoadKasmPasswdUsers();
} }
&SetupXauthorityFile(); &SetupXauthorityFile();
@@ -1048,3 +1046,11 @@ sub PrepareDefaultsForPassingToXvnc {
&SetReasonabeDefaults(); &SetReasonabeDefaults();
&LoadSystemThenUserThenMandatoryConfigs(); &LoadSystemThenUserThenMandatoryConfigs();
} }
sub EnsureAtLeastOneKasmUserExists {
@kasmPasswdUsers = &LoadKasmPasswdUsers();
if (!&AtLeastOneUserConfigured()) {
&GuideUserToSetupKasmPasswdUser();
@kasmPasswdUsers = &LoadKasmPasswdUsers();
}
}