]> git.proxmox.com Git - qemu-server.git/commitdiff
fix #4522: api: vncproxy: also set environment variable for ticket without websocket
authorFiona Ebner <f.ebner@proxmox.com>
Mon, 16 Oct 2023 13:12:26 +0000 (15:12 +0200)
committerThomas Lamprecht <t.lamprecht@proxmox.com>
Mon, 16 Oct 2023 14:43:47 +0000 (16:43 +0200)
Since commit 2dc0eb61 ("qm: assume correct VNC setup in 'vncproxy',
disallow passwordless"), 'qm vncproxy' will just fail when the
LC_PVE_TICKET environment variable is not set. Since it is not only
required in combination with websocket, drop that conditional.

For the non-serial case, this was the last remaining effect of the
'websocket' parameter, so update the parameter description.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
PVE/API2/Qemu.pm

index a31ddb8110b65cf2b65020cac3db8a5af0d2f7f9..9877ce24a9b7e2e581d894881787e29aa51657d2 100644 (file)
@@ -2267,7 +2267,8 @@ __PACKAGE__->register_method({
            websocket => {
                optional => 1,
                type => 'boolean',
-               description => "Prepare for websocket upgrade.",
+               description => "Prepare for websocket upgrade (only required when using "
+                   ."serial terminal, otherwise upgrade is always possible).",
            },
            'generate-password' => {
                optional => 1,
@@ -2365,7 +2366,7 @@ __PACKAGE__->register_method({
 
            } else {
 
-               $ENV{LC_PVE_TICKET} = $password if $websocket; # set ticket with "qm vncproxy"
+               $ENV{LC_PVE_TICKET} = $password; # set ticket with "qm vncproxy"
 
                $cmd = [@$remcmd, "/usr/sbin/qm", 'vncproxy', $vmid];