From 2b4f01f5aede106c8145d057e9bfe0786dd1fef6 Mon Sep 17 00:00:00 2001
From: Dmitry Maksyoma <ledestin@gmail.com>
Date: Tue, 10 Aug 2021 21:45:41 +1200
Subject: [PATCH] vncserver: extract EnsureAtLeastOneKasmUserExists()

---
 unix/vncserver | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/unix/vncserver b/unix/vncserver
index 43d4e15..f8ca7d2 100755
--- a/unix/vncserver
+++ b/unix/vncserver
@@ -42,10 +42,8 @@ $pidFile = "$vncUserDir/$host:$displayNumber.pid";
 $kasmAuthEnabled = 1;
 &DisableVncAuth();
 
-@kasmPasswdUsers = &LoadKasmPasswdUsers();
-if ($kasmAuthEnabled && !&AtLeastOneUserConfigured()) {
-   &GuideUserToSetupKasmPasswdUser();
-   @kasmPasswdUsers = &LoadKasmPasswdUsers();
+if ($kasmAuthEnabled) {
+   &EnsureAtLeastOneKasmUserExists();
 }
 
 &SetupXauthorityFile();
@@ -1048,3 +1046,11 @@ sub PrepareDefaultsForPassingToXvnc {
    &SetReasonabeDefaults();
    &LoadSystemThenUserThenMandatoryConfigs();
 }
+
+sub EnsureAtLeastOneKasmUserExists {
+   @kasmPasswdUsers = &LoadKasmPasswdUsers();
+   if (!&AtLeastOneUserConfigured()) {
+      &GuideUserToSetupKasmPasswdUser();
+      @kasmPasswdUsers = &LoadKasmPasswdUsers();
+   }
+}