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-27 21:23:39 -0500
commit3b69e8bc6c868db4ab905a440649b6daac3c00b8 (patch)
tree07f4864c5d4db8e40c26485bbc8f0d867c4297b2
parentaf0f38c5df8522d2f67edf6edcdab83572f58c8d (diff)
downloadqemu-3b69e8bc6c868db4ab905a440649b6daac3c00b8.tar.gz
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 d79dfd9a3a..b09921a7e4 100644
--- a/vnc.c
+++ b/vnc.c
@@ -2193,6 +2193,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;