From: Zachary Amsden <zamsden@redhat.com>
Date: Thu, 30 Jul 2009 10:15:01 +0000 (-1000)
Subject: When using stdio monitor and VNC display, one can set or clear a VNC password; this... 
X-Git-Tag: v0.11.0-rc2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3b69e8bc6c868db4ab905a440649b6daac3c00b8;p=thirdparty%2Fqemu.git

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>
---

diff --git a/vnc.c b/vnc.c
index d79dfd9a3a4..b09921a7e49 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;