diff options
| -rw-r--r-- | src/qemu/qemu_hotplug.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 9b608162fe..9e3337bb40 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2315,19 +2315,19 @@ qemuDomainChangeGraphicsPasswords(struct qemud_driver *driver, time_t now = time(NULL); char expire_time [64]; const char *connected = NULL; + const char *password; int ret; if (!auth->passwd && !driver->vncPassword) return 0; + password = auth->passwd ? auth->passwd : defaultPasswd; + if (auth->connected) connected = virDomainGraphicsAuthConnectedTypeToString(auth->connected); qemuDomainObjEnterMonitorWithDriver(driver, vm); - ret = qemuMonitorSetPassword(priv->mon, - type, - auth->passwd ? auth->passwd : defaultPasswd, - connected); + ret = qemuMonitorSetPassword(priv->mon, type, password, connected); if (ret == -2) { if (type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { @@ -2335,14 +2335,15 @@ qemuDomainChangeGraphicsPasswords(struct qemud_driver *driver, _("Graphics password only supported for VNC")); ret = -1; } else { - ret = qemuMonitorSetVNCPassword(priv->mon, - auth->passwd ? auth->passwd : defaultPasswd); + ret = qemuMonitorSetVNCPassword(priv->mon, password); } } if (ret != 0) goto cleanup; - if (auth->expires) { + if (password[0] == '\0') { + snprintf(expire_time, sizeof(expire_time), "now"); + } else if (auth->expires) { time_t lifetime = auth->validTo - now; if (lifetime <= 0) snprintf(expire_time, sizeof(expire_time), "now"); |