37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Stefan Reiter <s.reiter@proxmox.com>
|
|
Date: Wed, 25 Aug 2021 11:08:41 +0200
|
|
Subject: [PATCH] monitor/hmp: correctly invert password argument detection
|
|
again
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Commit cfb5387a1d 'hmp: remove "change vnc TARGET" command' claims to
|
|
remove the HMP "change vnc" command, but doesn't actually do that.
|
|
Instead it rewires it to use 'qmp_change_vnc_password', and in the
|
|
process inverts the argument detection - ignoring the first issue, this
|
|
inversion is wrong, as this will now ask the user for a password if one
|
|
is already provided, and simply fail if none is given.
|
|
|
|
Fixes: cfb5387a1d ("hmp: remove "change vnc TARGET" command")
|
|
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
|
|
---
|
|
monitor/hmp-cmds.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
|
|
index 047294e1ed..f4ef58d257 100644
|
|
--- a/monitor/hmp-cmds.c
|
|
+++ b/monitor/hmp-cmds.c
|
|
@@ -1549,7 +1549,7 @@ void hmp_change(Monitor *mon, const QDict *qdict)
|
|
}
|
|
if (strcmp(target, "passwd") == 0 ||
|
|
strcmp(target, "password") == 0) {
|
|
- if (arg) {
|
|
+ if (!arg) {
|
|
MonitorHMP *hmp_mon = container_of(mon, MonitorHMP, common);
|
|
monitor_read_password(hmp_mon, hmp_change_read_arg, NULL);
|
|
return;
|