summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZachary Amsden <zamsden@redhat.com>2009-07-30 00:15:01 -1000
committerAnthony Liguori <aliguori@us.ibm.com>2009-08-24 08:01:40 -0500
commit52c18be9e99dabe295321153fda7fce9f76647ac (patch)
treeb331873e8ebda01cbe5cbcc08a55bc3e73559a93
parentDon't segfault when changing VNC password on an SDL display. (diff)
downloadqemu-kvm-52c18be9e99dabe295321153fda7fce9f76647ac.tar.gz
qemu-kvm-52c18be9e99dabe295321153fda7fce9f76647ac.tar.bz2
qemu-kvm-52c18be9e99dabe295321153fda7fce9f76647ac.zip
When using stdio monitor and VNC display, one can set or clear a VNC password; this should set or turn off VNC authentication as well.
Signed-off-by: Zachary Amsden <zamsden@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--vnc.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/vnc.c b/vnc.c
index 9dbe82ac0..5eaef6a3e 100644
--- a/vnc.c
+++ b/vnc.c
@@ -2274,6 +2274,11 @@ int vnc_display_password(DisplayState *ds, const char *password)
if (password && password[0]) {
if (!(vs->password = qemu_strdup(password)))
return -1;
+ if (vs->auth == VNC_AUTH_NONE) {
+ vs->auth = VNC_AUTH_VNC;
+ }
+ } else {
+ vs->auth = VNC_AUTH_NONE;
}
return 0;