From 06e9e92ee19cf5a9277233f1d670b9ff2a1b39fc Mon Sep 17 00:00:00 2001
From: Dmitry Maksyoma <ledestin@gmail.com>
Date: Tue, 10 Aug 2021 21:19:07 +1200
Subject: [PATCH] vncserver: refactor

---
 unix/vncserver | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/unix/vncserver b/unix/vncserver
index 5abaecc..0ae9f79 100755
--- a/unix/vncserver
+++ b/unix/vncserver
@@ -39,13 +39,12 @@ $desktopName = $opt{'-name'} || "$host:$displayNumber ($ENV{USER})";
 
 $kasmAuthEnabled = 1;
 &DisableVncAuth();
-$kasmPasswdFile = "$ENV{HOME}/.kasmpasswd";
-@kasmPasswdUsers = &LoadKasmPasswdUsers();
 
+@kasmPasswdUsers = &LoadKasmPasswdUsers();
 if ($kasmAuthEnabled && !&AtLeastOneUserConfigured()) {
    &GuideUserToSetupKasmPasswdUser();
+   @kasmPasswdUsers = &LoadKasmPasswdUsers();
 }
-@kasmPasswdUsers = &LoadKasmPasswdUsers();
 
 $desktopLog = "$vncUserDir/$host:$displayNumber.log";
 unlink($desktopLog);
@@ -1002,6 +1001,7 @@ sub SetGlobalVariables {
    $vncUserDir = "$ENV{HOME}/.vnc";
    $vncUserConfig = "$vncUserDir/config";
    $vncUserName = &DetectUserName();
+   $kasmPasswdFile = "$ENV{HOME}/.kasmpasswd";
 
    $vncSystemConfigDir = "/etc/kasmvnc";
    $vncSystemConfigDefaultsFile = "$vncSystemConfigDir/vncserver-config-defaults";