When using stdio monitor and VNC display, one can set or clear a VNC password; this...

Signed-off-by: Zachary Amsden <zamsden@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/vnc.c b/vnc.c
index 9dbe82ac06a77c7f93e5cda851aaa9b88bcffcf1..5eaef6a3e26dd3a33ba788b4c7e09396aeb71e65 100644 (file)
--- 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;